Skip to content

Commit c942c61

Browse files
committed
[yosys-git] use ninja and fix installation
1 parent e9886f2 commit c942c61

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

alarmcn/yosys-git/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ license=('custom:ISC')
1414
provides=("yosys=$pkgver")
1515
conflicts=("yosys")
1616
depends=('bash' 'tcl' 'libffi' 'protobuf') # boost-libs python (added in package())
17-
makedepends=('git' 'boost' 'cmake' 'clang' 'python'
17+
makedepends=('git' 'boost' 'cmake' 'ninja' 'clang' 'python'
1818
'pybind11' 'python-cxxheaderparser')
1919
optdepends=('graphviz: Schematics display support'
2020
'xdot: Display netlists'
2121
'yices: default solver for yosys-smtbmc'
2222
'cvc4: alternative solver for yosys-smtbmc'
2323
'z3: alternative solver for yosys-smtbmc')
2424
options=('!lto') # getting SIGSEGV when running the tests with LTO
25-
# checkdepends=('iverilog')
2625
source=('git+https://github.com/YosysHQ/yosys.git')
2726
sha512sums=('SKIP')
2827

@@ -49,6 +48,7 @@ build() {
4948
cd yosys
5049

5150
cmake . -B build -DCMAKE_BUILD_TYPE=None \
51+
-G Ninja \
5252
-DCMAKE_INSTALL_PREFIX='/usr' \
5353
-DBUILD_TESTING=Off \
5454
-Wno-author \
@@ -63,13 +63,13 @@ build() {
6363
-DYOSYS_ENABLE_ZLIB=On \
6464
-DYOSYS_ENABLE_PYTHON=On
6565

66-
make -C build
66+
cmake --build build
6767
}
6868

6969
package() {
7070
cd yosys
7171

72-
make install DESTDIR="${pkgdir}"
72+
DESTDIR="${pkgdir}" cmake --install build
7373

7474
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
7575

archlinuxcn/yosys-git/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ license=('custom:ISC')
1414
provides=("yosys=$pkgver")
1515
conflicts=("yosys")
1616
depends=('bash' 'tcl' 'libffi' 'protobuf') # boost-libs python (added in package())
17-
makedepends=('git' 'boost' 'cmake' 'clang' 'python'
17+
makedepends=('git' 'boost' 'cmake' 'ninja' 'clang' 'python'
1818
'pybind11' 'python-cxxheaderparser')
1919
optdepends=('graphviz: Schematics display support'
2020
'xdot: Display netlists'
2121
'yices: default solver for yosys-smtbmc'
2222
'cvc4: alternative solver for yosys-smtbmc'
2323
'z3: alternative solver for yosys-smtbmc')
2424
options=('!lto') # getting SIGSEGV when running the tests with LTO
25-
# checkdepends=('iverilog')
2625
source=('git+https://github.com/YosysHQ/yosys.git')
2726
sha512sums=('SKIP')
2827

@@ -49,6 +48,7 @@ build() {
4948
cd yosys
5049

5150
cmake . -B build -DCMAKE_BUILD_TYPE=None \
51+
-G Ninja \
5252
-DCMAKE_INSTALL_PREFIX='/usr' \
5353
-DBUILD_TESTING=Off \
5454
-Wno-author \
@@ -63,13 +63,13 @@ build() {
6363
-DYOSYS_ENABLE_ZLIB=On \
6464
-DYOSYS_ENABLE_PYTHON=On
6565

66-
make -C build
66+
cmake --build build
6767
}
6868

6969
package() {
7070
cd yosys
7171

72-
make install DESTDIR="${pkgdir}"
72+
DESTDIR="${pkgdir}" cmake --install build
7373

7474
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
7575

0 commit comments

Comments
 (0)