From d0f791c604ad50304e821ac0aa98a183c7be9890 Mon Sep 17 00:00:00 2001 From: davidovski Date: Thu, 3 Feb 2022 01:06:29 +0000 Subject: added lvm and autoconf for js78 and polkit --- repo/devel/autoconf2.13.xibuild | 30 ++++++++++++++++++++++++++++++ repo/devel/llvm.xibuild | 35 +++++++++++++++++++++++++++++++++++ repo/system/js78.xibuild | 12 ++++++------ repo/system/polkit.xibuild | 5 +++-- 4 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 repo/devel/autoconf2.13.xibuild create mode 100644 repo/devel/llvm.xibuild diff --git a/repo/devel/autoconf2.13.xibuild b/repo/devel/autoconf2.13.xibuild new file mode 100644 index 0000000..b164c16 --- /dev/null +++ b/repo/devel/autoconf2.13.xibuild @@ -0,0 +1,30 @@ +#!/bin/bash + +MAKEDEPS=(make) +DEPS=(perl) + +PKG_VER=2.13 +SOURCE=https://ftp.gnu.org/gnu/autoconf/autoconf-$PKG_VER.tar.gz +ADDITIONAL=( + https://www.linuxfromscratch.org/patches/blfs/svn/autoconf-$PKG_VER-consolidated_fixes-1.patch + ) + +DESC="GNU programs for producing shell scripts that can automatically configure source code, legacy $PKG_VER version" + +prepare() { + patch -Np1 -i autoconf-2.13-consolidated_fixes-1.patch && + mv -v autoconf.texi autoconf213.texi && + rm -v autoconf.info + +} + +build () { + ./configure --prefix=/usr --program-suffix=$PKG_VER && + make +} + +package () { + make DESTDIR=$PKG_DEST install + install -v -m644 autoconf213.info $PKG_DEST/usr/share/info && + install-info --info-dir=$PKG_DEST/usr/share/info autoconf213.info +} diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild new file mode 100644 index 0000000..0147a69 --- /dev/null +++ b/repo/devel/llvm.xibuild @@ -0,0 +1,35 @@ +#!/bin/bash + +MAKEDEPS=(make ninja cmake libedit libffi libxml2 ncurses python) +DEPS=() + +PKG_VER=13.0.0 +SOURCE=https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/llvm-$PKG_VER.src.tar.xz +DESC="Collection of modular and reusable compiler and toolchain technologies" + +package () { + grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/' +} + +build () { + mkdir -v build && + cd build && + + CC=gcc CXX=g++ \ + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_ENABLE_FFI=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \ + -DLLVM_BUILD_TESTS=ON \ + -DLLVM_BINUTILS_INCDIR=/usr/include \ + -Wno-dev -G Ninja .. && + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install + +} 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 \ -- cgit v1.2.1