diff options
| author | davidovski <david@davidovski.xyz> | 2022-02-03 01:06:29 +0000 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-02-03 01:06:29 +0000 |
| commit | d0f791c604ad50304e821ac0aa98a183c7be9890 (patch) | |
| tree | d8b900b2e01243835d0d983348a3dc8adbd57f78 /repo/system | |
| parent | 5f6bd1078b20823e7382ade77e34d65e9c365772 (diff) | |
added lvm and autoconf for js78 and polkit
Diffstat (limited to 'repo/system')
| -rw-r--r-- | repo/system/js78.xibuild | 12 | ||||
| -rw-r--r-- | repo/system/polkit.xibuild | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild index ecc21ad..c134f7e 100644 --- a/repo/system/js78.xibuild +++ b/repo/system/js78.xibuild @@ -1,6 +1,6 @@ #!/bin/bash -MAKEDEPS=(gcc autoconf icu rustc which zip) +MAKEDEPS=(gcc autoconf2.13 icu rustc which zip llvm) DEPS=(readline bash zlib) PKG_VER=78.15.0 @@ -9,14 +9,14 @@ ADDITIONAL=( https://www.linuxfromscratch.org/patches/blfs/svn/js-$PKG_VER-python_3_10-1.patch ) -DESC="JavaScript interpreter and libraries - Version 78 -" +DESC="JavaScript interpreter and libraries - Version 78" prepare () { patch -Np1 -i js-$PKG_VER-python_3_10-1.patch mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm export PATH=/opt/rustc/bin:$PATH + export LD_LIBRARY_PATH=/opt/rustc/lib:$LD_LIBRARY_PATH } build () { @@ -36,7 +36,7 @@ build () { } package () { - make DESTDIR=$PKG_DEST install && - rm -v $PKG_VER/usr/lib/libjs_static.ajs && - sed -i '/@NSPR_CFLAGS@/d' $PKG_VER/usr/bin/js78-config + make DESTDIR=$PKG_DEST install + [ -f $PKG_DEST/usr/lib/libjs_static.ajs ] && rm -v $PKG_DEST/usr/lib/libjs_static.ajs + sed -i '/@NSPR_CFLAGS@/d' $PKG_DEST/usr/bin/js78-config } diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild index 00547b0..eb9c2f6 100644 --- a/repo/system/polkit.xibuild +++ b/repo/system/polkit.xibuild @@ -16,7 +16,7 @@ prepare () { sed '/policy,/d' -i actions/meson.build \ -i src/examples/meson.build - patch -Np1 -i polkit-$PKG_VE-security_fix-1.patch + patch -Np1 -i polkit-$PKG_VER-security_fix-1.patch } @@ -24,8 +24,9 @@ build () { mkdir build && cd build && + # TODO fix man meson --prefix=/usr \ - -Dman=true \ + -Dman=false \ -Dsession_tracking=libelogind \ -Dsystemdsystemunitdir=/tmp \ --buildtype=release \ |