diff options
| author | davidovski <david@davidovski.xyz> | 2022-01-16 15:02:47 +0000 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-01-16 15:02:47 +0000 |
| commit | 003727289cc45e29eff0c0c48ad0f9660f96644f (patch) | |
| tree | 0fd7f0ac830dee29984262980b8c144e26aa09ba /repo/system | |
| parent | d2d97f84d5c037d7a6b8db6c497a5987030b7335 (diff) | |
separated patch, build, check and package stages
Diffstat (limited to 'repo/system')
65 files changed, 260 insertions, 67 deletions
diff --git a/repo/system/acl.xibuild b/repo/system/acl.xibuild index 8411379..f2d5649 100644 --- a/repo/system/acl.xibuild +++ b/repo/system/acl.xibuild @@ -9,7 +9,8 @@ DESC="Access control list utilities, libraries and headers" build () { ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/acl-$PKG_VER make +} +package() { make DESTDIR=$PKG_DEST install - } diff --git a/repo/system/attr.xibuild b/repo/system/attr.xibuild index 715f404..1c81943 100644 --- a/repo/system/attr.xibuild +++ b/repo/system/attr.xibuild @@ -8,10 +8,14 @@ SOURCE=http://download.savannah.nongnu.org/releases/attr/attr-$PKG_VER.tar.xz DESC="Extended attribute support library for ACL support" build () { - ./configure --prefix=/usr --disable-static --sysconfdir=/etc --docdir=/usr/share/doc/attr-$PKG_VER - make +} + +check () { make check +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index d305d56..88550bd 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -6,7 +6,7 @@ PKG_VER=2.37 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz DESC="tools for handling object files" -build () { +patch () { curl https://www.linuxfromscratch.org/patches/lfs/development/binutils-$PKG_VER-upstream_fix-1.patch > binutils-$PKG_VER-upstream_fix-1.patch patch -Np1 -i binutils-$PKG_VER-upstream_fix-1.patch @@ -14,7 +14,9 @@ build () { sed -i '63d' etc/texi2pod.pl find -name \*.1 -delete +} +build () { mkdir -v build cd build ../configure --prefix=/usr \ @@ -28,6 +30,9 @@ build () { --with-system-zlib make tooldir=/usr +} + +check () { make -k check || true } diff --git a/repo/system/brotli.xibuild b/repo/system/brotli.xibuild index 5a4f2e0..69754fa 100644 --- a/repo/system/brotli.xibuild +++ b/repo/system/brotli.xibuild @@ -9,10 +9,12 @@ build () { mkdir out && cd out ../configure-cmake make +} +check () { make test - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install mv $PKG_DEST/usr/local/* $PKG_DEST/usr/ } diff --git a/repo/system/bzip2.xibuild b/repo/system/bzip2.xibuild index f01a6b7..fc2e887 100644 --- a/repo/system/bzip2.xibuild +++ b/repo/system/bzip2.xibuild @@ -8,7 +8,7 @@ BRANCH=bzip2-$PKG_VER DESC="a selection of programs for compressing and decompressing bzip2 files" -build () { +patch () { #curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-$PKG_VER-install_docs-1.patch > bzip2-$PKG_VER-install_docs-1.patch #patch -Np1 -i bzip2-$PKG_VER-install_docs-1.patch @@ -18,16 +18,17 @@ build () { sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile #sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile +} +build () { make -f Makefile-libbz2_so make clean - make - make PREFIX=$PKG_DEST/usr install - } package () { + make PREFIX=$PKG_DEST/usr install + cp -av libbz2.so* $PKG_DEST/usr/lib cp -av libbz2.so.$PKG_VER $PKG_DEST/usr/lib/libbz2.so diff --git a/repo/system/expat.xibuild b/repo/system/expat.xibuild index 191e216..0d9376c 100644 --- a/repo/system/expat.xibuild +++ b/repo/system/expat.xibuild @@ -9,8 +9,13 @@ DESC="An XML parser library" build () { ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/expat-$PKG_VER make +} + +check () { make check +} +package () { make DESTDIR=$PKG_DEST install install -v -m644 doc/*{.html,png,css} $PKG_DEST/usr/share/doc/expat-$PKG_VER diff --git a/repo/system/findutils.xibuild b/repo/system/findutils.xibuild index 7ac8bfd..9c0948b 100644 --- a/repo/system/findutils.xibuild +++ b/repo/system/findutils.xibuild @@ -13,5 +13,8 @@ build () { esac make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/gc.xibuild b/repo/system/gc.xibuild index 11f30af..721a096 100644 --- a/repo/system/gc.xibuild +++ b/repo/system/gc.xibuild @@ -9,5 +9,8 @@ DESC="A garbage collector for C and C++" build () { ./configure --prefix=/usr --disable-static make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/gdbm.xibuild b/repo/system/gdbm.xibuild index a5e11b9..c1cc12b 100644 --- a/repo/system/gdbm.xibuild +++ b/repo/system/gdbm.xibuild @@ -9,7 +9,12 @@ DESC="GNU database library" build () { ./configure --prefix=/usr --disable-static --enable-libgdm-compat make +} + +check () { make -k check +} +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/gettext.xibuild b/repo/system/gettext.xibuild index 4a1118e..e6ede22 100644 --- a/repo/system/gettext.xibuild +++ b/repo/system/gettext.xibuild @@ -9,6 +9,9 @@ DESC="GNU internationalization library" build () { ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/gettext-$PKG_VER make +} + +check () { make check } diff --git a/repo/system/glibc.xibuild b/repo/system/glibc.xibuild index 557a533..50e5ec9 100644 --- a/repo/system/glibc.xibuild +++ b/repo/system/glibc.xibuild @@ -6,7 +6,7 @@ PKG_VER=2.34 SOURCE=https://ftp.gnu.org/gnu/glibc/glibc-$PKG_VER.tar.xz DESC="The main gnu C library providing basic routines and procedures" -build () { +patch () { # patches as recommended by lfs sed -e '/NOTIFY_REMOVED)/s/)/ \&\& data.attr != NULL)/' -i sysdeps/unix/sysv/linux/mq_notify.c @@ -14,6 +14,9 @@ build () { patch -Np1 -i glibc-$PKG_VER-fhs-1.patch +} + +build () { mkdir -v build cd build @@ -28,10 +31,11 @@ build () { libc_cv_slibdir=/usr/lib make +} +check () { # some check failures are 'expected' - #make check || true - + make check || true } package () { diff --git a/repo/system/gmp.xibuild b/repo/system/gmp.xibuild index 2678312..8e1fe54 100644 --- a/repo/system/gmp.xibuild +++ b/repo/system/gmp.xibuild @@ -6,18 +6,22 @@ PKG_VER=6.2.1 SOURCE=https://gmplib.org/download/gmp/gmp-$PKG_VER.tar.xz DESC="a collection of mathematical libraries" -build () { +patch () { cp -v configfsf.guess config.guess cp -v configfsf.sub config.sub +} + +build () { ./configure --prefix=/usr --enable-cxx --disable-static --docdir=/usr/share/doc/gmp make make html +} +check () { make check 2>&1 | tee gmp-check-log awk '/# PASS:/{total+=$3} ; END{print total}' gmp-check-log - } package() { diff --git a/repo/system/gnutls.xibuild b/repo/system/gnutls.xibuild index bf06240..8c3f198 100644 --- a/repo/system/gnutls.xibuild +++ b/repo/system/gnutls.xibuild @@ -11,5 +11,8 @@ build () { ./configure \ --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/gperf.xibuild b/repo/system/gperf.xibuild index b9abc88..e959af3 100644 --- a/repo/system/gperf.xibuild +++ b/repo/system/gperf.xibuild @@ -9,7 +9,12 @@ DESC="Perfect hash function generator" build () { ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-$PKG_VER make +} + +check () { make -j1 check +} +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild index 80d172f..ff2b85e 100644 --- a/repo/system/grub.xibuild +++ b/repo/system/grub.xibuild @@ -9,10 +9,10 @@ DESC="GNU GRand Unified Bootloader v2" build () { ./configure --prefix=/usr --sysconfdir=/etc --disable-werror make - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install mkdir -pv $PKG_DEST/usr/share/bash-completion/completions mv -v $PKG_DEST/etc/bash_completion.d/grub $PKG_DEST/usr/share/bash-completion/completions } diff --git a/repo/system/guile.xibuild b/repo/system/guile.xibuild index c5413ff..759c2c2 100644 --- a/repo/system/guile.xibuild +++ b/repo/system/guile.xibuild @@ -11,5 +11,8 @@ build () { ./autogen.sh ./configure --prefix=/usr --disable-static make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/gzip.xibuild b/repo/system/gzip.xibuild index 7831021..5697a4f 100644 --- a/repo/system/gzip.xibuild +++ b/repo/system/gzip.xibuild @@ -9,5 +9,8 @@ DESC="GNU compression utilities" build () { ./configure --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/intltool.xibuild b/repo/system/intltool.xibuild index c861168..259b9ab 100644 --- a/repo/system/intltool.xibuild +++ b/repo/system/intltool.xibuild @@ -9,7 +9,13 @@ DESC="The internationalization tool collection" build () { ./configure --prefix=/usr make +} + +check () { make check +} + +package () { make DESTDIR=$PKG_DEST install install -v -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-$PKG_VER/I18N-HOWTO } diff --git a/repo/system/kbd.xibuild b/repo/system/kbd.xibuild index 5892d90..8136769 100644 --- a/repo/system/kbd.xibuild +++ b/repo/system/kbd.xibuild @@ -6,13 +6,17 @@ PKG_VER=2.4.0 SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/kbd/kbd-$PKG_VER.tar.xz DESC="Keytable files and keyboard utilities" -build () { - +patch () { # remove redundant resizecons program sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in +} +build () { ./configure --prefix=/usr --disable-vlock make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/kmod.xibuild b/repo/system/kmod.xibuild index 62268b3..61a91f8 100644 --- a/repo/system/kmod.xibuild +++ b/repo/system/kmod.xibuild @@ -15,10 +15,10 @@ build () { --with-zlib make - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install mkdir -p /usr/sbin mkdir -p /usr/bin diff --git a/repo/system/krb5.xibuild b/repo/system/krb5.xibuild index c4f3abe..2012fbc 100644 --- a/repo/system/krb5.xibuild +++ b/repo/system/krb5.xibuild @@ -6,7 +6,7 @@ PKG_VER=1.19.2 SOURCE=https://kerberos.org/dist/krb5/$(echo $PKG_VER | cut -d. -f-2)/krb5-$PKG_VER.tar.gz DESC="The Kerberos network authentication system" -build () { +patch () { # fix denial of service vulnerability sed -i '210a if (sprinc == NULL) {\ status = "NULL_SERVER";\ @@ -19,7 +19,9 @@ build () { sed -i -e 's@\^u}@^u cols 300}@' tests/dejagnu/config/default.exp && sed -i -e '/eq 0/{N;s/12 //}' plugins/kdb/db2/libdb2/test/run.test && sed -i '/t_iprop.py/d' tests/Makefile.in && +} +build () { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var/lib \ @@ -29,6 +31,9 @@ build () { --with-system-verto=no \ --enable-dns-for-realm && make +} + +package () { make DESTDIR=$PKG_DEST install install -v -dm755 $PKG_DEST/usr/share/doc/krb5-$PKG_VER && diff --git a/repo/system/libarchive.xibuild b/repo/system/libarchive.xibuild index 80c60c4..6f0d686 100644 --- a/repo/system/libarchive.xibuild +++ b/repo/system/libarchive.xibuild @@ -6,12 +6,13 @@ SOURCE=https://github.com/libarchive/libarchive/releases/download/v3.5.2/libarch DESC="A library that provides a single interface for reading and writing various compression formats" -build () { +patch () { sed -i '436a if ((OSSL_PROVIDER_load(NULL, "legacy")) == NULL) \ return (ARCHIVE_FAILED);' libarchive/archive_digest.c +} +build () { ./configure --prefix=/usr --disable-static - make } diff --git a/repo/system/libcap.xibuild b/repo/system/libcap.xibuild index 934af99..42c2e9f 100644 --- a/repo/system/libcap.xibuild +++ b/repo/system/libcap.xibuild @@ -7,16 +7,19 @@ SOURCE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-$PK DESC="POSIX 1003.1e capabilities" -build () { +patch () { sed -i '/install -m.*STA/d' libcap/Makefile +} +build () { make prefix=/usr lib=lib +} +check () { make test - make prefix=/usr lib=lib DESTDIR=$PKG_DEST install - } package() { + make prefix=/usr lib=lib DESTDIR=$PKG_DEST install chmod -v 755 $PKG_DEST/usr/lib/lib{cap,psx}.so.* } diff --git a/repo/system/libffi.xibuild b/repo/system/libffi.xibuild index 707ad04..23562f7 100644 --- a/repo/system/libffi.xibuild +++ b/repo/system/libffi.xibuild @@ -9,5 +9,8 @@ DESC="Portable foreign function interface library" build () { ./configure --prefix=/usr --disable-static --with-gcc-arch=native --disable-exec-static-tramp make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libiconv.xibuild b/repo/system/libiconv.xibuild index e1c10ed..dc9cfb6 100644 --- a/repo/system/libiconv.xibuild +++ b/repo/system/libiconv.xibuild @@ -10,5 +10,8 @@ DESC="GNU charset conversion library" build () { ./configure --prefix=/usr --disable-static && make +} + +package () { make prefix=/usr lib=lib DESTDIR=$PKG_DEST install } diff --git a/repo/system/libidn.xibuild b/repo/system/libidn.xibuild index c5575bf..37d2edc 100644 --- a/repo/system/libidn.xibuild +++ b/repo/system/libidn.xibuild @@ -9,6 +9,9 @@ DESC="Free software implementation of IDNA2008, Punycode and TR46" build () { ./configure --prefix=/usr --disable-static make +} + +package () { make DESTDIR=$PKG_DEST install find doc -name "Makefile*" -delete && diff --git a/repo/system/libldap.xibuild b/repo/system/libldap.xibuild index 9889496..ae04b04 100644 --- a/repo/system/libldap.xibuild +++ b/repo/system/libldap.xibuild @@ -9,5 +9,8 @@ DESC="An open source implementation of the Lightweight Directory Access Protocol build () { ./configure prefix="/usr" make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libnghttp.xibuild b/repo/system/libnghttp.xibuild index 65b9af0..7c4b941 100644 --- a/repo/system/libnghttp.xibuild +++ b/repo/system/libnghttp.xibuild @@ -14,5 +14,7 @@ build () { --enable-lib-only \ --docdir=/usr/share/doc/nghttp2-$PKG_VER && make +} +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libp11-kit.xibuild b/repo/system/libp11-kit.xibuild index e9e5e4a..8f6906b 100644 --- a/repo/system/libp11-kit.xibuild +++ b/repo/system/libp11-kit.xibuild @@ -5,7 +5,7 @@ DEPS=(glibc libtasn1 libffi) SOURCE=https://github.com/p11-glue/p11-kit DESC="Loads and enumerates PKCS#11 modules" -build () { +patch () { sed '20,$ d' -i trust/trust-extract-compat && cat >> trust/trust-extract-compat << "EOF" @@ -15,12 +15,17 @@ build () { # Generate a new trust store /usr/sbin/make-ca -f -g EOF +} +build () { ./autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-trust-paths=/etc/pki/anchors make +} + +package () { make DESTDIR=$PKG_DEST install ln -sfv $PKG_DEST/usr/libexec/p11-kit/trust-extract-compat \ $PKG_DEST/usr/bin/update-ca-certificates diff --git a/repo/system/libpipeline.xibuild b/repo/system/libpipeline.xibuild index be5ec09..e2bc10f 100644 --- a/repo/system/libpipeline.xibuild +++ b/repo/system/libpipeline.xibuild @@ -9,5 +9,8 @@ build () { ./bootstrap ./configure --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libpsl.xibuild b/repo/system/libpsl.xibuild index 5ecd701..78ac850 100644 --- a/repo/system/libpsl.xibuild +++ b/repo/system/libpsl.xibuild @@ -6,9 +6,15 @@ PKG_VER=0.21.1 SOURCE=https://github.com/rockdaboot/libpsl/releases/download/$PKG_VER/libpsl-$PKG_VER.tar.gz DESC="C library to handle the Public Suffix List" +patch () { + sed -i 's/env python/&3/' src/psl-make-dafsa +} + build () { - sed -i 's/env python/&3/' src/psl-make-dafsa && ./configure --prefix=/usr --disable-static && make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libsasl.xibuild b/repo/system/libsasl.xibuild index 5df48a8..4639beb 100644 --- a/repo/system/libsasl.xibuild +++ b/repo/system/libsasl.xibuild @@ -10,9 +10,8 @@ build () { ./configure \ --prefix=/usr make - make DESTDIR=$PKG_DEST install } -#package () { - #mv $PKG_DEST/usr/local/* $PKG_DEST/usr/ -#} +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/libseccomp.xibuild b/repo/system/libseccomp.xibuild index 2fda78c..f5de719 100644 --- a/repo/system/libseccomp.xibuild +++ b/repo/system/libseccomp.xibuild @@ -10,7 +10,12 @@ DESC="Enhanced seccomp library" build () { ./configure --prefix=/usr --disable-static && make +} + +check () { make check - make prefix=/usr lib=lib DESTDIR=$PKG_DEST install +} +package () { + make prefix=/usr lib=lib DESTDIR=$PKG_DEST install } diff --git a/repo/system/libsigsegv.xibuild b/repo/system/libsigsegv.xibuild index 89b9ea6..b9d35d3 100644 --- a/repo/system/libsigsegv.xibuild +++ b/repo/system/libsigsegv.xibuild @@ -7,9 +7,11 @@ SOURCE=https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-$PKG_VER.tar.gz DESC="A library for handling page faults in user mode" build () { - ./configure \ --prefix=/usr --enable-shared --disable-static make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libtasn1.xibuild b/repo/system/libtasn1.xibuild index 64cdaad..b93b213 100644 --- a/repo/system/libtasn1.xibuild +++ b/repo/system/libtasn1.xibuild @@ -7,9 +7,11 @@ SOURCE=https://ftp.gnu.org/gnu/libtasn1/libtasn1-$PKG_VER.tar.gz DESC="The ASN.1 library used in GNUTLS" build () { - ./configure \ --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libtool.xibuild b/repo/system/libtool.xibuild index 86710dc..56914e8 100644 --- a/repo/system/libtool.xibuild +++ b/repo/system/libtool.xibuild @@ -9,11 +9,13 @@ DESC="A generic library support script" build () { ./configure --prefix=/usr make - make check +} - make DESTDIR=$PKG_DEST install +check () { + make check } package () { + make DESTDIR=$PKG_DEST install rm -fv $PKG_DEST/usr/lib/libltdl.a } diff --git a/repo/system/libunistring.xibuild b/repo/system/libunistring.xibuild index b236e0f..ac09168 100644 --- a/repo/system/libunistring.xibuild +++ b/repo/system/libunistring.xibuild @@ -11,5 +11,8 @@ build () { ./configure \ --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libxcrypt.xibuild b/repo/system/libxcrypt.xibuild index 8fd8dd3..f1e1c35 100644 --- a/repo/system/libxcrypt.xibuild +++ b/repo/system/libxcrypt.xibuild @@ -9,10 +9,11 @@ DESC="A modern library for one-way hashing of passwords" build () { CC=gcc ./configure --prefix=/usr make - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install + # this is probably wrong ln $PKG_DEST/usr/lib/libcrypt.so $PKG_DEST/usr/lib/libcrypt.so.2 } diff --git a/repo/system/libxml2.xibuild b/repo/system/libxml2.xibuild index d5a1440..99f626a 100644 --- a/repo/system/libxml2.xibuild +++ b/repo/system/libxml2.xibuild @@ -12,5 +12,8 @@ build () { --with-history \ --with-python=/usr/bin/python3 && make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/libxslt.xibuild b/repo/system/libxslt.xibuild index 4971372..80bda77 100644 --- a/repo/system/libxslt.xibuild +++ b/repo/system/libxslt.xibuild @@ -7,13 +7,18 @@ SOURCE=http://xmlsoft.org/sources/libxslt-$PKG_VER.tar.gz DESC="XML stylesheet transformation library" -build () { +patch () { sed -i s/3000/5000/ libxslt/transform.c doc/xsltproc.{1,xml} && sed -i -r '/max(Parser)?Depth/d' ./tests/fuzz/fuzz.c && +} + +build () { ./configure --prefix=/usr --disable-static --without-python && make sed -e 's@http://cdn.docbook.org/release/xsl@https://cdn.docbook.org/release/xsl-nons@' \ -e 's@\$Date\$@31 October 2019@' -i doc/xsltproc.xml && xsltproc/xsltproc --nonet doc/xsltproc.xml -o doc/xsltproc.1 +} +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/lz4.xibuild b/repo/system/lz4.xibuild index f49053f..288ff65 100644 --- a/repo/system/lz4.xibuild +++ b/repo/system/lz4.xibuild @@ -9,6 +9,8 @@ DESC="A lossless compression algorithm, providing high compression speeds" build () { make +} +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/mpfr.xibuild b/repo/system/mpfr.xibuild index 629c230..5e0b35d 100644 --- a/repo/system/mpfr.xibuild +++ b/repo/system/mpfr.xibuild @@ -11,9 +11,13 @@ build () { ./configure --prefix=/usr --disable-static --enable-thread-safe --docdir=/usr/share/doc/mpfr-$PKG_VER make make html +} +check () { make check +} +package () { make DESTDIR=$PKG_DEST install make DESTDIR=$PKG_DEST install-html } diff --git a/repo/system/ncurses.xibuild b/repo/system/ncurses.xibuild index c02f7c4..5f4addd 100644 --- a/repo/system/ncurses.xibuild +++ b/repo/system/ncurses.xibuild @@ -12,11 +12,11 @@ build () { make - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install for lib in ncurses form panel menu ; do rm -vf $PKG_DEST/usr/lib/lib${lib}.so diff --git a/repo/system/nettle.xibuild b/repo/system/nettle.xibuild index afd0ba7..737ca78 100644 --- a/repo/system/nettle.xibuild +++ b/repo/system/nettle.xibuild @@ -11,5 +11,8 @@ build () { ./configure \ --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/nspr.xibuild b/repo/system/nspr.xibuild index f7a3d55..9ce0d68 100644 --- a/repo/system/nspr.xibuild +++ b/repo/system/nspr.xibuild @@ -7,14 +7,18 @@ PKG_VER=4.33 SOURCE=https://archive.mozilla.org/pub/nspr/releases/v$PKG_VER/src/nspr-$PKG_VER.tar.gz DESC="Netscape Portable Runtime" -build () { +patch () { sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in sed -i 's#$(LIBRARY) ##' config/rules.mk +} - +build () { cd nspr ./configure \ --prefix=/usr --with-mozilla --with-pthreads --enable-64bit make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/openssl.xibuild b/repo/system/openssl.xibuild index f057063..0b55050 100644 --- a/repo/system/openssl.xibuild +++ b/repo/system/openssl.xibuild @@ -9,11 +9,11 @@ DESC="The open source management tools and libraries for cryptography" build () { ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib shared zlib-dynamic make - sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile - make MANSUFFIX=ssl DESTDIR=$PKG_DEST install } package () { + sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile + make MANSUFFIX=ssl DESTDIR=$PKG_DEST install mkdir -pv $PKG_DEST/usr/share/doc/openssl cp -vfr doc/* $PKG_DEST/usr/share/doc/openssl } diff --git a/repo/system/pam.xibuild b/repo/system/pam.xibuild index 3166ad2..b0c18c5 100644 --- a/repo/system/pam.xibuild +++ b/repo/system/pam.xibuild @@ -6,12 +6,15 @@ PKG_VER=1.5.2 SOURCE=https://github.com/linux-pam/linux-pam/releases/download/v$PKG_VER/Linux-PAM-$PKG_VER.tar.xz DESC="PAM (Pluggable Authentication Modules) library" -build () { +patch() { # prevent install of an uneeded systemd file sed -e /service_DATA/d \ -i modules/pam_namespace/Makefile.am && autoreconf +} + +build () { ./configure --prefix=/usr \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ @@ -19,11 +22,11 @@ build () { --enable-securedir=/usr/lib/security \ --docdir=/usr/share/doc/Linux-PAM-$PKG_VER && make - - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install + install -v -m755 -d $PKG_DEST/etc/pam.d && cat > $PKG_DEST/etc/pam.d/other << "EOF" diff --git a/repo/system/pcre.xibuild b/repo/system/pcre.xibuild index 721acfe..beb1114 100644 --- a/repo/system/pcre.xibuild +++ b/repo/system/pcre.xibuild @@ -9,12 +9,12 @@ DESC="A library that implements regular expressions in a perl style" build () { CC=gcc ./configure --prefix=/usr make - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install # this probably is not right but it works for now - ln $PKG_DEST/usr/lib/libpcre2-8.so $PKG_DEST/usr/lib/libpcre.so.1 + ln /usr/lib/libpcre2-8.so $PKG_DEST/usr/lib/libpcre.so.1 } diff --git a/repo/system/perl-xml-parser.xibuild b/repo/system/perl-xml-parser.xibuild index d5cdba6..1b650de 100644 --- a/repo/system/perl-xml-parser.xibuild +++ b/repo/system/perl-xml-parser.xibuild @@ -9,6 +9,12 @@ DESC="A perl interface for the expat XML parser" build () { perl Makefile.PL make +} + +check () { make test +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/perl.xibuild b/repo/system/perl.xibuild index 8833465..c2f2766 100644 --- a/repo/system/perl.xibuild +++ b/repo/system/perl.xibuild @@ -7,13 +7,19 @@ SOURCE=https://www.cpan.org/src/5.0/perl-$PKG_VER.tar.gz DESC="The Practical Extraction and Report Language" build () { - #export BUILD_ZLIB=False - #export BUILD_BZIP2=0 + export BUILD_ZLIB=False + export BUILD_BZIP2=0 sh Configure -des -Dprefix=/usr -Dlibs=-lm -Uloclibpth -Ulocincpth make +} + +check () { make test +} + +package () { make DESTDIR=$PKG_DEST install unset BUILD_ZLIB BUILD_BZIP2 } diff --git a/repo/system/psmisc.xibuild b/repo/system/psmisc.xibuild index 9b8a71e..fee5483 100644 --- a/repo/system/psmisc.xibuild +++ b/repo/system/psmisc.xibuild @@ -10,5 +10,8 @@ build () { ./autogen.sh ./configure --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/python-requests.xibuild b/repo/system/python-requests.xibuild index 7752729..145473b 100644 --- a/repo/system/python-requests.xibuild +++ b/repo/system/python-requests.xibuild @@ -5,7 +5,7 @@ DEPS=(python) SOURCE=git://github.com/psf/requests.git DESC="the requests module for python" -build () { +package () { mkdir -p $PKG_DEST/usr/lib/python3.10/site-packages/ pip install -t $PKG_DEST/usr/lib/python3.10/site-packages/ . } diff --git a/repo/system/python.xibuild b/repo/system/python.xibuild index 88b3fff..76c0592 100644 --- a/repo/system/python.xibuild +++ b/repo/system/python.xibuild @@ -9,10 +9,10 @@ DESC="The Python development environment" build () { ./configure --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --with-ensurepip=yes --enable-optimizations --with-ssl --with-requests make - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install ln -s /usr/bin/python3 $PKG_DEST/usr/bin/python ln -s /usr/bin/pip3 $PKG_DEST/usr/bin/pip } diff --git a/repo/system/readline.xibuild b/repo/system/readline.xibuild index 4c1f4ed..db34667 100644 --- a/repo/system/readline.xibuild +++ b/repo/system/readline.xibuild @@ -8,18 +8,22 @@ SOURCE=https://ftp.gnu.org/gnu/readline/readline-$PKG_VER.tar.gz DESC="a set of libraries that offer command line editing and history capabilities" -build () { +patch () { sed -i '/MV.*old/d' Makefile.in sed -i '/{OLDSUFF}/c:' support/shlib-install +} +build () { ./configure --prefix=/usr \ --disable-static \ --with-curses \ --docdir=/usr/share/doc/readline-8.1 make SHLIB_LIBS="-lncursesw" - make SHLIB_LIBS="-lncursesw" DESTDIR=$PKG_DEST install +} +package () { + make SHLIB_LIBS="-lncursesw" DESTDIR=$PKG_DEST install install -v -m644 doc/*.{ps,pdf,html,dvi} $PKG_DEST/usr/share/doc/readline-8.1 } diff --git a/repo/system/rtmpdump.xibuild b/repo/system/rtmpdump.xibuild index 35197b1..a9f561a 100644 --- a/repo/system/rtmpdump.xibuild +++ b/repo/system/rtmpdump.xibuild @@ -6,10 +6,15 @@ SOURCE=git://git.ffmpeg.org/rtmpdump BRANCH="fa8646d" DESC="Tool to download rtmp streams" -build () { +patch () { sed -e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' -e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' -i Makefile -i librtmp/Makefile +} +build () { make SYS=posix +} + +package () { make \ prefix='/usr' \ sbindir='/usr/bin' \ diff --git a/repo/system/shadow.xibuild b/repo/system/shadow.xibuild index e190686..ea32c22 100644 --- a/repo/system/shadow.xibuild +++ b/repo/system/shadow.xibuild @@ -7,7 +7,7 @@ PKG_VER=4.10 SOURCE=https://github.com/shadow-maint/shadow/releases/download/v$PKG_VER/shadow-$PKG_VER.tar.xz DESC="Password and account management tool suite with support for shadow files and PAM" -build () { +patch () { curl https://www.linuxfromscratch.org/patches/lfs/development/shadow-$PKG_VER-useradd_segfault-1.patch > shadow-$PKG_VER-useradd_segfault-1.patch patch -Np1 -i shadow-$PKG_VER-useradd_segfault-1.patch @@ -27,16 +27,16 @@ build () { mkdir -p $PKG_DEST/usr/bin touch $PKG_DEST/usr/bin/passwd - ./configure --sysconfdir=/etc --with-group-name-max-length=32 - - make - make exec_prefix=/usr DESTDIR=$PKG_DEST install - - make DESTDIR=$PKG_DEST -C man install-man +} +build () { + ./configure --sysconfdir=/etc --with-group-name-max-length=32 + make } package () { + make exec_prefix=/usr DESTDIR=$PKG_DEST install + make DESTDIR=$PKG_DEST -C man install-man mkdir -p $PKG_DEST/etc/default } diff --git a/repo/system/sysklogd.xibuild b/repo/system/sysklogd.xibuild index bf1a021..34713bf 100644 --- a/repo/system/sysklogd.xibuild +++ b/repo/system/sysklogd.xibuild @@ -8,5 +8,8 @@ DESC="Programs for logging system messages" build () { ./configure && make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/sysvinit.xibuild b/repo/system/sysvinit.xibuild index fc4cb18..7a52901 100644 --- a/repo/system/sysvinit.xibuild +++ b/repo/system/sysvinit.xibuild @@ -6,10 +6,14 @@ PKG_VER=3.01 SOURCE=http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-$PKG_VER.tar.xz DESC="The sysvinit system for controlling startup, running and shutdown of the system" -build () { +patch () { curl https://www.linuxfromscratch.org/patches/lfs/development/sysvinit-$PKG_VER-consolidated-1.patch > sysvinit-$PKG_VER-consolidated-1.patch patch -Np1 -i sysvinit-$PKG_VER-consolidated-1.patch - +} +build () { make +} + +package () { make ROOT=$PKG_DEST install } diff --git a/repo/system/tar.xibuild b/repo/system/tar.xibuild index 66f297d..5ebac62 100644 --- a/repo/system/tar.xibuild +++ b/repo/system/tar.xibuild @@ -9,6 +9,9 @@ DESC="Utility used to store, backup and transport files" build () { FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/tcl.xibuild b/repo/system/tcl.xibuild index cdd1455..6c39ed9 100644 --- a/repo/system/tcl.xibuild +++ b/repo/system/tcl.xibuild @@ -30,9 +30,10 @@ build () { -i pkgs/itcl4.2.1/itclConfig.sh unset SRCDIR +} +check () { make test - } package () { diff --git a/repo/system/xxhash.xibuild b/repo/system/xxhash.xibuild index ef0e347..b389d46 100644 --- a/repo/system/xxhash.xibuild +++ b/repo/system/xxhash.xibuild @@ -9,6 +9,9 @@ DESC="xxHash is an Extremely fast Hash algorithm" build () { make +} + +package () { make DESTDIR=$PKG_DEST install } diff --git a/repo/system/xz.xibuild b/repo/system/xz.xibuild index bf48653..5d04634 100644 --- a/repo/system/xz.xibuild +++ b/repo/system/xz.xibuild @@ -12,7 +12,12 @@ build () { ./autogen.sh ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/xz-$PKG_VER make +} + +check () { make check - make DESTDIR=$PKG_DEST install } +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/zip.xibuild b/repo/system/zip.xibuild index 3c1f1e1..46cbc91 100644 --- a/repo/system/zip.xibuild +++ b/repo/system/zip.xibuild @@ -8,5 +8,8 @@ DESC="Compressor/archiver for creating and modifying zipfiles" build () { make -f unix/Makefile generic_gcc +} + +package () { make -f unix/Makefile prefix=$PKG_DEST/usr install } diff --git a/repo/system/zlib.xibuild b/repo/system/zlib.xibuild index d22e0c1..6b822f9 100644 --- a/repo/system/zlib.xibuild +++ b/repo/system/zlib.xibuild @@ -10,11 +10,14 @@ DESC="compression and decompression routines used by some programs" build () { ./configure --prefix=/usr make +} + +check () { make check - make DESTDIR=$PKG_DEST install } package () { + make DESTDIR=$PKG_DEST install rm -fv $PKG_DEST/usr/lib/libz.a } diff --git a/repo/system/zstd.xibuild b/repo/system/zstd.xibuild index 2fd4bfc..6f6a058 100644 --- a/repo/system/zstd.xibuild +++ b/repo/system/zstd.xibuild @@ -8,8 +8,13 @@ DESC="the Zstandard real-time compression algorithm" build () { make +} +check () { # fix these tests to work - #make check + make check || true +} + +package () { make prefix=$PKG_DEST/usr install } |