diff --git a/base/.buildlist.base b/base/.buildlist.base index ffa8f8a..1f5467f 100644 --- a/base/.buildlist.base +++ b/base/.buildlist.base @@ -21,8 +21,6 @@ libsodium libunistring bzip2 libffi -libgpg-error -libgcrypt mksh mdadm mtools @@ -72,6 +70,7 @@ tzdb pciutils openssl sqlite +libpng python3 libxml2 libxslt @@ -85,12 +84,13 @@ python-mako python-six python-cheetah pyelftools -pax-utils gettext iso-codes libtool docbook itstool +libgpg-error +libgcrypt yasm makeself gperf @@ -101,6 +101,7 @@ libaio libarchive ninja meson +pax-utils wayland wayland-protocols glib @@ -127,7 +128,6 @@ gptfdisk gmp mpfr libcroco -libpng libexif fribidi lzo @@ -160,6 +160,7 @@ brotli hyphen fuse2 fuse3 +p11-kit gnutls libsndfile libtorrent @@ -209,7 +210,7 @@ p7zip x264 libseccomp scons -jam +ftjam lm-sensors htop gdbm @@ -239,7 +240,6 @@ id3lib libid3tag woff2 libsecret -p11-kit miniupnpc gloox libuv @@ -308,21 +308,10 @@ highlight llvm rust cbindgen -sccache libplist -iniparser -ndctl -dmraid -libatasmart -libyaml -libbytesize -libblockdev -mozjs -polkit nodejs fmt argon2 qrencode libqalculate protobuf -rpi-userland diff --git a/base/acl/acl.SMBuild b/base/acl/acl.SMBuild index 991f2a8..1336fac 100755 --- a/base/acl/acl.SMBuild +++ b/base/acl/acl.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" + --prefix= make make install DESTDIR=$pkg diff --git a/base/acpid/acpid.SMBuild b/base/acpid/acpid.SMBuild index d1f5444..506a66a 100755 --- a/base/acpid/acpid.SMBuild +++ b/base/acpid/acpid.SMBuild @@ -6,9 +6,9 @@ homepage="https://sourceforge.net/projects/acpid2" download="" desc="Tools and daemon for implementing ACPI standard on Linux" requires="musl" +apparch="x86_64" prepbuilddir() { - compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -19,9 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --sysconfdir=/etc \ - --sbindir=/bin + --prefix= make make install DESTDIR=$pkg diff --git a/base/alsa-lib/alsa-lib.SMBuild b/base/alsa-lib/alsa-lib.SMBuild index 0f00a0c..b1d9580 100755 --- a/base/alsa-lib/alsa-lib.SMBuild +++ b/base/alsa-lib/alsa-lib.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-python \ --disable-static \ --disable-resmgr \ @@ -39,7 +39,7 @@ build() { mkdir -p etc ; touch etc/asound.conf.new ) - if [ "$arch" = "aarch64" ]; then + if [[ $arch = aarch64 ]]; then # Provide some sample conf files for using USB audio by overwriting the above file cp $srcdir/alsa.conf.rpi.usbaudio $pkg/share/alsa/alsa.conf.new cp $srcdir/asound.conf.rpi $pkg/etc/asound.conf.new diff --git a/base/alsa-lib/doinst.sh b/base/alsa-lib/doinst.sh index 5caad19..318dac0 100644 --- a/base/alsa-lib/doinst.sh +++ b/base/alsa-lib/doinst.sh @@ -10,5 +10,5 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config share/alsa/alsa.conf.new +config usr/share/alsa/alsa.conf.new config etc/asound.conf.new diff --git a/base/alsa-plugins/alsa-plugins.SMBuild b/base/alsa-plugins/alsa-plugins.SMBuild index 50c4d57..65df623 100755 --- a/base/alsa-plugins/alsa-plugins.SMBuild +++ b/base/alsa-plugins/alsa-plugins.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --libdir=/lib + --prefix= make make install DESTDIR=$pkg diff --git a/base/alsa-utils/alsa-utils.SMBuild b/base/alsa-utils/alsa-utils.SMBuild index d924162..b36194b 100755 --- a/base/alsa-utils/alsa-utils.SMBuild +++ b/base/alsa-utils/alsa-utils.SMBuild @@ -18,11 +18,9 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --bindir=/bin \ + --prefix= \ --sbindir=/bin \ - --mandir="/share/man" \ - --disable-xmlto + --with-udev-rules-dir=/lib/udev/rules.d make make install DESTDIR=$pkg diff --git a/base/argon2/argon2.SMBuild b/base/argon2/argon2.SMBuild index b94f82d..9600668 100755 --- a/base/argon2/argon2.SMBuild +++ b/base/argon2/argon2.SMBuild @@ -17,8 +17,8 @@ prepbuilddir() { } build() { - make OPTTARGET="none" LIBRARY_REL="lib" PREFIX="/" - make OPTTARGET="none" LIBRARY_REL="lib" PREFIX="/" install DESTDIR=$pkg + make OPTTARGET="none" LIBRARY_REL="lib" PREFIX= + make OPTTARGET="none" LIBRARY_REL="lib" PREFIX= install DESTDIR=$pkg cp LICENSE $pkgdocs/ diff --git a/base/argp-standalone/argp-standalone.SMBuild b/base/argp-standalone/argp-standalone.SMBuild index a2221c0..bad0ae5 100755 --- a/base/argp-standalone/argp-standalone.SMBuild +++ b/base/argp-standalone/argp-standalone.SMBuild @@ -5,7 +5,7 @@ build=1sml homepage="http://www.lysator.liu.se/~nisse/misc/" download="http://www.lysator.liu.se/~nisse/misc/argp-standalone-$version.tar.gz" desc="Hierarchical argument parsing library broken out of glibc" -requires="musl" +requires="perl" preservestaticlibs=1 prepbuilddir() { @@ -22,7 +22,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make diff --git a/base/asciidoc/asciidoc.SMBuild b/base/asciidoc/asciidoc.SMBuild index 379964a..c31dcaa 100755 --- a/base/asciidoc/asciidoc.SMBuild +++ b/base/asciidoc/asciidoc.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/aspell/aspell.SMBuild b/base/aspell/aspell.SMBuild index 4245072..bf0bf78 100755 --- a/base/aspell/aspell.SMBuild +++ b/base/aspell/aspell.SMBuild @@ -17,13 +17,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --sysconfdir=/etc/aspell \ - --libdir=/lib \ - --enable-pkgdatadir=/lib/aspell \ - --enable-data-dir=/lib/aspell \ - --enable-pkglibdir=/lib/aspell \ - --enable-dict-dir=/lib/aspell + --prefix= \ + --sysconfdir=/etc/aspell make make install DESTDIR=$pkg diff --git a/base/attr/attr.SMBuild b/base/attr/attr.SMBuild index 488d897..b5ef6bc 100755 --- a/base/attr/attr.SMBuild +++ b/base/attr/attr.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/autoconf/autoconf.SMBuild b/base/autoconf/autoconf.SMBuild index 097699e..a9e320a 100755 --- a/base/autoconf/autoconf.SMBuild +++ b/base/autoconf/autoconf.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/automake/automake.SMBuild b/base/automake/automake.SMBuild index 11f5bc8..04ba32c 100755 --- a/base/automake/automake.SMBuild +++ b/base/automake/automake.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/bash-completion/bash-completion.SMBuild b/base/bash-completion/bash-completion.SMBuild index 124d892..5bc935c 100755 --- a/base/bash-completion/bash-completion.SMBuild +++ b/base/bash-completion/bash-completion.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/bash/bash.SMBuild b/base/bash/bash.SMBuild index 4ecbcb8..cf661cd 100755 --- a/base/bash/bash.SMBuild +++ b/base/bash/bash.SMBuild @@ -22,9 +22,8 @@ build() { ac_cv_rl_version=5.0 \ LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ - --docdir="/share/doc/$app-$version" \ --without-bash-malloc \ --disable-rpath \ --enable-history diff --git a/base/bison/bison.SMBuild b/base/bison/bison.SMBuild index 91ab3b4..8054ee1 100755 --- a/base/bison/bison.SMBuild +++ b/base/bison/bison.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" + --prefix= make make install DESTDIR=$pkg diff --git a/base/brotli/brotli.SMBuild b/base/brotli/brotli.SMBuild index 80a435d..67a9205 100755 --- a/base/brotli/brotli.SMBuild +++ b/base/brotli/brotli.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/bubblewrap/bubblewrap.SMBuild b/base/bubblewrap/bubblewrap.SMBuild index 9fa17c1..535ae1a 100755 --- a/base/bubblewrap/bubblewrap.SMBuild +++ b/base/bubblewrap/bubblewrap.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --with-priv-mode=setuid \ --disable-man diff --git a/base/c-ares/c-ares.SMBuild b/base/c-ares/c-ares.SMBuild index 62c1f5d..ffd6127 100755 --- a/base/c-ares/c-ares.SMBuild +++ b/base/c-ares/c-ares.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared make diff --git a/base/cbindgen/cbindgen.SMBuild b/base/cbindgen/cbindgen.SMBuild index b340ee4..d20bca9 100755 --- a/base/cbindgen/cbindgen.SMBuild +++ b/base/cbindgen/cbindgen.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { RUSTONIG_DYNAMIC_LIBONIG=1 \ - cargo build --offline --release --target $arch-unknown-linux-musl $MAKEFLAGS + cargo build --release --target $arch-unknown-linux-musl $MAKEFLAGS install -Dm 755 target/$arch-unknown-linux-musl/release/cbindgen $pkg/bin/cbindgen cp LICENSE $pkgdocs/ diff --git a/base/ccache/ccache.SMBuild b/base/ccache/ccache.SMBuild index 6518e5c..f4068a5 100755 --- a/base/ccache/ccache.SMBuild +++ b/base/ccache/ccache.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/chrpath/chrpath.SMBuild b/base/chrpath/chrpath.SMBuild index 888cf2f..3276724 100755 --- a/base/chrpath/chrpath.SMBuild +++ b/base/chrpath/chrpath.SMBuild @@ -18,10 +18,10 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= make - make install mandir="/share/man" docdir="/share/doc/$app-$version" DESTDIR=$pkg + make install DESTDIR=$pkg mkfinalpkg } diff --git a/base/cmake/cmake.SMBuild b/base/cmake/cmake.SMBuild index 4974d2c..1c083ae 100755 --- a/base/cmake/cmake.SMBuild +++ b/base/cmake/cmake.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=cmake -version=3.17.3 -build=2sml +version=3.26.4 +build=1sml homepage="http://www.cmake.org" download="https://cmake.org/files/v$version/cmake-$version.tar.gz" desc="Cross-platform, open-source make system" @@ -20,8 +20,7 @@ build() { para="$(echo $MAKEFLAGS | sed 's/-j//')" ./bootstrap \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --no-system-curl \ --no-system-expat \ --no-system-jsoncpp \ @@ -40,5 +39,5 @@ build() { } sha512sums=" -e68eb80a294a4ee441f5e29b95a6450677ef8d7a8aa40e29e7475db9aa7566edd903ce4bfb57a0795f8e31dd29f16620f588b81b5fd9f74e80f996de980bccd3 cmake-3.17.3.tar.lz -" +30b886e39df4d0bcc613a2d83b7f07537b45ca5d91375bbf4d8481bec0e0ff1226180f5491318d05438837ab27e4f89c9d25735ce22389c5d6bdf86edd48231a cmake-3.26.4.tar.lz +" \ No newline at end of file diff --git a/base/coreutils/coreutils.SMBuild b/base/coreutils/coreutils.SMBuild index 38ab7e7..3abf4e7 100755 --- a/base/coreutils/coreutils.SMBuild +++ b/base/coreutils/coreutils.SMBuild @@ -22,7 +22,7 @@ build() { FORCE_UNSAFE_CONFIGURE=1 \ LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ --libexecdir=/lib \ --without-gmp diff --git a/base/cpio/cpio.SMBuild b/base/cpio/cpio.SMBuild index a71c0b9..37704c4 100755 --- a/base/cpio/cpio.SMBuild +++ b/base/cpio/cpio.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { CFLAGS+=" -fcommon" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/cryptsetup/cryptsetup.SMBuild b/base/cryptsetup/cryptsetup.SMBuild index 2fe378f..679bbc5 100755 --- a/base/cryptsetup/cryptsetup.SMBuild +++ b/base/cryptsetup/cryptsetup.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --libdir=/lib \ --sysconfdir=/etc diff --git a/base/curl/curl.SMBuild b/base/curl/curl.SMBuild index 3a352e1..cc78d99 100755 --- a/base/curl/curl.SMBuild +++ b/base/curl/curl.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sysconfdir=/etc \ --with-libssh2 \ --without-ca-bundle \ @@ -37,7 +37,7 @@ build() { ) # We don't ship the related perl script (yet): - rm -f $pkg/share/man/man1/mk-ca-bundle.1 + rm -f $pkg/usr/share/man/man1/mk-ca-bundle.1 cp COPYING $pkgdocs/ diff --git a/base/cython/cython.SMBuild b/base/cython/cython.SMBuild index c435b3d..610222c 100755 --- a/base/cython/cython.SMBuild +++ b/base/cython/cython.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp COPYING.txt LICENSE.txt $pkgdocs/ diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild index 2df4ca5..511487c 100755 --- a/base/db/db.SMBuild +++ b/base/db/db.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { } build() { - if [ "$arch" = "aarch64" ]; then + if [[ $arch = aarch64 ]]; then db_atomic=gcc-builtin else db_atomic=x86/gcc-assembly @@ -32,8 +32,7 @@ build() { db_cv_mmap_extend=yes \ db_cv_atomic="$db_atomic" \ ../dist/configure \ - --prefix="" \ - --libdir=/lib \ + --prefix= \ --enable-shared \ --disable-static \ --enable-dbm \ diff --git a/base/dcron/dcron.SMBuild b/base/dcron/dcron.SMBuild index f5cabdb..d0b41d6 100755 --- a/base/dcron/dcron.SMBuild +++ b/base/dcron/dcron.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { } build() { - make PREFIX="" BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root + make PREFIX=/ BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root install -Dm 755 crond $pkg/bin/crond install -Dm 4711 crontab $pkg/bin/crontab diff --git a/base/desktop-file-utils/desktop-file-utils.SMBuild b/base/desktop-file-utils/desktop-file-utils.SMBuild index 617733a..4846ed7 100755 --- a/base/desktop-file-utils/desktop-file-utils.SMBuild +++ b/base/desktop-file-utils/desktop-file-utils.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/dialog/dialog.SMBuild b/base/dialog/dialog.SMBuild index f664c40..1b82f05 100755 --- a/base/dialog/dialog.SMBuild +++ b/base/dialog/dialog.SMBuild @@ -17,10 +17,9 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --bindir=/bin \ + --prefix= \ --with-shared \ - --with-x + --without-x make make install DESTDIR=$pkg diff --git a/base/diffutils/diffutils.SMBuild b/base/diffutils/diffutils.SMBuild index 9531ec1..2d2f13a 100755 --- a/base/diffutils/diffutils.SMBuild +++ b/base/diffutils/diffutils.SMBuild @@ -24,7 +24,7 @@ build() { CPPFLAGS="$($srcdir/gnulibfix lib)" \ LDFLAGS="-static" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/dmidecode/dmidecode.SMBuild b/base/dmidecode/dmidecode.SMBuild index cabebfc..9f344f2 100755 --- a/base/dmidecode/dmidecode.SMBuild +++ b/base/dmidecode/dmidecode.SMBuild @@ -6,9 +6,9 @@ homepage="https://www.nongnu.org/dmidecode/" download="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$version.tar.xz" desc="DMI table decoder" requires="musl" +apparch="x86_64" prepbuilddir() { - compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -19,7 +19,7 @@ prepbuilddir() { build() { make - make install DESTDIR=$pkg prefix="" mandir="/share/man" sbindir="/bin" + make install DESTDIR=$pkg prefix= mandir="/share/man" sbindir= cp LICENSE $pkgdocs/ diff --git a/base/dmraid/001-do_not_use_p_for_partition.patch b/base/dmraid/001-do_not_use_p_for_partition.patch deleted file mode 100644 index faa0b5b..0000000 --- a/base/dmraid/001-do_not_use_p_for_partition.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Giuseppe Iuculano -Description: Removed "p" from device name. A proper upgrade script is needed before using it. ---- dmraid/lib/format/partition/dos.c -+++ dmraid/lib/format/partition/dos.c -@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai - { - const char *base = get_basename(lc, rd->di->path); - -- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc), -+ return type ? snprintf(str, len, "%s%u", base, - partition) : snprintf(str, len, "%s", base); - } - diff --git a/base/dmraid/002-support_virtio_devices.patch b/base/dmraid/002-support_virtio_devices.patch deleted file mode 100644 index 17c31c1..0000000 --- a/base/dmraid/002-support_virtio_devices.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Luke Yelavich -Description: Support for checking virtio devices for dmraid metadata. ---- dmraid/lib/device/scan.c -+++ dmraid/lib/device/scan.c -@@ -174,7 +174,7 @@ interested(struct lib_context *lc, char - * Whole IDE and SCSI disks only. - */ - return (!isdigit(name[strlen(name) - 1]) && -- (*(name + 1) == 'd' && (*name == 'h' || *name == 's'))) -+ (*(name + 1) == 'd' && (*name == 'h' || *name == 's' || *name == 'v'))) - #ifdef DMRAID_TEST - /* - * Include dm devices for testing. diff --git a/base/dmraid/003-isw-probe-hpa.patch b/base/dmraid/003-isw-probe-hpa.patch deleted file mode 100644 index 93756a9..0000000 --- a/base/dmraid/003-isw-probe-hpa.patch +++ /dev/null @@ -1,144 +0,0 @@ -Probe isw disks with [some] HPA awareness, thanks to Robert Collins . (LP: #372170) ---- dmraid/lib/format/ataraid/isw.c -+++ dmraid/lib/format/ataraid/isw.c -@@ -353,6 +353,7 @@ raiddev(struct isw *isw, unsigned i) - enum convert { FULL, FIRST, LAST }; - #if BYTE_ORDER == LITTLE_ENDIAN - # define to_cpu(x, y) -+# define CVT16(x) - #else - /* - * We can differ from the read_raid_dev template here, -@@ -547,15 +548,16 @@ disk_ok(struct lib_context *lc, struct d - } - - static void * --isw_read_metadata(struct lib_context *lc, struct dev_info *di, -- size_t * sz, uint64_t * offset, union read_info *info) -+isw_try_sboffset(struct lib_context *lc, struct dev_info *di, -+ size_t * sz, uint64_t * offset, union read_info *info, -+ uint64_t const isw_sboffset) - { - size_t size = ISW_DISK_BLOCK_SIZE; -- uint64_t isw_sboffset = ISW_CONFIGOFFSET(di); - struct isw *isw; -+ uint64_t temp_isw_sboffset = isw_sboffset; - - if (!(isw = alloc_private_and_read(lc, handler, size, -- di->path, isw_sboffset))) -+ di->path, temp_isw_sboffset))) - goto out; - - /* -@@ -565,9 +567,15 @@ isw_read_metadata(struct lib_context *lc - to_cpu(isw, FIRST); - - /* Check Signature and read optional extended metadata. */ -- if (!is_isw(lc, di, isw) || -- !isw_read_extended(lc, di, &isw, &isw_sboffset, &size)) -+ if (!is_isw(lc, di, isw)) { -+ log_dbg(lc, "not isw at %ld", isw_sboffset); - goto bad; -+ } -+ if (!isw_read_extended(lc, di, &isw, &temp_isw_sboffset, &size)) { -+ log_err(lc, "isw metadata, but extended read failed at %ld", -+ isw_sboffset); -+ goto bad; -+ } - - /* - * Now that we made sure, that we've got all the -@@ -578,6 +586,8 @@ isw_read_metadata(struct lib_context *lc - if (disk_ok(lc, di, isw)) { - *sz = size; - *offset = info->u64 = isw_sboffset; -+ log_dbg(lc, "isw metadata found at %ld from probe at %ld\n", -+ *offset, isw_sboffset); - goto out; - } - -@@ -589,6 +599,54 @@ out: - return (void *) isw; - } - -+/* HPA on a disk shifts everything down. This is a 'works-enough' approach to -+ * handling that. There is a better long term approach requiring kernel -+ * patches - see the lkml patches for alt_size. -+ */ -+static void * -+isw_try_hpa(struct lib_context *lc, struct dev_info *di, -+ size_t * sz, uint64_t * offset, union read_info *info) -+{ -+ struct isw10 *isw10; -+ void *result = NULL; -+ uint64_t actual_offset; -+ if (!(isw10 = alloc_private_and_read(lc, handler, ISW_DISK_BLOCK_SIZE, -+ di->path, ISW_10_CONFIGOFFSET(di)))) -+ goto out; -+ if (strncmp((const char *)isw10->sig, ISW10_SIGNATURE, ISW10_SIGNATURE_SIZE)) -+ goto out_free; -+ log_dbg(lc, "Found isw 10 gafr signature."); -+ CVT16(isw10->offset); -+ actual_offset = isw10->offset + 2; -+ log_dbg(lc, "isw 10 sector offset calculated at %hd.", actual_offset); -+ if (actual_offset > di->sectors) -+ goto out_free; -+ result = isw_try_sboffset(lc, di, sz, offset, info, -+ ISW_SECTOR_TO_OFFSET(di->sectors - actual_offset)); -+ out_free: -+ dbg_free(isw10); -+ out: -+ return result; -+} -+ -+ -+static void * -+isw_read_metadata(struct lib_context *lc, struct dev_info *di, -+ size_t * sz, uint64_t * offset, union read_info *info) -+{ -+ void *result; -+ if ((result = isw_try_sboffset( -+ lc, di, sz, offset, info, ISW_CONFIGOFFSET(di)))) -+ return result; -+ if ((result = isw_try_hpa(lc, di, sz, offset, info))) -+ return result; -+ log_dbg(lc, "isw trying hard coded -2115 offset."); -+ if ((result = isw_try_sboffset( -+ lc, di, sz, offset, info, (di->sectors - 2115)*512))) -+ return result; -+ return NULL; -+} -+ - static int setup_rd(struct lib_context *lc, struct raid_dev *rd, - struct dev_info *di, void *meta, union read_info *info); - static struct raid_dev * ---- dmraid/lib/format/ataraid/isw.h -+++ dmraid/lib/format/ataraid/isw.h -@@ -36,8 +36,11 @@ - - /* Intel metadata offset in bytes */ - #define ISW_CONFIGSECTOR(di) ((di)->sectors - 2) --#define ISW_CONFIGOFFSET(di) (ISW_CONFIGSECTOR(di) << 9) -+#define ISW_SECTOR_TO_OFFSET(sector) ((sector) << 9) -+#define ISW_CONFIGOFFSET(di) (ISW_SECTOR_TO_OFFSET(ISW_CONFIGSECTOR(di))) - #define ISW_DATAOFFSET 0 /* Data offset in sectors */ -+#define ISW_10_CONFIGSECTOR(di) ((di)->sectors - 1) -+#define ISW_10_CONFIGOFFSET(di) (ISW_SECTOR_TO_OFFSET(ISW_10_CONFIGSECTOR(di))) - - #define MPB_SIGNATURE "Intel Raid ISM Cfg Sig. " - #define MPB_SIGNATURE_SIZE (sizeof(MPB_SIGNATURE) - 1) -@@ -222,6 +225,14 @@ struct isw { - // here comes isw_dev[num_raid_devs] - } __attribute__ ((packed)); - -+#define ISW10_SIGNATURE "$GAFR\x10" -+#define ISW10_SIGNATURE_SIZE (sizeof(ISW10_SIGNATURE) - 1) -+struct isw10 { -+ int8_t sig[ISW10_SIGNATURE_SIZE]; -+ uint32_t offset; /* offset to real data, in sectors back */ -+} __attribute__ ((packed)); -+ -+ - #endif - - int register_isw(struct lib_context *lc); diff --git a/base/dmraid/004-activate_multiple_raid_sets.patch b/base/dmraid/004-activate_multiple_raid_sets.patch deleted file mode 100644 index 4dd64ab..0000000 --- a/base/dmraid/004-activate_multiple_raid_sets.patch +++ /dev/null @@ -1,12 +0,0 @@ -Continue onto all raid sets instead of returning after processing the first. (LP: #401713) ---- dmraid/lib/metadata/metadata.c -+++ dmraid/lib/metadata/metadata.c -@@ -839,7 +839,7 @@ _discover_partitions(struct lib_context - */ - if (T_GROUP(rs)) { - _discover_partitions(lc, &rs->sets); -- return; -+ continue; - } - - /* diff --git a/base/dmraid/005-fix_isw_sectors_calculation.patch b/base/dmraid/005-fix_isw_sectors_calculation.patch deleted file mode 100644 index 9887a35..0000000 --- a/base/dmraid/005-fix_isw_sectors_calculation.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix isw raid0 incorrect sectors calculation, thanks to Valentin Pavlyuchenko ---- dmraid/lib/format/ataraid/isw.c -+++ dmraid/lib/format/ataraid/isw.c -@@ -776,7 +776,9 @@ _create_rd(struct lib_context *lc, - r->di = rd->di; - r->fmt = rd->fmt; - r->offset = dev->vol.map[0].pba_of_lba0; -- if ((r->sectors = dev->vol.map[0].blocks_per_member - RAID_DS_JOURNAL)) -+ //fix bugs on ICH10R -+ //if ((r->sectors = dev->vol.map[0].blocks_per_member - RAID_DS_JOURNAL)) -+ if ((r->sectors = dev->vol.map[0].blocks_per_member)) - goto out; - - log_zero_sectors(lc, rd->di->path, handler); diff --git a/base/dmraid/006-musl-libc.patch b/base/dmraid/006-musl-libc.patch deleted file mode 100644 index bf88d57..0000000 --- a/base/dmraid/006-musl-libc.patch +++ /dev/null @@ -1,20 +0,0 @@ ----dmraid/include/dmraid/misc.h.orig -+++ dmraid/include/dmraid/misc.h -@@ -10,6 +10,7 @@ - - #ifndef _MISC_H_ - #define _MISC_H_ -+#include - - #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0); - ---- dmraid/lib/device/scan.c.orig -+++ dmraid/lib/device/scan.c -@@ -10,6 +10,7 @@ - # include - # include - #else -+# include - # include - # include - #endif diff --git a/base/dmraid/007-fix-loff_t-musl.patch b/base/dmraid/007-fix-loff_t-musl.patch deleted file mode 100644 index 0cd8487..0000000 --- a/base/dmraid/007-fix-loff_t-musl.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: maxice8 -Upstream: no, it seems to be inactive. -Reason: fixes usage of dmraid.h under musl libc. - ---- dmraid/include/dmraid/misc.h -+++ dmraid/include/dmraid/misc.h -@@ -10,6 +10,7 @@ - - #ifndef _MISC_H_ - #define _MISC_H_ -+#define _GNU_SOURCE - #include - - #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0); diff --git a/base/dmraid/dmraid.SMBuild b/base/dmraid/dmraid.SMBuild deleted file mode 100755 index 6891ea7..0000000 --- a/base/dmraid/dmraid.SMBuild +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer: PktSurf -app=dmraid -version=1.0.0 -build=2sml -homepage="https://people.redhat.com/~heinzm/sw/dmraid/" -download="https://people.redhat.com/~heinzm/sw/dmraid/src/dmiraid-$version.rc16-3.tar.bz2" -desc="Tool and a library to discover, configure and activate ATA RAID devices" -requires="lvm" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app - - tar xf $srcdir/$app"-"$version".rc16-3".tar.?z* - cd $app/$version".rc16-3"/dmraid - fixbuilddirpermissions - - applypatch $srcdir/001-do_not_use_p_for_partition.patch - applypatch $srcdir/002-support_virtio_devices.patch - applypatch $srcdir/003-isw-probe-hpa.patch - applypatch $srcdir/004-activate_multiple_raid_sets.patch - applypatch $srcdir/005-fix_isw_sectors_calculation.patch - applypatch $srcdir/006-musl-libc.patch - applypatch $srcdir/007-fix-loff_t-musl.patch -} - -build() { - - unset MAKEFLAGS CFLAGS CXXFLAGS - - ./configure \ - --prefix="" \ - --sysconfdir=/etc \ - --sbindir=/bin \ - --enable-led \ - --enable-intel_led \ - --enable-shared_lib \ - --disable-static_link \ - $builddist - - make -j1 - make install DESTDIR=$pkg - - cp LICENSE* $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e dmraid-1.0.0.rc16-3.tar.bz2 -df1e285f404da61f9d15c9be3fae905599fb5d03203d3cd0551421b89913361d36524f9d2ee899eac9088c35daad9e8d6280a621c6a5832eec1a9be21bd05b12 001-do_not_use_p_for_partition.patch -1486aa76066e959d800506030f37392560e4953eb23fbcb65899ce76ef8e646639d5bd7abed8d9328e9a7f8dcc005fac4312528a8afcc806d228828a5d9b3fb9 002-support_virtio_devices.patch -b679ef5ff2671a8c8aa1a12feb54cfdfa6a40cbb0aef23e49b1ea5a8f97563061f9b207eeaf06da9fbb33837d9d04a4972869adc87eb89eb459aeb1c1e7bc5ee 003-isw-probe-hpa.patch -ce120d7313f7f1b563e95fd9b81e4eb5353edf416a521d2955b0bd7a0c08ec4c0a5da4402aa1690f65d2b4464d1f5fc534ec7819b07ee8791046b25f0209a21b 004-activate_multiple_raid_sets.patch -702cb4cf0edf79dbde9185cada12462681b52bffd5f8c4eab1b594ef754c964fb6c7f711ce77e4074167d920755fe0466d284f94fb272d60ea2314f2a45ef366 005-fix_isw_sectors_calculation.patch -1335297528df24faa292e4d80a57e23e3f910b669a92370e57a97bd4df443092323a91489c2cc1f17e3b280a3a7f0386bb7fed3a157cdab7ab55686e9d5e1ae4 006-musl-libc.patch -3fe66677b7bb3a314cabcab32d35192ddd5ec70e50398a37916197eb2818debf919fe48337fe9befb3a7d7ab727cbeed976413db89585f66fed7375cf9b36ac8 007-fix-loff_t-musl.patch -" diff --git a/base/dosfstools/dosfstools.SMBuild b/base/dosfstools/dosfstools.SMBuild index 90cc589..5c73501 100755 --- a/base/dosfstools/dosfstools.SMBuild +++ b/base/dosfstools/dosfstools.SMBuild @@ -19,9 +19,8 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ - --docdir="/share/doc/$app-$version" \ --enable-compat-symlinks make diff --git a/base/e2fsprogs/e2fsprogs.SMBuild b/base/e2fsprogs/e2fsprogs.SMBuild index 406f9eb..eed7fe0 100755 --- a/base/e2fsprogs/e2fsprogs.SMBuild +++ b/base/e2fsprogs/e2fsprogs.SMBuild @@ -25,8 +25,8 @@ build() { CFLAGS+=" -D__uint64_t=u_int64_t" \ LDFLAGS="-static" \ ./configure \ - --prefix="" \ - --with-root-prefix="" \ + --prefix= \ + --with-root-prefix= \ --sbindir=/bin \ --disable-libblkid \ --disable-libuuid \ diff --git a/base/ed/ed.SMBuild b/base/ed/ed.SMBuild index 039afd8..a283996 100755 --- a/base/ed/ed.SMBuild +++ b/base/ed/ed.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make CFLAGS="$CFLAGS" make install DESTDIR=$pkg diff --git a/base/enchant/enchant.SMBuild b/base/enchant/enchant.SMBuild index 144d2f4..330bb63 100755 --- a/base/enchant/enchant.SMBuild +++ b/base/enchant/enchant.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/enet/enet.SMBuild b/base/enet/enet.SMBuild index 34e1e3b..759e348 100755 --- a/base/enet/enet.SMBuild +++ b/base/enet/enet.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-static=no make diff --git a/base/eudev/eudev.SMBuild b/base/eudev/eudev.SMBuild index 0dfef8a..11bd16e 100755 --- a/base/eudev/eudev.SMBuild +++ b/base/eudev/eudev.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ --sbindir=/bin \ --sysconfdir=/etc \ diff --git a/base/exfat-utils/exfat-utils.SMBuild b/base/exfat-utils/exfat-utils.SMBuild index 695d9e4..81511cc 100755 --- a/base/exfat-utils/exfat-utils.SMBuild +++ b/base/exfat-utils/exfat-utils.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { CFLAGS+=" -std=c99" \ ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin make diff --git a/base/exiv2/exiv2.SMBuild b/base/exiv2/exiv2.SMBuild index c46ceda..43bc3ba 100755 --- a/base/exiv2/exiv2.SMBuild +++ b/base/exiv2/exiv2.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR=lib make diff --git a/base/expat/expat.SMBuild b/base/expat/expat.SMBuild index b969235..ee4fbfc 100755 --- a/base/expat/expat.SMBuild +++ b/base/expat/expat.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/faad2/faad2.SMBuild b/base/faad2/faad2.SMBuild index 5062a5a..e896020 100755 --- a/base/faad2/faad2.SMBuild +++ b/base/faad2/faad2.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/fdk-aac/fdk-aac.SMBuild b/base/fdk-aac/fdk-aac.SMBuild index b93e39d..fe8e587 100755 --- a/base/fdk-aac/fdk-aac.SMBuild +++ b/base/fdk-aac/fdk-aac.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-static diff --git a/base/fftw/fftw.SMBuild b/base/fftw/fftw.SMBuild index 968f43a..f69a84e 100755 --- a/base/fftw/fftw.SMBuild +++ b/base/fftw/fftw.SMBuild @@ -21,10 +21,10 @@ build() { # Default compile options defconfopts() { - [ "$arch" = "aarch64" ] && \ + [[ $arch = aarch64 ]] && \ addconfigopts="--enable-openmp" ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-static \ --enable-threads \ diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild index 9890f45..8efc8ed 100755 --- a/base/file/file.SMBuild +++ b/base/file/file.SMBuild @@ -23,7 +23,7 @@ build() { # linking against libseccomp causes weird "Bad system call" issues CFLAGS+=" --std=c99" \ ./configure \ - --prefix="" \ + --prefix= \ --datadir=/etc \ --enable-fsect-man5 \ --disable-libseccomp @@ -48,6 +48,5 @@ build() { } sha512sums=" -706f52abe8a4140983c03bc9403987153e3996a8bfbfd20d94f82fc7781c710a54e57b8967c8885e0ceec83f86ff0acca14b6d051b854f79df7aaa626d7068b8 file-5.39.tar.lz -26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63 file-5.44.tar.gz +aafc7bb8a84d64ec77b6e325868ce6149dea3fb3cb46868892c7c872dfeb7f56180cd231f2eecba4d256c7dd4936a6886de56b1ef3d69874ce798c1e49b91c05 file-5.44.tar.lz " \ No newline at end of file diff --git a/base/findutils/findutils.SMBuild b/base/findutils/findutils.SMBuild index 90b6111..38e4ef6 100755 --- a/base/findutils/findutils.SMBuild +++ b/base/findutils/findutils.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --libexecdir=/lib make diff --git a/base/flac/flac.SMBuild b/base/flac/flac.SMBuild index 506d481..792ae77 100755 --- a/base/flac/flac.SMBuild +++ b/base/flac/flac.SMBuild @@ -17,15 +17,14 @@ prepbuilddir() { } build() { - if [[ $arch == "aarch64" ]] ; then + if [[ $arch == aarch64 ]] ; then sseopts="--disable-sse" else sseopts="--enable-sse" fi ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ $sseopts make diff --git a/base/flex/flex.SMBuild b/base/flex/flex.SMBuild index ec687f1..e1391bc 100755 --- a/base/flex/flex.SMBuild +++ b/base/flex/flex.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \ ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/fmt/fmt.SMBuild b/base/fmt/fmt.SMBuild index 0f318f3..9cb65e9 100755 --- a/base/fmt/fmt.SMBuild +++ b/base/fmt/fmt.SMBuild @@ -20,8 +20,7 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_INSTALL_LIBDIR="/lib" \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_INSTALL_LIBDIR="lib" \ -DBUILD_SHARED_LIBS=ON \ -DFMT_TEST=OFF \ -Wno-dev diff --git a/base/fribidi/fribidi.SMBuild b/base/fribidi/fribidi.SMBuild index 5cc8247..9cd9c82 100755 --- a/base/fribidi/fribidi.SMBuild +++ b/base/fribidi/fribidi.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/ftjam/ftjam-2.5.3-clang16.patch b/base/ftjam/ftjam-2.5.3-clang16.patch new file mode 100644 index 0000000..5a6c608 --- /dev/null +++ b/base/ftjam/ftjam-2.5.3-clang16.patch @@ -0,0 +1,7 @@ +https://bugs.gentoo.org/870655 +--- a/jam.h ++++ b/jam.h +@@ -382,2 +382,3 @@ + # include ++# include + # include diff --git a/base/ftjam/ftjam-2.5.3-false-flags.patch b/base/ftjam/ftjam-2.5.3-false-flags.patch new file mode 100644 index 0000000..1b33a0f --- /dev/null +++ b/base/ftjam/ftjam-2.5.3-false-flags.patch @@ -0,0 +1,59 @@ +Respect CC, *FLAGS. Add datarootdir for autoconf-2.60 warnings. + +--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in ++++ ftjam-2.5.3rc2/builds/unix/Makefile.in +@@ -37,6 +37,7 @@ exec_prefix := @exec_prefix@ + libdir := @libdir@ + bindir := @bindir@ + includedir := @includedir@ ++datarootdir := @datarootdir@ + datadir := @datadir@ + + version_info := @version_info@ +--- ftjam-2.5.3rc2-orig/jambase.c ++++ ftjam-2.5.3rc2/jambase.c +@@ -652,21 +652,21 @@ const char *jambase[] = { + "\n", + "AR ?= ar ru ;\n", + "AS ?= as ;\n", +-"ASFLAGS ?= ;\n", ++"ASFLAGS += $(ASFLAGS) ;\n", + "AWK ?= awk ;\n", + "BINDIR ?= /usr/local/bin ;\n", +-"C++ ?= cc ;\n", +-"C++FLAGS ?= ;\n", +-"CC ?= cc ;\n", +-"CCFLAGS ?= ;\n", ++"C++ ?= $(CXX) ;\n", ++"C++FLAGS += $(CXXFLAGS) ;\n", ++"CC ?= $(CC) ;\n", ++"CCFLAGS += $(CFLAGS) ;\n", + "CP ?= cp -f ;\n", + "CRELIB ?= ;\n", + "DOT ?= . ;\n", + "DOTDOT ?= .. ;\n", + "EXEMODE ?= 711 ;\n", + "FILEMODE ?= 644 ;\n", +-"FORTRAN ?= f77 ;\n", +-"FORTRANFLAGS ?= ;\n", ++"FORTRAN ?= $(F77) ;\n", ++"FORTRANFLAGS += $(FFLAGS) ;\n", + "HDRS ?= ;\n", + "INSTALLGRIST ?= installed ;\n", + "JAMFILE ?= Jamfile ;\n", +@@ -674,13 +674,13 @@ const char *jambase[] = { + "LEX ?= ;\n", + "LIBDIR ?= /usr/local/lib ;\n", + "LINK ?= $(CC) ;\n", +-"LINKFLAGS ?= ;\n", ++"LINKFLAGS += $(LDFLAGS) ;\n", + "LINKLIBS ?= ;\n", + "LN ?= ln ;\n", + "MANDIR ?= /usr/local/man ;\n", + "MKDIR ?= mkdir ;\n", + "MV ?= mv -f ;\n", +-"OPTIM ?= ;\n", ++"OPTIM = ;\n", + "RCP ?= rcp ;\n", + "RM ?= rm -f ;\n", + "RMDIR ?= $(RM) ;\n", diff --git a/base/ftjam/ftjam-2.5.3-i-hate-yacc.patch b/base/ftjam/ftjam-2.5.3-i-hate-yacc.patch new file mode 100644 index 0000000..44322d6 --- /dev/null +++ b/base/ftjam/ftjam-2.5.3-i-hate-yacc.patch @@ -0,0 +1,54 @@ +diff -Naurp ftjam-2.5.3rc2-orig/Jambase ftjam-2.5.3rc2/Jambase +--- ftjam-2.5.3rc2-orig/Jambase 2007-06-05 08:20:19.000000000 -0600 ++++ ftjam-2.5.3rc2/Jambase 2008-07-21 19:26:02.000000000 -0600 +@@ -813,7 +813,7 @@ else if $(UNIX) + LINKLIBS ?= ; + OPTIM ?= -O ; + RANLIB ?= ranlib ; +- YACC ?= yacc ; ++ YACC ?= bison -y ; + YACCGEN ?= .c ; + YACCFILES ?= y.tab ; + YACCFLAGS ?= -d ; +@@ -882,10 +882,10 @@ DC ?= dmd ; + SUFLIB ?= .a ; + SUFOBJ ?= .o ; + UNDEFFLAG ?= "-u _" ; +- YACC ?= ; +- YACCGEN ?= ; +- YACCFILES ?= ; +- YACCFLAGS ?= ; ++ YACC ?= bison -y ; ++ YACCGEN ?= .c ; ++ YACCFILES ?= y.tab ; ++ YACCFLAGS ?= -d ; + + HDRPATTERN = + "^[ ]*#[ ]*include[ ]*[<\"]([^\">]*)[\">].*$" ; +diff -Naurp ftjam-2.5.3rc2-orig/jambase.c ftjam-2.5.3rc2/jambase.c +--- ftjam-2.5.3rc2-orig/jambase.c 2007-06-05 08:31:08.000000000 -0600 ++++ ftjam-2.5.3rc2/jambase.c 2008-07-21 19:27:55.000000000 -0600 +@@ -632,7 +632,7 @@ const char *jambase[] = { + "LINKLIBS ?= ;\n", + "OPTIM ?= -O ;\n", + "RANLIB ?= ranlib ;\n", +-"YACC ?= yacc ;\n", ++"YACC ?= bison -y ;\n", + "YACCGEN ?= .c ;\n", + "YACCFILES ?= y.tab ;\n", + "YACCFLAGS ?= -d ;\n", +@@ -695,10 +695,10 @@ const char *jambase[] = { + "SUFLIB ?= .a ;\n", + "SUFOBJ ?= .o ;\n", + "UNDEFFLAG ?= \"-u _\" ;\n", +-"YACC ?= ;\n", +-"YACCGEN ?= ;\n", +-"YACCFILES ?= ;\n", +-"YACCFLAGS ?= ;\n", ++"YACC ?= bison -y ;\n", ++"YACCGEN ?= .c ;\n", ++"YACCFILES ?= y.tab ;\n", ++"YACCFLAGS ?= -d ;\n", + "\n", + "HDRPATTERN =\n", + "\"^[ ]*#[ ]*include[ ]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n", diff --git a/base/ftjam/ftjam-2.5.3-nostrip.patch b/base/ftjam/ftjam-2.5.3-nostrip.patch new file mode 100644 index 0000000..1b7e69f --- /dev/null +++ b/base/ftjam/ftjam-2.5.3-nostrip.patch @@ -0,0 +1,40 @@ +diff -Naur ftjam-2.5.3rc2-orig/Jamfile ftjam-2.5.3rc2/Jamfile +--- ftjam-2.5.3rc2-orig/Jamfile 2007-06-05 08:30:52.000000000 -0600 ++++ ftjam-2.5.3rc2/Jamfile 2007-06-10 12:55:03.000000000 -0600 +@@ -138,16 +138,6 @@ + LinkLibraries jam : libjam.a ; + GenFile jambase.c : mkjambase Jambase ; + +-if $(UNIX) && ! $(DEBUG) +-{ +- actions Strip +- { +- strip $(1) +- } +- +- Strip jam ; +-} +- + Library libjam.a : + builtins.c command.c compile.c $(code) expand.c + glob.c hash.c headers.c lists.c make.c make1.c +@@ -156,19 +146,6 @@ + hdrmacro.c rope.c + ; + +-# Strip the Jam executable on Mingw +-# +-if $(JAM_TOOLSET) = MINGW +-{ +- actions Strip +- { +- strip $(1) +- } +- +- Strip jam$(SUFEXE) ; +-} +- +- + if $(BINDIR) { InstallBin $(BINDIR) : jam ; } + + # diff --git a/base/ftjam/ftjam.SMBuild b/base/ftjam/ftjam.SMBuild new file mode 100755 index 0000000..d57f867 --- /dev/null +++ b/base/ftjam/ftjam.SMBuild @@ -0,0 +1,40 @@ +# Maintainer: PktSurf +app=ftjam +version=2.5.3 +build=1sml +homepage="https://www.freetype.org/jam/" +download="http://dk.archive.ubuntu.com/pub/mirrors/exherbo/ftjam-2.5.3rc2.tar.bz2" +desc="Program construction tool like make" +requires="musl" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version"rc2" + + tar xf $srcdir/$app-$version"rc2".tar.?z* + cd $app-$version"rc2" + fixbuilddirpermissions + + applypatch $srcdir/ftjam-2.5.3-clang16.patch + applypatch $srcdir/ftjam-2.5.3-false-flags.patch + applypatch $srcdir/ftjam-2.5.3-i-hate-yacc.patch +} + +build() { + ./configure \ + --prefix= \ + $builddist + + make + make install DESTDIR="$pkg" + + mkfinalpkg +} + +sha512sums=" +18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd ftjam-2.5.3rc2.tar.bz2 +30171a78036c34e290d9c880d0f3c0693a372ae4e4d72d549ee508bee6434cba7930ff90100bc26ab79f0d477e7a36935aa0e18c513598d2af7e2e8e452a0141 ftjam-2.5.3-clang16.patch +b9b97127c6a5d89759563cd4a1e4f87ed911610b70bbfff309105ab733290f74087bd0eb066eaad860be5624573ad2dfc1245eb45347c2d1c9800033c35e5c0a ftjam-2.5.3-false-flags.patch +e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8 ftjam-2.5.3-i-hate-yacc.patch +6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25 ftjam-2.5.3-nostrip.patch +" \ No newline at end of file diff --git a/base/fuse2/fuse2.SMBuild b/base/fuse2/fuse2.SMBuild index 147ad09..71ca168 100755 --- a/base/fuse2/fuse2.SMBuild +++ b/base/fuse2/fuse2.SMBuild @@ -20,7 +20,7 @@ build() { INIT_D_PATH="/etc/rc.d" \ MOUNT_FUSE_PATH="/bin" \ ./configure \ - --prefix="" \ + --prefix= \ --sysconfdir=/etc \ --sbindir=/bin \ --enable-lib \ diff --git a/base/gawk/gawk.SMBuild b/base/gawk/gawk.SMBuild index 7854e5f..cbca7cf 100755 --- a/base/gawk/gawk.SMBuild +++ b/base/gawk/gawk.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=gawk -version=4.2.1 -build=2sml +version=5.2.2 +build=1sml homepage="https://www.gnu.org/software/gawk/" download="https://ftp.gnu.org/gnu/gawk/gawk-$version.tar.xz" desc="POSIX-compliant pattern scanning and processing language" @@ -19,7 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --libexecdir=/lib \ --without-mpfr \ --without-readline @@ -33,5 +33,5 @@ build() { } sha512sums=" -0bf7ccefea01f6249e2da3299f0478421113adb6a827272fc08b02f2691754f3a2de28478681fd97944286c2495decc7dedc99bec11bcb7ee12ea17cf246e296 gawk-4.2.1.tar.lz -" +90611e4daba7226d5ce8230843bf479dc71c0101740c005d851ef7c5b935b6cd4c42089b858abc1619adc05ed25fc7234f993690a76d2ea0b8e61bcbb7dc5a58 gawk-5.2.2.tar.xz +" \ No newline at end of file diff --git a/base/gdb/gdb.SMBuild b/base/gdb/gdb.SMBuild index 867820f..fec506f 100755 --- a/base/gdb/gdb.SMBuild +++ b/base/gdb/gdb.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-werror \ --with-system-zlib \ --disable-sim diff --git a/base/gdbm/gdbm.SMBuild b/base/gdbm/gdbm.SMBuild index 128dca1..9572d18 100755 --- a/base/gdbm/gdbm.SMBuild +++ b/base/gdbm/gdbm.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/gettext/gettext.SMBuild b/base/gettext/gettext.SMBuild index e868aed..94400cd 100755 --- a/base/gettext/gettext.SMBuild +++ b/base/gettext/gettext.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static \ --disable-java diff --git a/base/giflib/giflib.SMBuild b/base/giflib/giflib.SMBuild index c93c412..6846fba 100755 --- a/base/giflib/giflib.SMBuild +++ b/base/giflib/giflib.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { make CFLAGS="$CFLAGS" - make install DESTDIR=$pkg PREFIX="/" + make install DESTDIR="$pkg" PREFIX=/ cp COPYING $pkgdocs/ diff --git a/base/git/git.SMBuild b/base/git/git.SMBuild index b343042..7ec8828 100755 --- a/base/git/git.SMBuild +++ b/base/git/git.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make CC="$CC" $MAKEFLAGS CFLAGS="$CFLAGS" \ - prefix="/" gitexecdir="/lib/git-core" \ + prefix="" gitexecdir="/lib/git-core" \ NO_TCLTK=1 NO_PYTHON=1 NO_EXPAT=1 NO_GETTEXT=1 \ NO_REGEX=NeedsStartEnd \ DESTDIR="$pkg" all install install-man diff --git a/base/glib/glib.SMBuild b/base/glib/glib.SMBuild index 4eee2f6..9a77484 100755 --- a/base/glib/glib.SMBuild +++ b/base/glib/glib.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=glib -version=2.70.3 -build=2sml +version=2.76.3 +build=1sml homepage="https://gitlab.gnome.org/GNOME/glib" download="https://download.gnome.org/sources/glib/2.66/glib-$version.tar.xz" desc="library of C routines" @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild - meson .. --prefix="/" \ + meson .. --prefix=/ \ -Dman=false \ -Dgtk_doc=false \ -Dselinux=disabled \ @@ -34,5 +34,5 @@ build() { } sha512sums=" -993853772132feb0844e868408fa0ee803d4dad5e0827ed6410105b8746c05440313a9514d3b8d87385fe5133aacc2ff1e3e6418c0ce69c8f69f2977733f623c glib-2.70.3.tar.lz +25b6efe33ad206f05c3bd3981fe58c3cb6b399dae9fc4b31160a241fbbdb114c594a3d9d2f408b7b0965011177b7bb141fe52f32e0e66551b719d012ba7daef3 glib-2.76.3.tar.lz " diff --git a/base/gloox/gloox.SMBuild b/base/gloox/gloox.SMBuild index 6468d28..ba52424 100755 --- a/base/gloox/gloox.SMBuild +++ b/base/gloox/gloox.SMBuild @@ -20,9 +20,11 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ - --disable-static + --disable-static \ + --without-tests \ + --without-examples make make install DESTDIR=$pkg @@ -35,4 +37,4 @@ build() { sha512sums=" 4125216628b99820eb1ee333c641d6db55944465bf97f8b6060da72027d2e76e6c9758cc3383c159780eef778fab5a6f5203b4e3d71c1a566574608e00116e62 gloox-1.0.22.tar.lz b30ddcfea7817a4426ad38febe9f16f1db2d4552710d7e02dbe69674ab6a06f9b26678f3f2a0d07bf6f08f16724387fff2b1b3deec76bdd6742b270a3366c8de gloox-musl.patch -" +" \ No newline at end of file diff --git a/base/gmime/gmime.SMBuild b/base/gmime/gmime.SMBuild index dd5f0a5..8e99239 100755 --- a/base/gmime/gmime.SMBuild +++ b/base/gmime/gmime.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --disable-mono \ --disable-introspection diff --git a/base/gmp/gmp.SMBuild b/base/gmp/gmp.SMBuild index 7b74b1f..d71cfc0 100755 --- a/base/gmp/gmp.SMBuild +++ b/base/gmp/gmp.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --with-pic \ --enable-cxx \ --disable-static diff --git a/base/gnu-efi/gnu-efi.SMBuild b/base/gnu-efi/gnu-efi.SMBuild index 798c55c..476daeb 100755 --- a/base/gnu-efi/gnu-efi.SMBuild +++ b/base/gnu-efi/gnu-efi.SMBuild @@ -6,9 +6,9 @@ homepage="https://sourceforge.net/projects/gnu-efi/" download="https://sourceforge.net/projects/gnu-efi/files/gnu-efi-$version.tar.bz2" desc="library to develop applications using GNU toolchain and EFI dev environment" requires="libelf-compat" +apparch="x86_64" prepbuilddir() { - compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,7 @@ prepbuilddir() { } build() { - make PREFIX="/" INSTALLROOT="$pkg" -j1 all install + make PREFIX=/ INSTALLROOT="$pkg" -j1 all install mkfinalpkg } diff --git a/base/gnupg2/gnupg2.SMBuild b/base/gnupg2/gnupg2.SMBuild index deac72a..aced2e3 100755 --- a/base/gnupg2/gnupg2.SMBuild +++ b/base/gnupg2/gnupg2.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=gnupg2 -version=2.2.20 -build=2sml +version=2.2.41 +build=1sml homepage="https://gnupg.org/" download="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$version.tar.bz2" desc="The GNU Privacy Guard version 2.x" @@ -18,9 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --sbindir=/bin \ - --docdir="/share/doc/$app-$version" + --prefix= \ + --sbindir=/bin make make install DESTDIR=$pkg @@ -31,5 +30,5 @@ build() { } sha512sums=" -f73470e4e17bf634e8cc5d680492df21a166c0b1b6ad352c4c0115e7f95c7347bed07b662d0a52ac201f86681db6deeb01b3fda81120f3326d51fe604ff12916 gnupg-2.2.20.tar.lz +f472e5058ea9881355f0c754a47acd0b5360c36e8976b8563dbc763a7cef792bf88227cc15fe5172d3e9bb9fc34d8448dd5c183949031e91a1997cc7f0f83b55 gnupg-2.2.41.tar.bz2 " diff --git a/base/gnutls/gnutls.SMBuild b/base/gnutls/gnutls.SMBuild index 819519a..d33cb2f 100755 --- a/base/gnutls/gnutls.SMBuild +++ b/base/gnutls/gnutls.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=gnutls -version=3.6.16 -build=1sml +version=3.8.0 +build=2sml homepage="https://www.gnutls.org/" download="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$version.tar.xz" desc="GNU TLS 1.0 and SSL 3.0 implementation" @@ -18,10 +18,9 @@ prepbuilddir() { build() { ./configure \ - --prefix="/" \ - --disable-openssl-compatibility \ - --disable-static \ - --without-p11-kit + --prefix= \ + --enable-openssl-compatibility \ + --disable-static make make install DESTDIR=$pkg @@ -32,5 +31,5 @@ build() { } sha512sums=" -191b95e0b7921a145fd70dc640d678d6de066a64da134e651fa7ac5369faf9e4b36617c7fd57ae98face76317b9c98c19e5a83f31bccd1676c464fb6735e95c2 gnutls-3.6.16.tar.lz +3d018db58a429aa63db82f4feb1aea62f80a216c6f3f7ccf581f98ea894dd86dbf8435a867191d906a8db9e5b4e3bd2632b02eb9bc53ab4af49e641a1f70a796 gnutls-3.8.0.tar.lz " diff --git a/base/gperf/gperf.SMBuild b/base/gperf/gperf.SMBuild index 5c8388d..7920273 100755 --- a/base/gperf/gperf.SMBuild +++ b/base/gperf/gperf.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/gpgme/gpgme.SMBuild b/base/gpgme/gpgme.SMBuild index b557d8b..d97f780 100755 --- a/base/gpgme/gpgme.SMBuild +++ b/base/gpgme/gpgme.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=gpgme -version=1.13.1 -build=2sml +version=1.20.0 +build=1sml homepage="https://gnupg.org/software/gpgme/index.html" download="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-$version.tar.bz2" desc="C language library to easily add crypto to a program" @@ -33,5 +33,5 @@ build() { } sha512sums=" -cf3e44b4f6ded9c486f37bafa3d059863a177f01d6e3a635abe90ce8af23a5f6ee86eee854c313e90c5506be9a78bee4e2ed3fa24faa887c8f8c19895613d0b1 gpgme-1.13.1.tar.lz -" +82dfd272edd4adab09e8428bf809c13eeb50a4a7d2397c41d29ffa3832c4f46054ad75eb053fbcc876ebbf78bb8bcf71d95bc9dad68f4b326492ea513dd5b606 gpgme-1.20.0.tar.bz2 +" \ No newline at end of file diff --git a/base/grep/grep.SMBuild b/base/grep/grep.SMBuild index ecd8a40..bbbf69b 100755 --- a/base/grep/grep.SMBuild +++ b/base/grep/grep.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin make diff --git a/base/groff/groff.SMBuild b/base/groff/groff.SMBuild index 5cddfd2..9195908 100755 --- a/base/groff/groff.SMBuild +++ b/base/groff/groff.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --without-x make diff --git a/base/gsl/gsl.SMBuild b/base/gsl/gsl.SMBuild index a2c0e6d..a638403 100755 --- a/base/gsl/gsl.SMBuild +++ b/base/gsl/gsl.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/gstreamer/gstreamer.SMBuild b/base/gstreamer/gstreamer.SMBuild index d51e825..d717d82 100755 --- a/base/gstreamer/gstreamer.SMBuild +++ b/base/gstreamer/gstreamer.SMBuild @@ -20,7 +20,7 @@ build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" \ + --prefix=/ \ --buildtype=plain \ -Dintrospection=disabled diff --git a/base/gyp/gyp.SMBuild b/base/gyp/gyp.SMBuild index d569b06..f718ee5 100755 --- a/base/gyp/gyp.SMBuild +++ b/base/gyp/gyp.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root="$pkg" + python3 setup.py install --root="$pkg" cp LICENSE $pkgdocs/ diff --git a/base/gzip/gzip.SMBuild b/base/gzip/gzip.SMBuild index fa0a577..52b92a9 100755 --- a/base/gzip/gzip.SMBuild +++ b/base/gzip/gzip.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/haveged/haveged.SMBuild b/base/haveged/haveged.SMBuild index 873dd0b..f70e09c 100755 --- a/base/haveged/haveged.SMBuild +++ b/base/haveged/haveged.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ --sbindir=/bin \ --disable-static diff --git a/base/hdparm/hdparm.SMBuild b/base/hdparm/hdparm.SMBuild index 4cec2cb..41098d5 100755 --- a/base/hdparm/hdparm.SMBuild +++ b/base/hdparm/hdparm.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install DESTDIR=$pkg mandir="/share/man" sbindir="/bin" + make install mandir="/share/man" sbindir="/bin" DESTDIR="$pkg" cp LICENSE.TXT $pkgdocs/ diff --git a/base/highlight/highlight.SMBuild b/base/highlight/highlight.SMBuild index 22ae1ac..4f4f9e5 100755 --- a/base/highlight/highlight.SMBuild +++ b/base/highlight/highlight.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install PREFIX="/" doc_dir="/share/doc/$app-$version" DESTDIR=$pkg + make install PREFIX= DESTDIR=$pkg cp COPYING $pkgdocs/ diff --git a/base/htop/htop.SMBuild b/base/htop/htop.SMBuild index 5eec8c6..4fc4427 100755 --- a/base/htop/htop.SMBuild +++ b/base/htop/htop.SMBuild @@ -21,7 +21,7 @@ build() { # enabling unicode causes this error: # Meter.c:415:54: error: 'cchar_t' {aka 'const struct '} has no member named 'attr' ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ --disable-unicode \ --enable-sensors \ diff --git a/base/hunspell/hunspell.SMBuild b/base/hunspell/hunspell.SMBuild index aabdbe6..13c5738 100755 --- a/base/hunspell/hunspell.SMBuild +++ b/base/hunspell/hunspell.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/hyphen/hyphen.SMBuild b/base/hyphen/hyphen.SMBuild index 1b8e475..7cfcf68 100755 --- a/base/hyphen/hyphen.SMBuild +++ b/base/hyphen/hyphen.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/id3lib/id3lib.SMBuild b/base/id3lib/id3lib.SMBuild index e4f01db..fbbba4f 100755 --- a/base/id3lib/id3lib.SMBuild +++ b/base/id3lib/id3lib.SMBuild @@ -30,7 +30,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ $builddist make diff --git a/base/ijs/ijs.SMBuild b/base/ijs/ijs.SMBuild index b4d207e..12beb55 100755 --- a/base/ijs/ijs.SMBuild +++ b/base/ijs/ijs.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --mandir=/share/man \ --enable-shared \ --disable-static \ diff --git a/base/iniparser/iniparser.SMBuild b/base/iniparser/iniparser.SMBuild deleted file mode 100755 index 41e9a4f..0000000 --- a/base/iniparser/iniparser.SMBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: PktSurf -app=iniparser -version=4.1 -build=1sml -homepage="https://github.com/ndevilla/iniparser" -download="https://github.com/ndevilla/iniparser/archive/refs/tags/v$version.tar.gz" -desc="Stand-alone ini file parsing library written in ANSI C" -requires="musl" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions -} - -build() { - make - - install -Dm 644 src/iniparser.h $pkg/include/iniparser.h - install -Dm 644 src/dictionary.h $pkg/include/dictionary.h - install -Dm 644 libiniparser.so.1 $pkg/lib/libiniparser.so.1 - cp LICENSE $pkgdocs/ - - ( - cd $pkg/lib ; ln -s libiniparser.so.1 libiniparser.so - chrpath $pkg/lib/libiniparser.so.1 - ) - - mkfinalpkg -} - -sha512sums=" -19780c1bd520a867bf68cb2c156257fb45355b1677e3bc601fea64b5edb01f6b351ce9f6f68f0db56f962a7cc25a3c64008501d137c7c4fb2192ffacfeac595a iniparser-4.1.tar.lz -" diff --git a/base/intltool/intltool.SMBuild b/base/intltool/intltool.SMBuild index 956a0a4..b56755f 100755 --- a/base/intltool/intltool.SMBuild +++ b/base/intltool/intltool.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/iptables/iptables.SMBuild b/base/iptables/iptables.SMBuild index eff3c08..2d33f80 100755 --- a/base/iptables/iptables.SMBuild +++ b/base/iptables/iptables.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --disable-nftables diff --git a/base/iso-codes/iso-codes.SMBuild b/base/iso-codes/iso-codes.SMBuild index a4236d9..c7ee2f7 100755 --- a/base/iso-codes/iso-codes.SMBuild +++ b/base/iso-codes/iso-codes.SMBuild @@ -19,13 +19,12 @@ prepbuilddir() { build() { # this software is so stupid, it doesn't make a basic msgfmt file check, # which is part of gettext. - if [ ! -x /bin/msgfmt ]; then - echo "ERROR! msgfmt, part of gettext, not found!" - exit 1 + if [[ ! -x /bin/msgfmt ]]; then + err "/bin/msgfmt, part of gettext, not found!" fi ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/itstool/itstool.SMBuild b/base/itstool/itstool.SMBuild index 8999feb..27543e8 100755 --- a/base/itstool/itstool.SMBuild +++ b/base/itstool/itstool.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/jam/jam.SMBuild b/base/jam/jam.SMBuild deleted file mode 100755 index 9f7bfac..0000000 --- a/base/jam/jam.SMBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: PktSurf -app=jam -version=2.5 -build=1sml -homepage="http://public.perforce.com/public/jam/src/Jam.html" -download="" -desc="Program construction tool like make" -requires="musl" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - mkdir $app-$version - cd $app-$version - - unzip $srcdir/$app-$version.zip - fixbuilddirpermissions -} - -build() { - make - ./jam0 -sBINDIR=$pkg/bin install - - cp Porting README $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -bbb3132c617a14dff9fcce70e6d88bed298a5c6bee580fa9d9a2d99b47507c252968e5fdf66138e6d69d1f60f724365fd80012164cffc1e3d0f2c1005bcec437 jam-2.5.zip -" diff --git a/base/jansson/jansson.SMBuild b/base/jansson/jansson.SMBuild index fe06740..dc1cdc8 100755 --- a/base/jansson/jansson.SMBuild +++ b/base/jansson/jansson.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-static diff --git a/base/jbig2dec/jbig2dec.SMBuild b/base/jbig2dec/jbig2dec.SMBuild index 8bb1529..da7c3db 100755 --- a/base/jbig2dec/jbig2dec.SMBuild +++ b/base/jbig2dec/jbig2dec.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --enable-shared diff --git a/base/json-c/json-c.SMBuild b/base/json-c/json-c.SMBuild index 93a9b30..4dbb8f9 100755 --- a/base/json-c/json-c.SMBuild +++ b/base/json-c/json-c.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-static diff --git a/base/json-glib/json-glib.SMBuild b/base/json-glib/json-glib.SMBuild index 7d7aa35..8d88bed 100755 --- a/base/json-glib/json-glib.SMBuild +++ b/base/json-glib/json-glib.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild - meson .. --prefix="/" \ + meson .. --prefix=/ \ -Dintrospection=false ninja diff --git a/base/kbd/kbd.SMBuild b/base/kbd/kbd.SMBuild index 72ca8ea..7617fc6 100755 --- a/base/kbd/kbd.SMBuild +++ b/base/kbd/kbd.SMBuild @@ -52,4 +52,4 @@ build() { sha512sums=" 61a580eacde492e241c725572eb89087cf0f226ebeba05685e9ff1e53269357c64f7405d893fcad82f5147f0ec239ea313a3cc9b91efed80c0606d325019b83d kbd-2.0.4.tar.lz ef992b2e7b7ac30b19ed22a6e263d09a6711f7aba2e473a70586c7aa48df8eac9846cef1a490c49de330123e7070e77ffb8b469d4a78b930ca0f72b134b204d1 config.h -" \ No newline at end of file +" diff --git a/base/kernel-headers/kernel-headers.SMBuild b/base/kernel-headers/kernel-headers.SMBuild index e27c783..c4653ec 100755 --- a/base/kernel-headers/kernel-headers.SMBuild +++ b/base/kernel-headers/kernel-headers.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { } build() { - make ARCH="$arch" prefix="/" DESTDIR=$pkg install + make ARCH="$arch" prefix= DESTDIR=$pkg install cp -r generic/include $pkg/ mkfinalpkg diff --git a/base/kernel-source/kernel-source.SMBuild b/base/kernel-source/kernel-source.SMBuild index 4854530..b3cded7 100755 --- a/base/kernel-source/kernel-source.SMBuild +++ b/base/kernel-source/kernel-source.SMBuild @@ -16,10 +16,10 @@ prepbuilddir() { } build() { - if [ "$HOSTTYPE" = "x86_64" ] ; then + if [[ $HOSTTYPE = x86_64 ]] ; then zcat $srcdir/kernelconfig-huge-$version.gz > linux-$version/.config - install -Dm 644 $srcdir/README $pkg/doc/$app-$version/README - elif [ "$HOSTTYPE" = "aarch64" ] ; then + install -Dm 644 $srcdir/README $pkg/share/doc/$app-$version/README + elif [[ $HOSTTYPE = aarch64 ]] ; then zcat $srcdir/kernelconfig-$aarchversion.gz > linux-$version/.config fi diff --git a/base/kmod/kmod.SMBuild b/base/kmod/kmod.SMBuild index 1d32436..bc7ae14 100755 --- a/base/kmod/kmod.SMBuild +++ b/base/kmod/kmod.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ --libdir=/lib diff --git a/base/lame/lame.SMBuild b/base/lame/lame.SMBuild index 01b2551..0ca2b8c 100755 --- a/base/lame/lame.SMBuild +++ b/base/lame/lame.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { LIBS="-lcurses -lterminfo" \ ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --enable-shared \ --enable-nasm \ --disable-static diff --git a/base/less/less.SMBuild b/base/less/less.SMBuild index da89320..6bce7dc 100755 --- a/base/less/less.SMBuild +++ b/base/less/less.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= make make install DESTDIR=$pkg diff --git a/base/libao/libao.SMBuild b/base/libao/libao.SMBuild index 5748149..3ad39d8 100755 --- a/base/libao/libao.SMBuild +++ b/base/libao/libao.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-static \ --disable-pulse diff --git a/base/libarchive/libarchive.SMBuild b/base/libarchive/libarchive.SMBuild index 69bc29a..6dd4270 100755 --- a/base/libarchive/libarchive.SMBuild +++ b/base/libarchive/libarchive.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --with-pic \ --without-openssl \ --without-xml2 \ diff --git a/base/libasr/libasr.SMBuild b/base/libasr/libasr.SMBuild index 0edbb8a..69c3268 100755 --- a/base/libasr/libasr.SMBuild +++ b/base/libasr/libasr.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libassuan/libassuan.SMBuild b/base/libassuan/libassuan.SMBuild index b682b68..85e5c4b 100755 --- a/base/libassuan/libassuan.SMBuild +++ b/base/libassuan/libassuan.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libatasmart/libatasmart.SMBuild b/base/libatasmart/libatasmart.SMBuild deleted file mode 100755 index 85ca1fa..0000000 --- a/base/libatasmart/libatasmart.SMBuild +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: PktSurf -app=libatasmart -version=0.19 -build=2sml -homepage="http://0pointer.de/blog/projects/being-smart.html" -download="https://0pointer.de/public/libatasmart-$version.tar.xz" -desc="ATA S.M.A.R.T reading and parsing library" -requires="musl" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z** - cd $app-$version - fixbuilddirpermissions -} - -build() { - ./configure \ - --prefix="" \ - --sbindir=/bin \ - --docdir="/share/doc/$app-$version" \ - --disable-static \ - $builddist - - make - make install DESTDIR=$pkg - - mkfinalpkg -} - -sha512sums=" -82244f9915ef15f9332a71ad945bcf6ce1c75a07f068d6ad925f6dcffbf7dc375e44a48f9705fbfa6ce6c8c3e10bfdc56f41a0d91670253f623421a916dfa343 libatasmart-0.19.tar.lz -" diff --git a/base/libblockdev/libblockdev.SMBuild b/base/libblockdev/libblockdev.SMBuild deleted file mode 100755 index 916b87d..0000000 --- a/base/libblockdev/libblockdev.SMBuild +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: PktSurf -app=libblockdev -version=2.26 -build=1sml -homepage="https://github.com/rhinstaller/libblockdev" -download="http://github.com/storaged-project/libblockdev/archive/refs/tags/2.26-1.tar.gz" -desc="library for manipulating block devices" -requires="libbytesize libyaml dmraid" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions -} - -build() { - ./configure \ - --prefix="" \ - --disable-static \ - --without-gtk-doc \ - --without-bcache \ - --without-escrow \ - --without-btrfs \ - --disable-introspection \ - --without-kbd || true - - make - make install DESTDIR=$pkg - - mkfinalpkg -} - -sha512sums=" -d2f94481fbbf19876ff359d2f4c8a0ede12e77bc96eaf7af99f31a9d325dccf7cd7be7820e0747d3aef8c200fd85838ec1ab4796680728589ade226dc443822d libblockdev-2.26.tar.lz -" diff --git a/base/libbytesize/libbytesize.SMBuild b/base/libbytesize/libbytesize.SMBuild deleted file mode 100755 index 7f5abfa..0000000 --- a/base/libbytesize/libbytesize.SMBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: PktSurf -app=libbytesize -version=2.6 -build=2sml -homepage="https://github.com/rhinstaller/libbytesize" -download="https://github.com/storaged-project/libbytesize/archive/refs/tags/$version.tar.gz" -desc="Library for working with big sizes in bytes" -requires="musl" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - ./configure \ - --prefix="" \ - --disable-static - - make - make install DESTDIR=$pkg - - mkfinalpkg -} - -sha512sums=" -f4fe0f31ba1c919961450ac183cd65a4207db9e8b38338705f5f1c239179485bc639273e861db6b547bbe0356b3609bb65200040017a8cc88ef96931c7b6dc11 libbytesize-2.6.tar.lz -" diff --git a/base/libcap-ng/libcap-ng.SMBuild b/base/libcap-ng/libcap-ng.SMBuild index df486a2..00410aa 100755 --- a/base/libcap-ng/libcap-ng.SMBuild +++ b/base/libcap-ng/libcap-ng.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-static=no \ --with-python=no \ --with-python3=no diff --git a/base/libcap/libcap.SMBuild b/base/libcap/libcap.SMBuild index 1f32eea..9c393fc 100755 --- a/base/libcap/libcap.SMBuild +++ b/base/libcap/libcap.SMBuild @@ -23,10 +23,10 @@ prepbuilddir() { } build() { - make prefix="" man_prefix=/share/man lib=lib CFLAGS="$CFLAGS" \ + make prefix= man_prefix=/share/man lib=lib CFLAGS="$CFLAGS" \ BUILD_CC="$CC" - make FAKEROOT=$pkg prefix="" man_prefix=/share/man SBINDIR=/bin lib=lib install + make FAKEROOT=$pkg prefix= man_prefix=/share/man SBINDIR=/bin lib=lib install LIBDIR=$pkg/lib SBINDIR=$pkg/bin diff --git a/base/libcddb/libcddb.SMBuild b/base/libcddb/libcddb.SMBuild index 14feb65..ad33d73 100755 --- a/base/libcddb/libcddb.SMBuild +++ b/base/libcddb/libcddb.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ $builddist diff --git a/base/libcdio-paranoia/libcdio-paranoia.SMBuild b/base/libcdio-paranoia/libcdio-paranoia.SMBuild index c83d10d..035a69c 100755 --- a/base/libcdio-paranoia/libcdio-paranoia.SMBuild +++ b/base/libcdio-paranoia/libcdio-paranoia.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-cpp-progs \ --disable-static \ --disable-example-progs diff --git a/base/libcdio/libcdio.SMBuild b/base/libcdio/libcdio.SMBuild index ae5a886..fe6a065 100755 --- a/base/libcdio/libcdio.SMBuild +++ b/base/libcdio/libcdio.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-vcd-info \ --disable-static \ --enable-cpp-progs diff --git a/base/libcroco/libcroco.SMBuild b/base/libcroco/libcroco.SMBuild index dd8b316..e187629 100755 --- a/base/libcroco/libcroco.SMBuild +++ b/base/libcroco/libcroco.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libcue/libcue.SMBuild b/base/libcue/libcue.SMBuild index 3c4596d..8d27fbf 100755 --- a/base/libcue/libcue.SMBuild +++ b/base/libcue/libcue.SMBuild @@ -20,7 +20,7 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=ON diff --git a/base/libdaemon/libdaemon.SMBuild b/base/libdaemon/libdaemon.SMBuild index 72143f3..fcdd436 100755 --- a/base/libdaemon/libdaemon.SMBuild +++ b/base/libdaemon/libdaemon.SMBuild @@ -20,8 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static \ $builddist diff --git a/base/libelf-compat/libelf-compat.SMBuild b/base/libelf-compat/libelf-compat.SMBuild index 3666996..7752ec7 100755 --- a/base/libelf-compat/libelf-compat.SMBuild +++ b/base/libelf-compat/libelf-compat.SMBuild @@ -20,7 +20,7 @@ build() { sed -i 's@HEADERS = src/libelf.h@HEADERS = src/libelf.h src/gelf.h@' Makefile make - make prefix="" install DESTDIR="$pkg" + make prefix= install DESTDIR="$pkg" cp COPYING $pkgdocs/ diff --git a/base/libetpan/libetpan.SMBuild b/base/libetpan/libetpan.SMBuild index 2c61fd0..6e87745 100755 --- a/base/libetpan/libetpan.SMBuild +++ b/base/libetpan/libetpan.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libevent/libevent.SMBuild b/base/libevent/libevent.SMBuild index a073832..ddeb4af 100755 --- a/base/libevent/libevent.SMBuild +++ b/base/libevent/libevent.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libexif/libexif.SMBuild b/base/libexif/libexif.SMBuild index 273446e..58ae354 100755 --- a/base/libexif/libexif.SMBuild +++ b/base/libexif/libexif.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/libffi/libffi.SMBuild b/base/libffi/libffi.SMBuild index 917f046..a510e47 100755 --- a/base/libffi/libffi.SMBuild +++ b/base/libffi/libffi.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libgc/libgc.SMBuild b/base/libgc/libgc.SMBuild index 5783e4c..f679130 100755 --- a/base/libgc/libgc.SMBuild +++ b/base/libgc/libgc.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --enable-cplusplus \ --enable-threads=pthreads \ --disable-static \ diff --git a/base/libgcrypt/libgcrypt.SMBuild b/base/libgcrypt/libgcrypt.SMBuild index 2894c2f..ddd237c 100755 --- a/base/libgcrypt/libgcrypt.SMBuild +++ b/base/libgcrypt/libgcrypt.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=libgcrypt -version=1.8.5 +version=1.10.2 build=1sml homepage="https://www.gnupg.org/software/libgcrypt/index.html" download="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$version.tar.bz2" @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared=yes \ --enable-static=no \ --program-prefix="" \ @@ -33,5 +33,5 @@ build() { } sha512sums=" -8ba8114093ac603857872428a4ba30dc08771614dfa123e01abc47f8fd51a7cf96343483c9a6fda3bd73e4f9e76cdf40b6e152ae803d03cbe15b5fb5ea4418f1 libgcrypt-1.8.5.tar.lz -" +71202e8300251cb41c3af9b731b01d31b674f99f4c0ca9f878f4fc14d00d65cda66cec1538e95a8cb3c79d231cd4bddec20507256633fd5f4987a598c6b76e17 libgcrypt-1.10.2.tar.lz +" \ No newline at end of file diff --git a/base/libgit2/libgit2.SMBuild b/base/libgit2/libgit2.SMBuild index d0e4bd8..b85d9f5 100755 --- a/base/libgit2/libgit2.SMBuild +++ b/base/libgit2/libgit2.SMBuild @@ -21,7 +21,7 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR=lib \ -DTHREADSAFE=ON \ -Wno-dev diff --git a/base/libgpg-error/libgpg-error-1.44-remove_broken_check.patch b/base/libgpg-error/libgpg-error-1.44-remove_broken_check.patch new file mode 100644 index 0000000..043099c --- /dev/null +++ b/base/libgpg-error/libgpg-error-1.44-remove_broken_check.patch @@ -0,0 +1,22 @@ +This breaks our multilib builds: + + Confirm gpg-error-config works... no + *** Please report to with gpg-error-config-test.log + +--- libgpg-error-1.44/src/Makefile.am ++++ libgpg-error-1.44/src/Makefile.am +@@ -347,14 +347,6 @@ + cp gpg-error.h gpgrt.h + + gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh +- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" +- @if ./gpg-error-config-test.sh --old-new; then \ +- echo "good"; \ +- else \ +- echo "no"; \ +- echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ +- fi + cp gpg-error-config-old $@ + + install-data-local: diff --git a/base/libgpg-error/libgpg-error.SMBuild b/base/libgpg-error/libgpg-error.SMBuild index 70f89c7..ad87b7b 100755 --- a/base/libgpg-error/libgpg-error.SMBuild +++ b/base/libgpg-error/libgpg-error.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=libgpg-error -version=1.39 -build=2sml +version=1.47 +build=1sml homepage="https://www.gnupg.org/software/libgpg-error/index.html" download="https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$version.tar.bz2" desc="library that provides common error values and functions for all GnuPG components" @@ -14,11 +14,15 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions + + applypatch $srcdir/libgpg-error-1.44-remove_broken_check.patch } build() { + autoreconf -vif ./configure \ - --prefix="" + --prefix= \ + --enable-install-gpg-error-config make make install DESTDIR=$pkg @@ -29,5 +33,5 @@ build() { } sha512sums=" -9e67deaf4307fc1b8e9553be019e4c0dfc9554ba9e3151bb233fdb084f205fd1f934e12b6a4316e20aac21db919a4230fa11cd96ddad27a73073aca428d48404 libgpg-error-1.39.tar.lz +bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30 libgpg-error-1.47.tar.bz2 " diff --git a/base/libical/libical.SMBuild b/base/libical/libical.SMBuild index e9ad751..f7e1a58 100755 --- a/base/libical/libical.SMBuild +++ b/base/libical/libical.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR=lib \ -DINCLUDE_INSTALL_DIR=include \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/base/libid3tag/libid3tag.SMBuild b/base/libid3tag/libid3tag.SMBuild index a7d0375..4d81b2c 100755 --- a/base/libid3tag/libid3tag.SMBuild +++ b/base/libid3tag/libid3tag.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ $builddist diff --git a/base/libidn2/libidn2.SMBuild b/base/libidn2/libidn2.SMBuild index cbcf092..3b3faf1 100755 --- a/base/libidn2/libidn2.SMBuild +++ b/base/libidn2/libidn2.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libjpeg-turbo/libjpeg-turbo.SMBuild b/base/libjpeg-turbo/libjpeg-turbo.SMBuild index 2767081..1c5f92a 100755 --- a/base/libjpeg-turbo/libjpeg-turbo.SMBuild +++ b/base/libjpeg-turbo/libjpeg-turbo.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=libjpeg-turbo -version=2.0.4 -build=2sml +version=2.1.5.1 +build=1sml homepage="https://github.com/libjpeg-turbo/libjpeg-turbo" desc="JPEG library on steroids" requires="nasm" @@ -30,5 +30,5 @@ build() { } sha512sums=" -f2d693ccb4e4c78bf989f069679b6dda5d4261f3375c955e183952d4a3d6e4b8d80e36ec366d730b3bb9372b4210f530f43c17a3034467c0cc2e8fde9799553a libjpeg-turbo-2.0.4.tar.lz -" +86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6 libjpeg-turbo-2.1.5.1.tar.gz +" \ No newline at end of file diff --git a/base/libkate/libkate.SMBuild b/base/libkate/libkate.SMBuild index 1031c01..2bee453 100755 --- a/base/libkate/libkate.SMBuild +++ b/base/libkate/libkate.SMBuild @@ -23,8 +23,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/libksba/libksba.SMBuild b/base/libksba/libksba.SMBuild index bf16b4b..89f262c 100755 --- a/base/libksba/libksba.SMBuild +++ b/base/libksba/libksba.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared=yes \ --enable-static=no diff --git a/base/libminizip/libminizip.SMBuild b/base/libminizip/libminizip.SMBuild index f0617e6..bd2fa3d 100755 --- a/base/libminizip/libminizip.SMBuild +++ b/base/libminizip/libminizip.SMBuild @@ -23,7 +23,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libmms/libmms.SMBuild b/base/libmms/libmms.SMBuild index bb16bf6..11b5117 100755 --- a/base/libmms/libmms.SMBuild +++ b/base/libmms/libmms.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libmnl/libmnl.SMBuild b/base/libmnl/libmnl.SMBuild index 0f188e1..f44a3a1 100755 --- a/base/libmnl/libmnl.SMBuild +++ b/base/libmnl/libmnl.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libmodplug/libmodplug.SMBuild b/base/libmodplug/libmodplug.SMBuild index 6ce72ff..435834b 100755 --- a/base/libmodplug/libmodplug.SMBuild +++ b/base/libmodplug/libmodplug.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libmtp/libmtp.SMBuild b/base/libmtp/libmtp.SMBuild index eb1ff19..a55539b 100755 --- a/base/libmtp/libmtp.SMBuild +++ b/base/libmtp/libmtp.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --with-udev=/lib/udev diff --git a/base/libmypaint/libmypaint.SMBuild b/base/libmypaint/libmypaint.SMBuild index b01e425..10b6f9a 100755 --- a/base/libmypaint/libmypaint.SMBuild +++ b/base/libmypaint/libmypaint.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-introspection make diff --git a/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild b/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild index 54b9d7b..3c89563 100755 --- a/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild +++ b/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libnfnetlink/libnfnetlink.SMBuild b/base/libnfnetlink/libnfnetlink.SMBuild index 4faf4cf..81c4a64 100755 --- a/base/libnfnetlink/libnfnetlink.SMBuild +++ b/base/libnfnetlink/libnfnetlink.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libnfs/libnfs.SMBuild b/base/libnfs/libnfs.SMBuild index cf871e8..02fa2ba 100755 --- a/base/libnfs/libnfs.SMBuild +++ b/base/libnfs/libnfs.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libnl/libnl.SMBuild b/base/libnl/libnl.SMBuild index 73b08b9..77d2789 100755 --- a/base/libnl/libnl.SMBuild +++ b/base/libnl/libnl.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libogg/libogg.SMBuild b/base/libogg/libogg.SMBuild index f9920d7..ae0d749 100755 --- a/base/libogg/libogg.SMBuild +++ b/base/libogg/libogg.SMBuild @@ -17,8 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/libopenal/libopenal.SMBuild b/base/libopenal/libopenal.SMBuild index 3832097..a72a5d2 100755 --- a/base/libopenal/libopenal.SMBuild +++ b/base/libopenal/libopenal.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=lib diff --git a/base/libpcap/libpcap.SMBuild b/base/libpcap/libpcap.SMBuild index 28847b8..b2ab668 100755 --- a/base/libpcap/libpcap.SMBuild +++ b/base/libpcap/libpcap.SMBuild @@ -20,7 +20,7 @@ build() { CFLAGS+=" -D_BSD_SOURCE -DIPPROTO_HOPOPTS=0 -include limits.h" \ ac_cv_type_u_int64_t=yes \ ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --disable-dbus \ --disable-bluetooth diff --git a/base/libplist/libplist.SMBuild b/base/libplist/libplist.SMBuild index 7f7d111..e23ed58 100755 --- a/base/libplist/libplist.SMBuild +++ b/base/libplist/libplist.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libpng/libpng.SMBuild b/base/libpng/libpng.SMBuild index 4e7d64c..c7f1685 100755 --- a/base/libpng/libpng.SMBuild +++ b/base/libpng/libpng.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libpsl/libpsl.SMBuild b/base/libpsl/libpsl.SMBuild index ee42f36..948b77e 100755 --- a/base/libpsl/libpsl.SMBuild +++ b/base/libpsl/libpsl.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libpthread-stubs/libpthread-stubs.SMBuild b/base/libpthread-stubs/libpthread-stubs.SMBuild index bd896c1..b41d3db 100755 --- a/base/libpthread-stubs/libpthread-stubs.SMBuild +++ b/base/libpthread-stubs/libpthread-stubs.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ $builddist make diff --git a/base/libptytty/libptytty.SMBuild b/base/libptytty/libptytty.SMBuild new file mode 100755 index 0000000..f1db89f --- /dev/null +++ b/base/libptytty/libptytty.SMBuild @@ -0,0 +1,38 @@ +# Maintainer: PktSurf +app=libptytty +version=2.0 +build=1sml +homepage="https://github.com/thom311/libnl" +desc="Part of rxvt-unicode for handling pty, tty and related files" +requires="musl" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions +} + +build() { + mkdir -p smbuild && cd smbuild + cmake .. \ + -DCMAKE_INSTALL_PREFIX="" \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DUTMP_SUPPORT=OFF \ + -DWTMP_SUPPORT=OFF \ + -DLASTLOG_SUPPORT=OFF + + make + make install DESTDIR=$pkg + + cp ../COPYING $pkgdocs/ + + mkfinalpkg +} + +sha512sums=" +03933f25772bbf433806576054788e0f9caad2074cd955e763bee39d8459d30ccd733868e48ca5f0e92d91f4a07a1487292326c396968f361e51dcdab6bcaeff libptytty-2.0.tar.lz +" diff --git a/base/libqalculate/libqalculate.SMBuild b/base/libqalculate/libqalculate.SMBuild index 9ff639a..d9e4794 100755 --- a/base/libqalculate/libqalculate.SMBuild +++ b/base/libqalculate/libqalculate.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libsamplerate/libsamplerate.SMBuild b/base/libsamplerate/libsamplerate.SMBuild index 315f148..145bfd1 100755 --- a/base/libsamplerate/libsamplerate.SMBuild +++ b/base/libsamplerate/libsamplerate.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ $builddist diff --git a/base/libseccomp/libseccomp.SMBuild b/base/libseccomp/libseccomp.SMBuild index c1092c9..5d41496 100755 --- a/base/libseccomp/libseccomp.SMBuild +++ b/base/libseccomp/libseccomp.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libsecret/libsecret.SMBuild b/base/libsecret/libsecret.SMBuild index 026fc6c..cdd566f 100755 --- a/base/libsecret/libsecret.SMBuild +++ b/base/libsecret/libsecret.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --disable-introspection diff --git a/base/libshout/libshout.SMBuild b/base/libshout/libshout.SMBuild index d396704..78ed8ff 100755 --- a/base/libshout/libshout.SMBuild +++ b/base/libshout/libshout.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ $builddist diff --git a/base/libsndfile/libsndfile.SMBuild b/base/libsndfile/libsndfile.SMBuild index 58260af..5d4adfd 100755 --- a/base/libsndfile/libsndfile.SMBuild +++ b/base/libsndfile/libsndfile.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libsodium/libsodium.SMBuild b/base/libsodium/libsodium.SMBuild index a277b72..09b2a33 100755 --- a/base/libsodium/libsodium.SMBuild +++ b/base/libsodium/libsodium.SMBuild @@ -20,7 +20,7 @@ build() { ac_cv_tls=__thread \ ax_cv_check_cflags___ftls_model_local_dynamic=no \ ./configure \ - --prefix="" \ + --prefix= \ --disable-ssp \ --disable-static diff --git a/base/libssh2/libssh2.SMBuild b/base/libssh2/libssh2.SMBuild index e1a9c5a..296aa18 100755 --- a/base/libssh2/libssh2.SMBuild +++ b/base/libssh2/libssh2.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-static=no make diff --git a/base/libtasn1/libtasn1.SMBuild b/base/libtasn1/libtasn1.SMBuild index 8afeffa..7350805 100755 --- a/base/libtasn1/libtasn1.SMBuild +++ b/base/libtasn1/libtasn1.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libtheora/libtheora.SMBuild b/base/libtheora/libtheora.SMBuild index 3b457d0..77e98f5 100755 --- a/base/libtheora/libtheora.SMBuild +++ b/base/libtheora/libtheora.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --disable-examples \ $builddist diff --git a/base/libtirpc/libtirpc.SMBuild b/base/libtirpc/libtirpc.SMBuild index 065f8b6..24ae040 100755 --- a/base/libtirpc/libtirpc.SMBuild +++ b/base/libtirpc/libtirpc.SMBuild @@ -20,7 +20,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ + --sysconfdir=/etc \ --disable-static \ --disable-gssapi @@ -30,8 +31,8 @@ build() { cp COPYING $pkgdocs/ # Don't use .3t man page suffix: - if [ -d $pkg/share/man/man3 ]; then - ( cd $pkg/share/man/man3 + if [ -d $pkg/usr/share/man/man3 ]; then + ( cd $pkg/usr/share/man/man3 for file in *.3t ; do mv $file $(basename $file .3t).3 done diff --git a/base/libtool/libtool.SMBuild b/base/libtool/libtool.SMBuild index 83212ee..a9a1f9e 100755 --- a/base/libtool/libtool.SMBuild +++ b/base/libtool/libtool.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libtorrent/libtorrent.SMBuild b/base/libtorrent/libtorrent.SMBuild index a916509..cd7d795 100755 --- a/base/libtorrent/libtorrent.SMBuild +++ b/base/libtorrent/libtorrent.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-debug \ --without-kqueue \ --enable-aligned \ diff --git a/base/libunistring/libunistring.SMBuild b/base/libunistring/libunistring.SMBuild index 30238ce..81fd0ba 100755 --- a/base/libunistring/libunistring.SMBuild +++ b/base/libunistring/libunistring.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static \ --disable-rpath diff --git a/base/libusb/libusb.SMBuild b/base/libusb/libusb.SMBuild index 962812a..122f872 100755 --- a/base/libusb/libusb.SMBuild +++ b/base/libusb/libusb.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libuv/libuv.SMBuild b/base/libuv/libuv.SMBuild index 117db58..718a28d 100755 --- a/base/libuv/libuv.SMBuild +++ b/base/libuv/libuv.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=libuv -version=1.37.0 +version=1.45.0 build=1sml homepage="https://github.com/libuv/libuv" download="https://github.com/libuv/libuv/archive/refs/tags/v$version.tar.gz" @@ -17,9 +17,10 @@ prepbuilddir() { } build() { + ./autogen.sh ./configure \ - --prefix="" \ + --prefix= \ --disable-static make @@ -31,5 +32,5 @@ build() { } sha512sums=" -55756c310172b499f38496451ee5dca9abd6caa71e2a2077491dfa8de9e74247e3ca9bb9b6034837d46db6614a9728234bc9f613de85ae199d21526aff0b73b4 libuv-v1.37.0.tar.lz -" +20753fcbded93dead97777d6c18eb36b2440a73475946da2fe0d2125059e6d3915e89f2889bffb944f6507ee228860a3df9814d1bd68a61db235017f7f601bd0 libuv-v1.45.0.tar.lz +" \ No newline at end of file diff --git a/base/libvncserver/libvncserver.SMBuild b/base/libvncserver/libvncserver.SMBuild index 43a23f3..c7b05e1 100755 --- a/base/libvncserver/libvncserver.SMBuild +++ b/base/libvncserver/libvncserver.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --without-ssl diff --git a/base/libvorbis/libvorbis.SMBuild b/base/libvorbis/libvorbis.SMBuild index 4c56307..769d19f 100755 --- a/base/libvorbis/libvorbis.SMBuild +++ b/base/libvorbis/libvorbis.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libxml2/libxml2.SMBuild b/base/libxml2/libxml2.SMBuild index b3fb88d..63b5244 100755 --- a/base/libxml2/libxml2.SMBuild +++ b/base/libxml2/libxml2.SMBuild @@ -22,11 +22,9 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ - --disable-static \ - --disable-silent-rules \ - --with-python=/bin/python3 + --disable-static make make install DESTDIR=$pkg diff --git a/base/libxslt/libxslt.SMBuild b/base/libxslt/libxslt.SMBuild index 58c4e7c..9478d55 100755 --- a/base/libxslt/libxslt.SMBuild +++ b/base/libxslt/libxslt.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/libyaml/libyaml.SMBuild b/base/libyaml/libyaml.SMBuild deleted file mode 100755 index 2b04f7e..0000000 --- a/base/libyaml/libyaml.SMBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: PktSurf -app=libyaml -version=0.2.5 -build=2sml -homepage="http://pyyaml.org/wiki/LibYAML" -download="http://pyyaml.org/download/libyaml/yaml-$version.tar.gz" -desc="YAML 1.1 library" -requires="musl" - -prepbuilddir() { - mkandenterbuilddir - rm -rf yaml-$version - - tar xf $srcdir/yaml-$version.tar.?z* - cd yaml-$version - fixbuilddirpermissions -} - -build() { - ./configure \ - --prefix="" \ - --disable-static - - make - make install DESTDIR=$pkg - - cp License $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02 yaml-0.2.5.tar.gz -" diff --git a/base/llvm/lfs64.patch b/base/llvm/lfs64.patch new file mode 100644 index 0000000..5d1dfd1 --- /dev/null +++ b/base/llvm/lfs64.patch @@ -0,0 +1,106 @@ +Patch-Source: https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67 +-- +From 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 4 Feb 2023 13:54:41 -0800 +Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems + +Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based +systems. This will make sure that 64bit versions of LFS functions are +used e.g. seek will behave same as lseek64. Also revert [1] partially +because this added a cmake test to detect lseek64 but then forgot to +pass the needed macro to actual compile, this test was incomplete too +since libc implementations like musl has 64bit off_t by default on 32bit +systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE +like glibc, which means the compile now fails on musl because the cmake +check passes but we do not have _LARGEFILE64_SOURCE defined. Using the +*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64 +instead + +[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b +[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc + +Reviewed By: MaskRay + +Differential Revision: https://reviews.llvm.org/D139752 +--- + llvm/cmake/config-ix.cmake | 8 +++++--- + llvm/include/llvm/Config/config.h.cmake | 3 --- + llvm/lib/Support/raw_ostream.cpp | 2 -- + llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 2 -- + utils/bazel/llvm_configs/config.h.cmake | 3 --- + 5 files changed, 5 insertions(+), 13 deletions(-) + +diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake +index f959cd1f88484..b78c1b34ab8b9 100644 +--- a/cmake/config-ix.cmake ++++ b/cmake/config-ix.cmake +@@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES) + if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) + check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) + endif() +-set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") +-check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) +-set(CMAKE_REQUIRED_DEFINITIONS "") + check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) + check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) + check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2) +@@ -340,6 +337,11 @@ check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) + if( LLVM_USING_GLIBC ) + add_compile_definitions(_GNU_SOURCE) + list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE") ++# enable 64bit off_t on 32bit systems using glibc ++ if (CMAKE_SIZEOF_VOID_P EQUAL 4) ++ add_compile_definitions(_FILE_OFFSET_BITS=64) ++ list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") ++ endif() + endif() + + # This check requires _GNU_SOURCE. +diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake +index 3543e6fc29944..29ac536b4c31b 100644 +--- a/include/llvm/Config/config.h.cmake ++++ b/include/llvm/Config/config.h.cmake +@@ -128,9 +128,6 @@ + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} + +-/* Define to 1 if you have the `lseek64' function. */ +-#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} +- + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} + +diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp +index 92b15f14c62fd..8943c4478c7f2 100644 +--- a/lib/Support/raw_ostream.cpp ++++ b/lib/Support/raw_ostream.cpp +@@ -802,8 +802,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { + flush(); + #ifdef _WIN32 + pos = ::_lseeki64(FD, off, SEEK_SET); +-#elif defined(HAVE_LSEEK64) +- pos = ::lseek64(FD, off, SEEK_SET); + #else + pos = ::lseek(FD, off, SEEK_SET); + #endif +diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +index 1d70d96bd6d76..393744f2d6c53 100644 +--- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn ++++ b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +@@ -139,7 +139,6 @@ write_cmake_config("config") { + values += [ + "HAVE_FUTIMENS=1", + "HAVE_LINK_H=1", +- "HAVE_LSEEK64=1", + "HAVE_MALLINFO=1", + "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1", + ] +@@ -147,7 +146,6 @@ write_cmake_config("config") { + values += [ + "HAVE_FUTIMENS=", + "HAVE_LINK_H=", +- "HAVE_LSEEK64=", + "HAVE_MALLINFO=", + "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=", + ] diff --git a/base/llvm/link b/base/llvm/link new file mode 100644 index 0000000..e47c394 --- /dev/null +++ b/base/llvm/link @@ -0,0 +1 @@ +https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/cmake-15.0.7.src.tar.xz diff --git a/base/llvm/llvm.SMBuild b/base/llvm/llvm.SMBuild index f364b52..4434f2b 100755 --- a/base/llvm/llvm.SMBuild +++ b/base/llvm/llvm.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=llvm -version=14.0.6 +version=15.0.7 build=1sml homepage="http://llvm.org/" download="https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz" @@ -15,13 +15,12 @@ prepbuilddir() { cd $app-$version.src fixbuilddirpermissions - # Set build targets - if [ "$arch" = "x86_64" ] ; then - buildtarget='X86;AMDGPU;BPF' - elif [ "$arch" = "aarch64" ] ; then - buildtarget="ARM;AArch64" - fi - + ( + cd .. + tar xf $srcdir/cmake-$version.src.tar.xz + cp -r cmake-$version.src cmake + ) + ( cd tools tar xf $srcdir/clang-$version.src.tar.?z @@ -39,19 +38,28 @@ prepbuilddir() { ( mkdir -p smbuild && cd smbuild mkdir -p include - + cp -r ../projects/libunwind/include/mach-o include/ rm -r ../projects/libunwind ) + + applypatch $srcdir/lfs64.patch } build() { # We don't need our optimisations for small builds unset CFLAGS CXXFLAGS + # Set build targets + if [[ $arch = x86_64 ]] ; then + buildtarget='X86' + elif [[ $arch = aarch64 ]] ; then + buildtarget="AArch64" + fi + cd smbuild - cmake .. -G Ninja -Wno-dev \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ + cmake .. -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="" \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_BUILD_EXAMPLES=OFF \ @@ -61,6 +69,7 @@ build() { -DLLVM_ENABLE_FFI=ON \ -DLLVM_ENABLE_RTTI=ON \ -DLLVM_INSTALL_UTILS=ON \ + -DLLVM_ENABLE_LIBEDIT=OFF \ -DLLVM_TARGETS_TO_BUILD="$buildtarget" \ -DLLVM_BINUTILS_INCDIR="/include" \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ @@ -68,7 +77,7 @@ build() { -DLLVM_INSTALL_PREFIX="/bin" \ -DCLANG_RESOURCE_DIR="../lib/clang/$version" - ninja + ninja $MAKEFLAGS DESTDIR="$pkg" ninja install cp ../LICENSE.TXT $pkgdocs/ @@ -77,8 +86,10 @@ build() { } sha512sums=" -5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b clang-14.0.6.src.tar.xz -c8f3804c47ac33273238899e5682f9cb52465dcceff0e0ecf9925469620c6c9a62cc2c708a35a0e156b666e1198df52c5fff1da9d5ee3194605dfd62c296b058 libunwind-14.0.6.src.tar.xz -fad97b441f9642b73edd240af2c026259de0951d5ace42779e9e0fcf5e417252a1d744e2fc51e754a45016621ba0c70088177f88695af1c6ce290dd26873b094 lld-14.0.6.src.tar.xz -6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.src.tar.xz +9fd2736a9f5993ddbb5b3c507fe497234a6def64f6f418f379d1ca56c9c361ad1ae9a5445ab938230fbc1671ec00b4f802a412b048569023863c20dc6bb46a1f clang-15.0.7.src.tar.xz +85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96 cmake-15.0.7.src.tar.xz +ebc73a5c68615a4462f4d05040a68a28e92b144d8c66d3fb2271cf6fff60a0adb1b913c8e520717ac2f6bd9e4b44c16d9461ef70502975975d1779e2b27a9392 libunwind-15.0.7.src.tar.xz +5dc0690c1eb3c37ee29c4add65a08f7b93ce1363cf9099243c9dc1124d1ca77fe19bbf24dad3984de4553eda716f706d49dff63461b709bec6645272e67f0178 lld-15.0.7.src.tar.xz +ed8d565515b1bc6164e4ff06d3388ba92e332850305496fd65db9adf1ec87bd9dd1bfde49dd41be5d5216289efc72bfd287cd7392f2bba80b740d4c314c749e5 llvm-15.0.7.src.tar.xz +e288e8d3389536f1f040c0ae8a8eae168de8eedba6040efd5f477701e18529711329a279c6b86d5214ab44efaa6e27818d109be78891ee93e241a0ab1b3a0c5a lfs64.patch " diff --git a/base/lm-sensors/lm-sensors.SMBuild b/base/lm-sensors/lm-sensors.SMBuild index 595c1b1..d82330e 100755 --- a/base/lm-sensors/lm-sensors.SMBuild +++ b/base/lm-sensors/lm-sensors.SMBuild @@ -18,8 +18,8 @@ prepbuilddir() { } build() { - make PREFIX="" SBINDIR="/bin" BUILD_STATIC_LIB=0 - make install PREFIX="" DESTDIR="$pkg" SBINDIR="/bin" MANDIR="/share/man" BUILD_STATIC_LIB=0 + make PREFIX= SBINDIR=/bin BUILD_STATIC_LIB=0 + make install PREFIX= DESTDIR="$pkg" SBINDIR=bin MANDIR=share/man BUILD_STATIC_LIB=0 cp COPYING* $pkgdocs/ diff --git a/base/logrotate/logrotate.SMBuild b/base/logrotate/logrotate.SMBuild index fb51a04..09f018b 100755 --- a/base/logrotate/logrotate.SMBuild +++ b/base/logrotate/logrotate.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --with-acl make clean diff --git a/base/lua53/lua53.SMBuild b/base/lua53/lua53.SMBuild index 788d6ae..b7ae543 100755 --- a/base/lua53/lua53.SMBuild +++ b/base/lua53/lua53.SMBuild @@ -6,6 +6,7 @@ homepage="https://www.lua.org/home.html" download="https://www.lua.org/ftp/lua-$version.tar.gz" desc="powerful, fast, light-weight, embeddable scripting language" requires="readline" +disableverbosebuild=1 prepbuilddir() { mkandenterbuilddir @@ -33,11 +34,9 @@ prepbuilddir() { -e '/^LUA_T=/s,lua,&'"$V"',' \ -e '/^LUAC_T=/s,luac,&'"$V"',' \ src/Makefile - } build() { - make linux make install INSTALL_MAN="$pkg/share/man/man1" DESTDIR=$pkg @@ -45,15 +44,17 @@ build() { mkdir -p shared && cd shared ar -x $pkg/lib/liblua$V.a gcc -ldl -lreadline -lncurses -lterminfo -lm -shared *.o -o liblua$V.so.$R - cp -a liblua$V.so.$R $pkg/lib + cp -a liblua$V.so.$R $pkg/lib/ + ( cd $pkg/lib - ln -s liblua$V.so.$R liblua$V.so.$V - ln -s liblua$V.so.$R liblua$V.so.${V%??} - ln -s liblua$V.so.$R liblua$V.so + ln -sf liblua$V.so.$R liblua$V.so.$V + ln -sf liblua$V.so.$R liblua$V.so.${V%??} + ln -sf liblua$V.so.$R liblua$V.so ) cd - >/dev/null mkdir -p $pkg/lib/pkgconfig + ( cd $pkg/lib/pkgconfig sed \ -e '/^V= /s, .*, '"$V"',' \ @@ -62,15 +63,17 @@ build() { -e '/^INSTALL_INC= /s,include,&/lua\${V},' \ -e '/^includedir=/s,/include,&/lua\${V},' \ $srcdir/lua.pc.in > lua$V.pc - ln -s lua$V.pc lua-$V.pc - mkfinalpkg - ln -s lua$V.pc lua${V%.?}${V#?.}.pc - cd - >/dev/null + ln -sf lua$V.pc lua-$V.pc + ln -sf lua$V.pc lua${V%.?}${V#?.}.pc + ) + cd - >/dev/null + ( cd $pkg/share/man/man1 mv lua.1 lua$V.1 mv luac.1 luac$V.1 cd - >/dev/null + ) mkfinalpkg } diff --git a/base/lua53/lua53.pc b/base/lua53/lua53.pc deleted file mode 120000 index c9c0b94..0000000 --- a/base/lua53/lua53.pc +++ /dev/null @@ -1 +0,0 @@ -lua5.3.pc \ No newline at end of file diff --git a/base/lvm/lvm.SMBuild b/base/lvm/lvm.SMBuild index 03282a9..70ab582 100755 --- a/base/lvm/lvm.SMBuild +++ b/base/lvm/lvm.SMBuild @@ -23,7 +23,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --disable-readline \ --enable-dmeventd \ diff --git a/base/lz4/lz4.SMBuild b/base/lz4/lz4.SMBuild index 16cd96f..efe00e2 100755 --- a/base/lz4/lz4.SMBuild +++ b/base/lz4/lz4.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { make -j1 \ CFLAGS="$CFLAGS" \ - PREFIX="" \ + PREFIX= \ MANDIR="/share/man" \ BUILD_STATIC=no \ DESTDIR=$pkg default install diff --git a/base/lzip/lzip.SMBuild b/base/lzip/lzip.SMBuild index 9b032f6..ed4a880 100755 --- a/base/lzip/lzip.SMBuild +++ b/base/lzip/lzip.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ CXXFLAGS="$CXXFLAGS -static" make diff --git a/base/lzlib/lzlib.SMBuild b/base/lzlib/lzlib.SMBuild index a18795e..f7cf22d 100755 --- a/base/lzlib/lzlib.SMBuild +++ b/base/lzlib/lzlib.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ CFLAGS="$CFLAGS" diff --git a/base/lzo/lzo.SMBuild b/base/lzo/lzo.SMBuild index 30adfad..53c32a9 100755 --- a/base/lzo/lzo.SMBuild +++ b/base/lzo/lzo.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --enable-shared=yes \ --enable-static=no diff --git a/base/m4/m4.SMBuild b/base/m4/m4.SMBuild index 119370d..f1f060a 100755 --- a/base/m4/m4.SMBuild +++ b/base/m4/m4.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/make/make.SMBuild b/base/make/make.SMBuild index e3100c5..aecfe14 100755 --- a/base/make/make.SMBuild +++ b/base/make/make.SMBuild @@ -21,7 +21,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --without-guile make diff --git a/base/man-pages/man-pages.SMBuild b/base/man-pages/man-pages.SMBuild index fa3875f..c61bfe4 100755 --- a/base/man-pages/man-pages.SMBuild +++ b/base/man-pages/man-pages.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { } build() { - make install prefix="" DESTDIR=$pkg + make install prefix= DESTDIR=$pkg # Provided by mandoc rm -fv "$pkg"/share/man/man7/man* \ diff --git a/base/mandoc/mandoc.SMBuild b/base/mandoc/mandoc.SMBuild index 3af5e58..e6c815a 100755 --- a/base/mandoc/mandoc.SMBuild +++ b/base/mandoc/mandoc.SMBuild @@ -27,7 +27,7 @@ build() { ./configure make - make DESTDIR=$pkg PREFIX="" LIBDIR=/lib base-install lib-install + make DESTDIR=$pkg PREFIX= LIBDIR=/lib base-install lib-install cp LICENSE $pkgdocs/ diff --git a/base/meson/meson.SMBuild b/base/meson/meson.SMBuild index 7c482d9..375d9f3 100755 --- a/base/meson/meson.SMBuild +++ b/base/meson/meson.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { python3 setup.py build - python3 setup.py install --prefix="" --root="$pkg" + python3 setup.py install --root="$pkg" cp COPYING $pkgdocs/ diff --git a/base/miniupnpc/miniupnpc.SMBuild b/base/miniupnpc/miniupnpc.SMBuild index 12f0a22..3aa6034 100755 --- a/base/miniupnpc/miniupnpc.SMBuild +++ b/base/miniupnpc/miniupnpc.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install INSTALLPREFIX="/" DESTDIR=$pkg LIBDIR=lib + make install INSTALLPREFIX= DESTDIR=$pkg LIBDIR=lib python3 setup.py build python3 setup.py install --root=$pkg diff --git a/base/mlocate/mlocate.SMBuild b/base/mlocate/mlocate.SMBuild index 9c018f7..bf632b4 100755 --- a/base/mlocate/mlocate.SMBuild +++ b/base/mlocate/mlocate.SMBuild @@ -23,7 +23,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/mozilla-nss/mozilla-nss.SMBuild b/base/mozilla-nss/mozilla-nss.SMBuild index b693b3d..cb9fc94 100755 --- a/base/mozilla-nss/mozilla-nss.SMBuild +++ b/base/mozilla-nss/mozilla-nss.SMBuild @@ -23,7 +23,7 @@ prepbuilddir() { build() { # NSS doesn't like our ARM64-specific optimization C/CXXFLAGS - if [ "$arch" == "aarch64" ] ; then + if [[ $arch = aarch64 ]] ; then unset CFLAGS CXXFLAGS fi diff --git a/base/mozjs/0001-silence-sandbox-violations.patch b/base/mozjs/0001-silence-sandbox-violations.patch deleted file mode 100644 index 1e2ac03..0000000 --- a/base/mozjs/0001-silence-sandbox-violations.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream: no -From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Wed, 5 Sep 2018 15:05:24 +0200 -Subject: [PATCH] silence sandbox violations - -Signed-off-by: Marc-Antoine Perennou ---- - python/mozbuild/mozbuild/frontend/emitter.py | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/python/mozbuild/mozbuild/frontend/emitter.py -+++ b/python/mozbuild/mozbuild/frontend/emitter.py -@@ -1239,12 +1239,6 @@ - 'is a filename, but a directory is required: %s ' - '(resolved to %s)' % (local_include, full_path), - context) -- if (full_path == context.config.topsrcdir or -- full_path == context.config.topobjdir): -- raise SandboxValidationError( -- 'Path specified in LOCAL_INCLUDES ' -- '(%s) resolves to the topsrcdir or topobjdir (%s), which is ' -- 'not allowed' % (local_include, full_path), context) - include_obj = LocalInclude(context, local_include) - local_includes.append(include_obj.path.full_path) - yield include_obj diff --git a/base/mozjs/disable-jslint.patch b/base/mozjs/disable-jslint.patch deleted file mode 100644 index 04a8b3e..0000000 --- a/base/mozjs/disable-jslint.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/js/src/build/moz.build -+++ b/js/src/build/moz.build -@@ -80,14 +80,3 @@ - NO_EXPAND_LIBS = True - - DIST_INSTALL = True -- --# Run SpiderMonkey style checker after linking the static library. This avoids --# running the script for no-op builds. --GeneratedFile( -- 'spidermonkey_checks', script='/config/run_spidermonkey_checks.py', -- inputs=[ -- '!%sjs_static.%s' % (CONFIG['LIB_PREFIX'], CONFIG['LIB_SUFFIX']), -- '/config/check_spidermonkey_style.py', -- '/config/check_macroassembler_style.py', -- '/config/check_js_opcode.py' -- ]) diff --git a/base/mozjs/fd6847c9416f9eebde636e21d794d25d1be8791d.patch b/base/mozjs/fd6847c9416f9eebde636e21d794d25d1be8791d.patch deleted file mode 100644 index 1af68d9..0000000 --- a/base/mozjs/fd6847c9416f9eebde636e21d794d25d1be8791d.patch +++ /dev/null @@ -1,37 +0,0 @@ -See https://bugzilla.mozilla.org/show_bug.cgi?id=1539739 - -From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Sat, 1 Jun 2019 09:06:01 +0900 -Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and - user_vfp_exc. - ---- - js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp -index 636537f8478..383c380f04c 100644 ---- a/js/src/wasm/WasmSignalHandlers.cpp -+++ b/js/src/wasm/WasmSignalHandlers.cpp -@@ -248,7 +248,16 @@ using mozilla::DebugOnly; - #endif - - #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS --# include -+struct user_vfp { -+ unsigned long long fpregs[32]; -+ unsigned long fpscr; -+}; -+ -+struct user_vfp_exc { -+ unsigned long fpexc; -+ unsigned long fpinst; -+ unsigned long fpinst2; -+}; - #endif - - #if defined(ANDROID) --- -2.20.1 - diff --git a/base/mozjs/fix-musl-build.patch b/base/mozjs/fix-musl-build.patch deleted file mode 100644 index af39467..0000000 --- a/base/mozjs/fix-musl-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream: No -Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: -https://github.com/void-linux/void-packages/issues/2598 -diff --git a/js/src/old-configure.in b/js/src/old-configure.in ---- a/js/src/old-configure.in -+++ b/js/src/old-configure.in -@@ -1272,6 +1272,9 @@ - *-android*|*-linuxandroid*) - : - ;; -+ *-musl*) -+ : -+ ;; - *) - AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) - ;; diff --git a/base/mozjs/fix-rust-target.patch b/base/mozjs/fix-rust-target.patch deleted file mode 100644 index f1a98df..0000000 --- a/base/mozjs/fix-rust-target.patch +++ /dev/null @@ -1,15 +0,0 @@ -Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's -weird custom build system... - -diff -upr firefox-68.9.0.orig/build/moz.configure/rust.configure firefox-68.9.0/build/moz.configure/rust.configure ---- firefox-68.9.0.orig/build/moz.configure/rust.configure 2020-06-02 22:54:39.982616128 +0200 -+++ firefox-68.9.0/build/moz.configure/rust.configure 2020-06-02 23:08:37.656332899 +0200 -@@ -345,7 +345,7 @@ def rust_triple_alias(host_or_target): - - return None - -- rustc_target = find_candidate(candidates) -+ rustc_target = os.environ['RUST_TARGET'] - - if rustc_target is None: - die("Don't know how to translate {} for rustc".format( diff --git a/base/mozjs/mozjs.SMBuild b/base/mozjs/mozjs.SMBuild deleted file mode 100755 index 35a96fe..0000000 --- a/base/mozjs/mozjs.SMBuild +++ /dev/null @@ -1,83 +0,0 @@ -# Maintainer: PktSurf -app=mozjs -version=78.15.0 -build=1sml -homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -download="https://ftp.mozilla.org/pub/firefox/releases/"$version"esr/source/firefox-"$version"esr.source.tar.xz" -desc="Mozilla's JavaScript engine" -requires="zip unzip yasm libevent zlib alsa-lib libpng libogg libvorbis icu libvpx hunspell python3 diffutils llvm imake libXt gtk2 dbus-glib ffmpeg" - -prepbuilddir() { - mkandenterbuilddir - rm -rf firefox-$version - - tar xf $srcdir/firefox-"$version"esr.source.tar.?z - cd firefox-$version - fixbuilddirpermissions - mkdir -p AC213 - tar xf $srcdir/autoconf-2.13.tar.gz - cd autoconf-2.13 - ./configure --prefix="$PWD"/../AC213 --program-suffix=-2.13 - make && make install - cd .. - export PATH="$PWD"/AC213/bin:"$PATH" - - applypatch $srcdir/0001-silence-sandbox-violations.patch - applypatch $srcdir/disable-jslint.patch - applypatch $srcdir/fd6847c9416f9eebde636e21d794d25d1be8791d.patch - applypatch $srcdir/fix-musl-build.patch - applypatch $srcdir/fix-rust-target.patch -} - -build() { - cd js/src - export SHELL=/bin/sh - export PYTHON=/bin/python3 - export LDFLAGS="-Wl,-z,stack-size=1048576" - export RUST_TARGET="$arch-unknown-linux-musl" - - cd build - ../configure \ - --prefix="" \ - --disable-jemalloc \ - --with-system-zlib \ - --with-system-icu \ - --with-system-nspr \ - --disable-strip \ - --with-clang-path=/bin/clang \ - --with-libclang-path=/lib \ - --enable-ctypes \ - --enable-hardening \ - --enable-optimize="-O2" \ - --enable-release \ - --enable-shared-js \ - --enable-system-ffi \ - --with-intl-api \ - --enable-tests \ - --disable-debug \ - --disable-debug-symbols - - # Go easy on the pi - if [ "$arch" = "aarch64" ] ; then - unset MAKEFLAGS - MAKEFLAGS="-j2" - fi - - make $MAKEFLAGS - make install DESTDIR=$pkg - - # Discard the static library in staging directory - rm -v $pkg/lib/*.ajs - - mkfinalpkg -} - -sha512sums=" -602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad autoconf-2.13.tar.gz -ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378 firefox-78.15.0esr.source.tar.xz -f7e5bee97cfa495d491dac4b8b98e5d3081346d920700e8bb6d077543e18245e5c82201a9981036ec0bf16d9fbdd42fd76e8cf6d90bb811e7338261204020149 0001-silence-sandbox-violations.patch -4f2cb93f91e798218d83cb3ac4c60b61a3658c5b269bfe250f4c4875aedaacbd77598d8d20e3a868626e49988b2073a2404e37d6918b11def774c25db68dd08d disable-jslint.patch -60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.patch -bc91c2fb15eb22acb8acc36d086fb18fbf6f202b4511d138769b5ecaaed4a673349c55f808270c762616fafa42e3b01e74dc0af1dcbeea1289e043926e2750c8 fix-musl-build.patch -c397bd594428b009d1533922a3728a0ec74403714417f4b90c38c1b7751749b0585d48e77c79efa05c6c22a0d9a8ac04d535eb5bb8deb51684852c03c05d94cd fix-rust-target.patch -" diff --git a/base/mpfr/mpfr.SMBuild b/base/mpfr/mpfr.SMBuild index e214444..5e7dee6 100755 --- a/base/mpfr/mpfr.SMBuild +++ b/base/mpfr/mpfr.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/mpg123/mpg123.SMBuild b/base/mpg123/mpg123.SMBuild index 5e5ca15..72454de 100755 --- a/base/mpg123/mpg123.SMBuild +++ b/base/mpg123/mpg123.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/mtools/mtools.SMBuild b/base/mtools/mtools.SMBuild index 9321b88..5a0bc77 100755 --- a/base/mtools/mtools.SMBuild +++ b/base/mtools/mtools.SMBuild @@ -18,10 +18,10 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --without-x - make PREFIX="/" DESTDIR=$pkg -j1 all install + make PREFIX= DESTDIR=$pkg -j1 all install cp COPYING $pkgdocs/ diff --git a/base/musl/lfs64-2.patch b/base/musl/lfs64-2.patch new file mode 100644 index 0000000..eda916a --- /dev/null +++ b/base/musl/lfs64-2.patch @@ -0,0 +1,240 @@ +accompanies the prior patch, since keeping the symbols but not the headers +breaks things that test link tests but then expect header symbols. +-- +From c3fdda71bb1733081b72a244cbaef03a33d84531 Mon Sep 17 00:00:00 2001 +From: psykose +Date: Tue, 11 Apr 2023 21:28:51 +0200 +Subject: [PATCH] Revert "remove LFS64 programming interfaces (macro-only) from + _GNU_SOURCE" + +This reverts commit 25e6fee27f4a293728dd15b659170e7b9c7db9bc. +--- + include/aio.h | 2 +- + include/dirent.h | 2 +- + include/fcntl.h | 2 +- + include/ftw.h | 2 +- + include/glob.h | 2 +- + include/stdio.h | 2 +- + include/stdlib.h | 2 +- + include/sys/mman.h | 2 +- + include/sys/resource.h | 2 +- + include/sys/sendfile.h | 2 +- + include/sys/stat.h | 2 +- + include/sys/statfs.h | 2 +- + include/sys/statvfs.h | 2 +- + include/sys/types.h | 2 +- + include/sys/uio.h | 2 +- + include/unistd.h | 2 +- + 16 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/aio.h b/include/aio.h +index a938fcad..453c41b7 100644 +--- a/include/aio.h ++++ b/include/aio.h +@@ -49,7 +49,7 @@ int aio_fsync(int, struct aiocb *); + + int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sigevent *__restrict); + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define aiocb64 aiocb + #define aio_read64 aio_read + #define aio_write64 aio_write +diff --git a/include/dirent.h b/include/dirent.h +index 2d8fffb2..650ecf64 100644 +--- a/include/dirent.h ++++ b/include/dirent.h +@@ -56,7 +56,7 @@ int getdents(int, struct dirent *, size_t); + int versionsort(const struct dirent **, const struct dirent **); + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define dirent64 dirent + #define readdir64 readdir + #define readdir64_r readdir_r +diff --git a/include/fcntl.h b/include/fcntl.h +index 515f255d..b664cdc4 100644 +--- a/include/fcntl.h ++++ b/include/fcntl.h +@@ -195,7 +195,7 @@ ssize_t tee(int, int, size_t, unsigned); + #define loff_t off_t + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define F_GETLK64 F_GETLK + #define F_SETLK64 F_SETLK + #define F_SETLKW64 F_SETLKW +diff --git a/include/ftw.h b/include/ftw.h +index d0445e8a..b15c062a 100644 +--- a/include/ftw.h ++++ b/include/ftw.h +@@ -29,7 +29,7 @@ struct FTW { + int ftw(const char *, int (*)(const char *, const struct stat *, int), int); + int nftw(const char *, int (*)(const char *, const struct stat *, int, struct FTW *), int, int); + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define ftw64 ftw + #define nftw64 nftw + #endif +diff --git a/include/glob.h b/include/glob.h +index fed06745..4a562a20 100644 +--- a/include/glob.h ++++ b/include/glob.h +@@ -39,7 +39,7 @@ void globfree(glob_t *); + #define GLOB_NOMATCH 3 + #define GLOB_NOSYS 4 + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define glob64 glob + #define globfree64 globfree + #define glob64_t glob_t +diff --git a/include/stdio.h b/include/stdio.h +index cb858618..d1ed01f0 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -205,7 +205,7 @@ typedef struct _IO_cookie_io_functions_t { + FILE *fopencookie(void *, const char *, cookie_io_functions_t); + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define tmpfile64 tmpfile + #define fopen64 fopen + #define freopen64 freopen +diff --git a/include/stdlib.h b/include/stdlib.h +index b117a452..b507ca33 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -163,7 +163,7 @@ double strtod_l(const char *__restrict, char **__restrict, struct __locale_struc + long double strtold_l(const char *__restrict, char **__restrict, struct __locale_struct *); + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define mkstemp64 mkstemp + #define mkostemp64 mkostemp + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +diff --git a/include/sys/mman.h b/include/sys/mman.h +index 3d5d0f9c..80a3baae 100644 +--- a/include/sys/mman.h ++++ b/include/sys/mman.h +@@ -141,7 +141,7 @@ int mincore (void *, size_t, unsigned char *); + int shm_open (const char *, int, mode_t); + int shm_unlink (const char *); + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define mmap64 mmap + #define off64_t off_t + #endif +diff --git a/include/sys/resource.h b/include/sys/resource.h +index e8bfbe1f..3068328d 100644 +--- a/include/sys/resource.h ++++ b/include/sys/resource.h +@@ -95,7 +95,7 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *); + + #define RLIM_NLIMITS RLIMIT_NLIMITS + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define RLIM64_INFINITY RLIM_INFINITY + #define RLIM64_SAVED_CUR RLIM_SAVED_CUR + #define RLIM64_SAVED_MAX RLIM_SAVED_MAX +diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h +index 253a041b..e7570d8e 100644 +--- a/include/sys/sendfile.h ++++ b/include/sys/sendfile.h +@@ -10,7 +10,7 @@ extern "C" { + + ssize_t sendfile(int, int, off_t *, size_t); + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define sendfile64 sendfile + #define off64_t off_t + #endif +diff --git a/include/sys/stat.h b/include/sys/stat.h +index e6d0049c..10d446c4 100644 +--- a/include/sys/stat.h ++++ b/include/sys/stat.h +@@ -98,7 +98,7 @@ int lchmod(const char *, mode_t); + #define S_IEXEC S_IXUSR + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define stat64 stat + #define fstat64 fstat + #define lstat64 lstat +diff --git a/include/sys/statfs.h b/include/sys/statfs.h +index 7a2e11cd..6f4c6230 100644 +--- a/include/sys/statfs.h ++++ b/include/sys/statfs.h +@@ -18,7 +18,7 @@ typedef struct __fsid_t { + int statfs (const char *, struct statfs *); + int fstatfs (int, struct statfs *); + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define statfs64 statfs + #define fstatfs64 fstatfs + #define fsblkcnt64_t fsblkcnt_t +diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h +index 57a6b806..793490b6 100644 +--- a/include/sys/statvfs.h ++++ b/include/sys/statvfs.h +@@ -42,7 +42,7 @@ int fstatvfs (int, struct statvfs *); + #define ST_NODIRATIME 2048 + #define ST_RELATIME 4096 + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define statvfs64 statvfs + #define fstatvfs64 fstatvfs + #define fsblkcnt64_t fsblkcnt_t +diff --git a/include/sys/types.h b/include/sys/types.h +index 3363374f..0c35541d 100644 +--- a/include/sys/types.h ++++ b/include/sys/types.h +@@ -71,7 +71,7 @@ typedef unsigned long long u_quad_t; + #include + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define blkcnt64_t blkcnt_t + #define fsblkcnt64_t fsblkcnt_t + #define fsfilcnt64_t fsfilcnt_t +diff --git a/include/sys/uio.h b/include/sys/uio.h +index 90e5939e..00f73a2f 100644 +--- a/include/sys/uio.h ++++ b/include/sys/uio.h +@@ -29,7 +29,7 @@ ssize_t writev (int, const struct iovec *, int); + #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) + ssize_t preadv (int, const struct iovec *, int, off_t); + ssize_t pwritev (int, const struct iovec *, int, off_t); +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define preadv64 preadv + #define pwritev64 pwritev + #define off64_t off_t +diff --git a/include/unistd.h b/include/unistd.h +index 5bc7f798..0e8149e4 100644 +--- a/include/unistd.h ++++ b/include/unistd.h +@@ -198,7 +198,7 @@ ssize_t copy_file_range(int, off_t *, int, off_t *, size_t, unsigned); + pid_t gettid(void); + #endif + +-#if defined(_LARGEFILE64_SOURCE) ++#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) + #define lseek64 lseek + #define pread64 pread + #define pwrite64 pwrite +-- +2.40.0 + diff --git a/base/musl/lfs64.patch b/base/musl/lfs64.patch new file mode 100644 index 0000000..0ac8286 --- /dev/null +++ b/base/musl/lfs64.patch @@ -0,0 +1,735 @@ +re-add when: + +gcc-gdc builds without this +rust builds without this + +https://github.com/rust-lang/libc/pull/2935 +https://github.com/rust-lang/rust/pull/106246 +https://github.com/rust-lang/libc/pull/3068 + +-- +From a3a133b520457d13bd7a2fe6794278a3e578f347 Mon Sep 17 00:00:00 2001 +From: psykose +Date: Tue, 11 Apr 2023 19:51:56 +0200 +Subject: [PATCH] Revert "remove LFS64 symbol aliases; replace with dynamic + linker remapping" + +This reverts commit 246f1c811448f37a44b41cd8df8d0ef9736d95f4. +--- + compat/time32/__xstat.c | 8 +++---- + compat/time32/aio_suspend_time32.c | 2 ++ + compat/time32/fstat_time32.c | 2 ++ + compat/time32/fstatat_time32.c | 2 ++ + compat/time32/lstat_time32.c | 2 ++ + compat/time32/stat_time32.c | 2 ++ + ldso/dynlink.c | 34 ------------------------------ + src/aio/aio.c | 7 ++++++ + src/aio/aio_suspend.c | 4 ++++ + src/aio/lio_listio.c | 2 ++ + src/dirent/alphasort.c | 2 ++ + src/dirent/readdir.c | 2 ++ + src/dirent/readdir_r.c | 2 ++ + src/dirent/scandir.c | 2 ++ + src/dirent/versionsort.c | 3 +++ + src/fcntl/creat.c | 2 ++ + src/fcntl/open.c | 2 ++ + src/fcntl/openat.c | 2 ++ + src/fcntl/posix_fadvise.c | 2 ++ + src/fcntl/posix_fallocate.c | 2 ++ + src/legacy/ftw.c | 2 ++ + src/linux/fallocate.c | 3 +++ + src/linux/getdents.c | 2 ++ + src/linux/prlimit.c | 3 +++ + src/linux/sendfile.c | 2 ++ + src/misc/getrlimit.c | 2 ++ + src/misc/lockf.c | 2 ++ + src/misc/nftw.c | 2 ++ + src/misc/setrlimit.c | 2 ++ + src/mman/mmap.c | 2 ++ + src/regex/glob.c | 3 +++ + src/stat/__xstat.c | 5 +++++ + src/stat/fstat.c | 4 ++++ + src/stat/fstatat.c | 4 ++++ + src/stat/lstat.c | 4 ++++ + src/stat/stat.c | 4 ++++ + src/stat/statvfs.c | 5 +++++ + src/stdio/fgetpos.c | 2 ++ + src/stdio/fopen.c | 2 ++ + src/stdio/freopen.c | 2 ++ + src/stdio/fseek.c | 2 ++ + src/stdio/fsetpos.c | 2 ++ + src/stdio/ftell.c | 2 ++ + src/stdio/tmpfile.c | 2 ++ + src/temp/mkostemp.c | 2 ++ + src/temp/mkostemps.c | 1 + + src/temp/mkstemp.c | 2 ++ + src/temp/mkstemps.c | 2 ++ + src/unistd/ftruncate.c | 2 ++ + src/unistd/lseek.c | 1 + + src/unistd/mipsn32/lseek.c | 1 + + src/unistd/pread.c | 2 ++ + src/unistd/preadv.c | 2 ++ + src/unistd/pwrite.c | 2 ++ + src/unistd/pwritev.c | 2 ++ + src/unistd/truncate.c | 2 ++ + src/unistd/x32/lseek.c | 1 + + 57 files changed, 135 insertions(+), 38 deletions(-) + +diff --git a/compat/time32/__xstat.c b/compat/time32/__xstat.c +index e52b5de..acfbd3c 100644 +--- a/compat/time32/__xstat.c ++++ b/compat/time32/__xstat.c +@@ -3,22 +3,22 @@ + + struct stat32; + +-int __fxstat(int ver, int fd, struct stat32 *buf) ++int __fxstat64(int ver, int fd, struct stat32 *buf) + { + return __fstat_time32(fd, buf); + } + +-int __fxstatat(int ver, int fd, const char *path, struct stat32 *buf, int flag) ++int __fxstatat64(int ver, int fd, const char *path, struct stat32 *buf, int flag) + { + return __fstatat_time32(fd, path, buf, flag); + } + +-int __lxstat(int ver, const char *path, struct stat32 *buf) ++int __lxstat64(int ver, const char *path, struct stat32 *buf) + { + return __lstat_time32(path, buf); + } + +-int __xstat(int ver, const char *path, struct stat32 *buf) ++int __xstat64(int ver, const char *path, struct stat32 *buf) + { + return __stat_time32(path, buf); + } +diff --git a/compat/time32/aio_suspend_time32.c b/compat/time32/aio_suspend_time32.c +index d99cb65..ed5119b 100644 +--- a/compat/time32/aio_suspend_time32.c ++++ b/compat/time32/aio_suspend_time32.c +@@ -7,3 +7,5 @@ int __aio_suspend_time32(const struct aiocb *const cbs[], int cnt, const struct + return aio_suspend(cbs, cnt, ts32 ? (&(struct timespec){ + .tv_sec = ts32->tv_sec, .tv_nsec = ts32->tv_nsec}) : 0); + } ++ ++weak_alias(aio_suspend, aio_suspend64); +diff --git a/compat/time32/fstat_time32.c b/compat/time32/fstat_time32.c +index e5d5202..3e08439 100644 +--- a/compat/time32/fstat_time32.c ++++ b/compat/time32/fstat_time32.c +@@ -13,3 +13,5 @@ int __fstat_time32(int fd, struct stat32 *restrict st32) + if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim)); + return r; + } ++ ++weak_alias(fstat, fstat64); +diff --git a/compat/time32/fstatat_time32.c b/compat/time32/fstatat_time32.c +index 31d42e6..85dcb00 100644 +--- a/compat/time32/fstatat_time32.c ++++ b/compat/time32/fstatat_time32.c +@@ -13,3 +13,5 @@ int __fstatat_time32(int fd, const char *restrict path, struct stat32 *restrict + if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim)); + return r; + } ++ ++weak_alias(fstatat, fstatat64); +diff --git a/compat/time32/lstat_time32.c b/compat/time32/lstat_time32.c +index 28cb5a0..c1257a1 100644 +--- a/compat/time32/lstat_time32.c ++++ b/compat/time32/lstat_time32.c +@@ -13,3 +13,5 @@ int __lstat_time32(const char *restrict path, struct stat32 *restrict st32) + if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim)); + return r; + } ++ ++weak_alias(lstat, lstat64); +diff --git a/compat/time32/stat_time32.c b/compat/time32/stat_time32.c +index b154b0f..8c6121d 100644 +--- a/compat/time32/stat_time32.c ++++ b/compat/time32/stat_time32.c +@@ -13,3 +13,5 @@ int __stat_time32(const char *restrict path, struct stat32 *restrict st32) + if (!r) memcpy(st32, &st, offsetof(struct stat, st_atim)); + return r; + } ++ ++weak_alias(stat, stat64); +diff --git a/ldso/dynlink.c b/ldso/dynlink.c +index ceca3c9..0ae3e94 100644 +--- a/ldso/dynlink.c ++++ b/ldso/dynlink.c +@@ -343,40 +343,6 @@ static struct symdef find_sym(struct dso *dso, const char *s, int need_def) + return find_sym2(dso, s, need_def, 0); + } + +-static struct symdef get_lfs64(const char *name) +-{ +- const char *p; +- static const char lfs64_list[] = +- "aio_cancel\0aio_error\0aio_fsync\0aio_read\0aio_return\0" +- "aio_suspend\0aio_write\0alphasort\0creat\0fallocate\0" +- "fgetpos\0fopen\0freopen\0fseeko\0fsetpos\0fstat\0" +- "fstatat\0fstatfs\0fstatvfs\0ftello\0ftruncate\0ftw\0" +- "getdents\0getrlimit\0glob\0globfree\0lio_listio\0" +- "lockf\0lseek\0lstat\0mkostemp\0mkostemps\0mkstemp\0" +- "mkstemps\0mmap\0nftw\0open\0openat\0posix_fadvise\0" +- "posix_fallocate\0pread\0preadv\0prlimit\0pwrite\0" +- "pwritev\0readdir\0scandir\0sendfile\0setrlimit\0" +- "stat\0statfs\0statvfs\0tmpfile\0truncate\0versionsort\0" +- "__fxstat\0__fxstatat\0__lxstat\0__xstat\0"; +- size_t l; +- char buf[16]; +- for (l=0; name[l]; l++) { +- if (l >= sizeof buf) goto nomatch; +- buf[l] = name[l]; +- } +- if (!strcmp(name, "readdir64_r")) +- return find_sym(&ldso, "readdir_r", 1); +- if (l<2 || name[l-2]!='6' || name[l-1]!='4') +- goto nomatch; +- buf[l-=2] = 0; +- for (p=lfs64_list; *p; p++) { +- if (!strcmp(buf, p)) return find_sym(&ldso, buf, 1); +- while (*p) p++; +- } +-nomatch: +- return (struct symdef){ 0 }; +-} +- + static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stride) + { + unsigned char *base = dso->base; +@@ -430,7 +396,6 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri + def = (sym->st_info>>4) == STB_LOCAL + ? (struct symdef){ .dso = dso, .sym = sym } + : find_sym(ctx, name, type==REL_PLT); +- if (!def.sym) def = get_lfs64(name); + if (!def.sym && (sym->st_shndx != SHN_UNDEF + || sym->st_info>>4 != STB_WEAK)) { + if (dso->lazy && (type==REL_PLT || type==REL_GOT)) { +diff --git a/src/aio/aio.c b/src/aio/aio.c +index d7e063b..37309d3 100644 +--- a/src/aio/aio.c ++++ b/src/aio/aio.c +@@ -430,3 +430,10 @@ void __aio_atfork(int who) + * We are not a lock holder anyway; the thread in the parent was. */ + pthread_rwlock_init(&maplock, 0); + } ++ ++weak_alias(aio_cancel, aio_cancel64); ++weak_alias(aio_error, aio_error64); ++weak_alias(aio_fsync, aio_fsync64); ++weak_alias(aio_read, aio_read64); ++weak_alias(aio_write, aio_write64); ++weak_alias(aio_return, aio_return64); +diff --git a/src/aio/aio_suspend.c b/src/aio/aio_suspend.c +index 1f0c9aa..290b43f 100644 +--- a/src/aio/aio_suspend.c ++++ b/src/aio/aio_suspend.c +@@ -73,3 +73,7 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec + } + } + } ++ ++#if !_REDIR_TIME64 ++weak_alias(aio_suspend, aio_suspend64); ++#endif +diff --git a/src/aio/lio_listio.c b/src/aio/lio_listio.c +index a672812..0799c15 100644 +--- a/src/aio/lio_listio.c ++++ b/src/aio/lio_listio.c +@@ -139,3 +139,5 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st + + return 0; + } ++ ++weak_alias(lio_listio, lio_listio64); +diff --git a/src/dirent/alphasort.c b/src/dirent/alphasort.c +index ab2624e..bee672e 100644 +--- a/src/dirent/alphasort.c ++++ b/src/dirent/alphasort.c +@@ -5,3 +5,5 @@ int alphasort(const struct dirent **a, const struct dirent **b) + { + return strcoll((*a)->d_name, (*b)->d_name); + } ++ ++weak_alias(alphasort, alphasort64); +diff --git a/src/dirent/readdir.c b/src/dirent/readdir.c +index 5a03b36..569fc70 100644 +--- a/src/dirent/readdir.c ++++ b/src/dirent/readdir.c +@@ -25,3 +25,5 @@ struct dirent *readdir(DIR *dir) + dir->tell = de->d_off; + return de; + } ++ ++weak_alias(readdir, readdir64); +diff --git a/src/dirent/readdir_r.c b/src/dirent/readdir_r.c +index 0d5de5f..e2a818f 100644 +--- a/src/dirent/readdir_r.c ++++ b/src/dirent/readdir_r.c +@@ -25,3 +25,5 @@ int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **re + *result = buf; + return 0; + } ++ ++weak_alias(readdir_r, readdir64_r); +diff --git a/src/dirent/scandir.c b/src/dirent/scandir.c +index 7456b9b..7ee195d 100644 +--- a/src/dirent/scandir.c ++++ b/src/dirent/scandir.c +@@ -43,3 +43,5 @@ int scandir(const char *path, struct dirent ***res, + *res = names; + return cnt; + } ++ ++weak_alias(scandir, scandir64); +diff --git a/src/dirent/versionsort.c b/src/dirent/versionsort.c +index 9769610..d4c4892 100644 +--- a/src/dirent/versionsort.c ++++ b/src/dirent/versionsort.c +@@ -6,3 +6,6 @@ int versionsort(const struct dirent **a, const struct dirent **b) + { + return strverscmp((*a)->d_name, (*b)->d_name); + } ++ ++#undef versionsort64 ++weak_alias(versionsort, versionsort64); +diff --git a/src/fcntl/creat.c b/src/fcntl/creat.c +index c9c4391..8f8aab6 100644 +--- a/src/fcntl/creat.c ++++ b/src/fcntl/creat.c +@@ -4,3 +4,5 @@ int creat(const char *filename, mode_t mode) + { + return open(filename, O_CREAT|O_WRONLY|O_TRUNC, mode); + } ++ ++weak_alias(creat, creat64); +diff --git a/src/fcntl/open.c b/src/fcntl/open.c +index 4c3c827..1d817a2 100644 +--- a/src/fcntl/open.c ++++ b/src/fcntl/open.c +@@ -19,3 +19,5 @@ int open(const char *filename, int flags, ...) + + return __syscall_ret(fd); + } ++ ++weak_alias(open, open64); +diff --git a/src/fcntl/openat.c b/src/fcntl/openat.c +index 83a9e0d..ad165ec 100644 +--- a/src/fcntl/openat.c ++++ b/src/fcntl/openat.c +@@ -15,3 +15,5 @@ int openat(int fd, const char *filename, int flags, ...) + + return syscall_cp(SYS_openat, fd, filename, flags|O_LARGEFILE, mode); + } ++ ++weak_alias(openat, openat64); +diff --git a/src/fcntl/posix_fadvise.c b/src/fcntl/posix_fadvise.c +index 07346d2..75b8e1a 100644 +--- a/src/fcntl/posix_fadvise.c ++++ b/src/fcntl/posix_fadvise.c +@@ -14,3 +14,5 @@ int posix_fadvise(int fd, off_t base, off_t len, int advice) + __SYSCALL_LL_E(len), advice); + #endif + } ++ ++weak_alias(posix_fadvise, posix_fadvise64); +diff --git a/src/fcntl/posix_fallocate.c b/src/fcntl/posix_fallocate.c +index 80a65cb..c57a24a 100644 +--- a/src/fcntl/posix_fallocate.c ++++ b/src/fcntl/posix_fallocate.c +@@ -6,3 +6,5 @@ int posix_fallocate(int fd, off_t base, off_t len) + return -__syscall(SYS_fallocate, fd, 0, __SYSCALL_LL_E(base), + __SYSCALL_LL_E(len)); + } ++ ++weak_alias(posix_fallocate, posix_fallocate64); +diff --git a/src/legacy/ftw.c b/src/legacy/ftw.c +index e757fc6..506bd29 100644 +--- a/src/legacy/ftw.c ++++ b/src/legacy/ftw.c +@@ -7,3 +7,5 @@ int ftw(const char *path, int (*fn)(const char *, const struct stat *, int), int + * actually undefined, but works on all real-world machines. */ + return nftw(path, (int (*)())fn, fd_limit, FTW_PHYS); + } ++ ++weak_alias(ftw, ftw64); +diff --git a/src/linux/fallocate.c b/src/linux/fallocate.c +index 9146350..7d68bc8 100644 +--- a/src/linux/fallocate.c ++++ b/src/linux/fallocate.c +@@ -7,3 +7,6 @@ int fallocate(int fd, int mode, off_t base, off_t len) + return syscall(SYS_fallocate, fd, mode, __SYSCALL_LL_E(base), + __SYSCALL_LL_E(len)); + } ++ ++#undef fallocate64 ++weak_alias(fallocate, fallocate64); +diff --git a/src/linux/getdents.c b/src/linux/getdents.c +index 97f76e1..796c1e5 100644 +--- a/src/linux/getdents.c ++++ b/src/linux/getdents.c +@@ -8,3 +8,5 @@ int getdents(int fd, struct dirent *buf, size_t len) + if (len>INT_MAX) len = INT_MAX; + return syscall(SYS_getdents, fd, buf, len); + } ++ ++weak_alias(getdents, getdents64); +diff --git a/src/linux/prlimit.c b/src/linux/prlimit.c +index fcf45aa..3df9ffb 100644 +--- a/src/linux/prlimit.c ++++ b/src/linux/prlimit.c +@@ -21,3 +21,6 @@ int prlimit(pid_t pid, int resource, const struct rlimit *new_limit, struct rlim + } + return r; + } ++ ++#undef prlimit64 ++weak_alias(prlimit, prlimit64); +diff --git a/src/linux/sendfile.c b/src/linux/sendfile.c +index fc1577d..9afe6dd 100644 +--- a/src/linux/sendfile.c ++++ b/src/linux/sendfile.c +@@ -5,3 +5,5 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *ofs, size_t count) + { + return syscall(SYS_sendfile, out_fd, in_fd, ofs, count); + } ++ ++weak_alias(sendfile, sendfile64); +diff --git a/src/misc/getrlimit.c b/src/misc/getrlimit.c +index a5558d8..bf67630 100644 +--- a/src/misc/getrlimit.c ++++ b/src/misc/getrlimit.c +@@ -26,3 +26,5 @@ int getrlimit(int resource, struct rlimit *rlim) + return ret; + #endif + } ++ ++weak_alias(getrlimit, getrlimit64); +diff --git a/src/misc/lockf.c b/src/misc/lockf.c +index 0162442..16a80be 100644 +--- a/src/misc/lockf.c ++++ b/src/misc/lockf.c +@@ -28,3 +28,5 @@ int lockf(int fd, int op, off_t size) + errno = EINVAL; + return -1; + } ++ ++weak_alias(lockf, lockf64); +diff --git a/src/misc/nftw.c b/src/misc/nftw.c +index 71bc62e..e1bcf1a 100644 +--- a/src/misc/nftw.c ++++ b/src/misc/nftw.c +@@ -140,3 +140,5 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str + pthread_setcancelstate(cs, 0); + return r; + } ++ ++weak_alias(nftw, nftw64); +diff --git a/src/misc/setrlimit.c b/src/misc/setrlimit.c +index edb413f..5b713cf 100644 +--- a/src/misc/setrlimit.c ++++ b/src/misc/setrlimit.c +@@ -49,3 +49,5 @@ int setrlimit(int resource, const struct rlimit *rlim) + return __syscall_ret(ret); + #endif + } ++ ++weak_alias(setrlimit, setrlimit64); +diff --git a/src/mman/mmap.c b/src/mman/mmap.c +index 43e5e02..eff88d8 100644 +--- a/src/mman/mmap.c ++++ b/src/mman/mmap.c +@@ -37,3 +37,5 @@ void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off) + } + + weak_alias(__mmap, mmap); ++ ++weak_alias(mmap, mmap64); +diff --git a/src/regex/glob.c b/src/regex/glob.c +index a490644..9de080e 100644 +--- a/src/regex/glob.c ++++ b/src/regex/glob.c +@@ -306,3 +306,6 @@ void globfree(glob_t *g) + g->gl_pathc = 0; + g->gl_pathv = NULL; + } ++ ++weak_alias(glob, glob64); ++weak_alias(globfree, globfree64); +diff --git a/src/stat/__xstat.c b/src/stat/__xstat.c +index b4560df..630936a 100644 +--- a/src/stat/__xstat.c ++++ b/src/stat/__xstat.c +@@ -22,6 +22,11 @@ int __xstat(int ver, const char *path, struct stat *buf) + return stat(path, buf); + } + ++weak_alias(__fxstat, __fxstat64); ++weak_alias(__fxstatat, __fxstatat64); ++weak_alias(__lxstat, __lxstat64); ++weak_alias(__xstat, __xstat64); ++ + #endif + + int __xmknod(int ver, const char *path, mode_t mode, dev_t *dev) +diff --git a/src/stat/fstat.c b/src/stat/fstat.c +index fd28b8a..27db0cc 100644 +--- a/src/stat/fstat.c ++++ b/src/stat/fstat.c +@@ -11,3 +11,7 @@ int __fstat(int fd, struct stat *st) + } + + weak_alias(__fstat, fstat); ++ ++#if !_REDIR_TIME64 ++weak_alias(fstat, fstat64); ++#endif +diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c +index 0450637..74c51cf 100644 +--- a/src/stat/fstatat.c ++++ b/src/stat/fstatat.c +@@ -151,3 +151,7 @@ int __fstatat(int fd, const char *restrict path, struct stat *restrict st, int f + } + + weak_alias(__fstatat, fstatat); ++ ++#if !_REDIR_TIME64 ++weak_alias(fstatat, fstatat64); ++#endif +diff --git a/src/stat/lstat.c b/src/stat/lstat.c +index 6822fca..6fe004d 100644 +--- a/src/stat/lstat.c ++++ b/src/stat/lstat.c +@@ -5,3 +5,7 @@ int lstat(const char *restrict path, struct stat *restrict buf) + { + return fstatat(AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW); + } ++ ++#if !_REDIR_TIME64 ++weak_alias(lstat, lstat64); ++#endif +diff --git a/src/stat/stat.c b/src/stat/stat.c +index 23570e7..ea70efc 100644 +--- a/src/stat/stat.c ++++ b/src/stat/stat.c +@@ -5,3 +5,7 @@ int stat(const char *restrict path, struct stat *restrict buf) + { + return fstatat(AT_FDCWD, path, buf, 0); + } ++ ++#if !_REDIR_TIME64 ++weak_alias(stat, stat64); ++#endif +diff --git a/src/stat/statvfs.c b/src/stat/statvfs.c +index bfbb5fe..f65d1b5 100644 +--- a/src/stat/statvfs.c ++++ b/src/stat/statvfs.c +@@ -56,3 +56,8 @@ int fstatvfs(int fd, struct statvfs *buf) + fixup(buf, &kbuf); + return 0; + } ++ ++weak_alias(statvfs, statvfs64); ++weak_alias(statfs, statfs64); ++weak_alias(fstatvfs, fstatvfs64); ++weak_alias(fstatfs, fstatfs64); +diff --git a/src/stdio/fgetpos.c b/src/stdio/fgetpos.c +index 392f732..50813d2 100644 +--- a/src/stdio/fgetpos.c ++++ b/src/stdio/fgetpos.c +@@ -7,3 +7,5 @@ int fgetpos(FILE *restrict f, fpos_t *restrict pos) + *(long long *)pos = off; + return 0; + } ++ ++weak_alias(fgetpos, fgetpos64); +diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c +index 80bc341..e1b91e1 100644 +--- a/src/stdio/fopen.c ++++ b/src/stdio/fopen.c +@@ -29,3 +29,5 @@ FILE *fopen(const char *restrict filename, const char *restrict mode) + __syscall(SYS_close, fd); + return 0; + } ++ ++weak_alias(fopen, fopen64); +diff --git a/src/stdio/freopen.c b/src/stdio/freopen.c +index 1641a4c..96bfbb4 100644 +--- a/src/stdio/freopen.c ++++ b/src/stdio/freopen.c +@@ -51,3 +51,5 @@ fail: + fclose(f); + return NULL; + } ++ ++weak_alias(freopen, freopen64); +diff --git a/src/stdio/fseek.c b/src/stdio/fseek.c +index c742580..c07f7e9 100644 +--- a/src/stdio/fseek.c ++++ b/src/stdio/fseek.c +@@ -46,3 +46,5 @@ int fseek(FILE *f, long off, int whence) + } + + weak_alias(__fseeko, fseeko); ++ ++weak_alias(fseeko, fseeko64); +diff --git a/src/stdio/fsetpos.c b/src/stdio/fsetpos.c +index 779cb3c..77ab8d8 100644 +--- a/src/stdio/fsetpos.c ++++ b/src/stdio/fsetpos.c +@@ -4,3 +4,5 @@ int fsetpos(FILE *f, const fpos_t *pos) + { + return __fseeko(f, *(const long long *)pos, SEEK_SET); + } ++ ++weak_alias(fsetpos, fsetpos64); +diff --git a/src/stdio/ftell.c b/src/stdio/ftell.c +index 1e1a08d..1a2afbb 100644 +--- a/src/stdio/ftell.c ++++ b/src/stdio/ftell.c +@@ -37,3 +37,5 @@ long ftell(FILE *f) + } + + weak_alias(__ftello, ftello); ++ ++weak_alias(ftello, ftello64); +diff --git a/src/stdio/tmpfile.c b/src/stdio/tmpfile.c +index 2fa8803..ae49398 100644 +--- a/src/stdio/tmpfile.c ++++ b/src/stdio/tmpfile.c +@@ -27,3 +27,5 @@ FILE *tmpfile(void) + } + return 0; + } ++ ++weak_alias(tmpfile, tmpfile64); +diff --git a/src/temp/mkostemp.c b/src/temp/mkostemp.c +index e3dfdd9..d8dcb80 100644 +--- a/src/temp/mkostemp.c ++++ b/src/temp/mkostemp.c +@@ -5,3 +5,5 @@ int mkostemp(char *template, int flags) + { + return __mkostemps(template, 0, flags); + } ++ ++weak_alias(mkostemp, mkostemp64); +diff --git a/src/temp/mkostemps.c b/src/temp/mkostemps.c +index 093d238..ef24eea 100644 +--- a/src/temp/mkostemps.c ++++ b/src/temp/mkostemps.c +@@ -26,3 +26,4 @@ int __mkostemps(char *template, int len, int flags) + } + + weak_alias(__mkostemps, mkostemps); ++weak_alias(__mkostemps, mkostemps64); +diff --git a/src/temp/mkstemp.c b/src/temp/mkstemp.c +index 76c835b..166b8af 100644 +--- a/src/temp/mkstemp.c ++++ b/src/temp/mkstemp.c +@@ -4,3 +4,5 @@ int mkstemp(char *template) + { + return __mkostemps(template, 0, 0); + } ++ ++weak_alias(mkstemp, mkstemp64); +diff --git a/src/temp/mkstemps.c b/src/temp/mkstemps.c +index f8eabfe..6b7531b 100644 +--- a/src/temp/mkstemps.c ++++ b/src/temp/mkstemps.c +@@ -5,3 +5,5 @@ int mkstemps(char *template, int len) + { + return __mkostemps(template, len, 0); + } ++ ++weak_alias(mkstemps, mkstemps64); +diff --git a/src/unistd/ftruncate.c b/src/unistd/ftruncate.c +index 54ff34b..b41be0f 100644 +--- a/src/unistd/ftruncate.c ++++ b/src/unistd/ftruncate.c +@@ -5,3 +5,5 @@ int ftruncate(int fd, off_t length) + { + return syscall(SYS_ftruncate, fd, __SYSCALL_LL_O(length)); + } ++ ++weak_alias(ftruncate, ftruncate64); +diff --git a/src/unistd/lseek.c b/src/unistd/lseek.c +index f5b6668..b4984f3 100644 +--- a/src/unistd/lseek.c ++++ b/src/unistd/lseek.c +@@ -12,3 +12,4 @@ off_t __lseek(int fd, off_t offset, int whence) + } + + weak_alias(__lseek, lseek); ++weak_alias(__lseek, lseek64); +diff --git a/src/unistd/mipsn32/lseek.c b/src/unistd/mipsn32/lseek.c +index 0f6cbca..60e74a5 100644 +--- a/src/unistd/mipsn32/lseek.c ++++ b/src/unistd/mipsn32/lseek.c +@@ -17,3 +17,4 @@ off_t __lseek(int fd, off_t offset, int whence) + } + + weak_alias(__lseek, lseek); ++weak_alias(__lseek, lseek64); +diff --git a/src/unistd/pread.c b/src/unistd/pread.c +index b03fb0a..5681b04 100644 +--- a/src/unistd/pread.c ++++ b/src/unistd/pread.c +@@ -5,3 +5,5 @@ ssize_t pread(int fd, void *buf, size_t size, off_t ofs) + { + return syscall_cp(SYS_pread, fd, buf, size, __SYSCALL_LL_PRW(ofs)); + } ++ ++weak_alias(pread, pread64); +diff --git a/src/unistd/preadv.c b/src/unistd/preadv.c +index 890ab40..8376d60 100644 +--- a/src/unistd/preadv.c ++++ b/src/unistd/preadv.c +@@ -8,3 +8,5 @@ ssize_t preadv(int fd, const struct iovec *iov, int count, off_t ofs) + return syscall_cp(SYS_preadv, fd, iov, count, + (long)(ofs), (long)(ofs>>32)); + } ++ ++weak_alias(preadv, preadv64); +diff --git a/src/unistd/pwrite.c b/src/unistd/pwrite.c +index 869b69f..ca37657 100644 +--- a/src/unistd/pwrite.c ++++ b/src/unistd/pwrite.c +@@ -5,3 +5,5 @@ ssize_t pwrite(int fd, const void *buf, size_t size, off_t ofs) + { + return syscall_cp(SYS_pwrite, fd, buf, size, __SYSCALL_LL_PRW(ofs)); + } ++ ++weak_alias(pwrite, pwrite64); +diff --git a/src/unistd/pwritev.c b/src/unistd/pwritev.c +index becf9de..f5a612c 100644 +--- a/src/unistd/pwritev.c ++++ b/src/unistd/pwritev.c +@@ -8,3 +8,5 @@ ssize_t pwritev(int fd, const struct iovec *iov, int count, off_t ofs) + return syscall_cp(SYS_pwritev, fd, iov, count, + (long)(ofs), (long)(ofs>>32)); + } ++ ++weak_alias(pwritev, pwritev64); +diff --git a/src/unistd/truncate.c b/src/unistd/truncate.c +index 077351e..9729680 100644 +--- a/src/unistd/truncate.c ++++ b/src/unistd/truncate.c +@@ -5,3 +5,5 @@ int truncate(const char *path, off_t length) + { + return syscall(SYS_truncate, path, __SYSCALL_LL_O(length)); + } ++ ++weak_alias(truncate, truncate64); +diff --git a/src/unistd/x32/lseek.c b/src/unistd/x32/lseek.c +index 5f93292..3263642 100644 +--- a/src/unistd/x32/lseek.c ++++ b/src/unistd/x32/lseek.c +@@ -12,3 +12,4 @@ off_t __lseek(int fd, off_t offset, int whence) + } + + weak_alias(__lseek, lseek); ++weak_alias(__lseek, lseek64); diff --git a/base/musl/musl.SMBuild b/base/musl/musl.SMBuild index c12049c..5b2fbaf 100755 --- a/base/musl/musl.SMBuild +++ b/base/musl/musl.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=musl -version=1.2.3 +version=1.2.4 build=2sml homepage="http://www.musl-libc.org/" download="https://musl.libc.org/releases/musl-$version.tar.gz" @@ -15,11 +15,14 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions + + applypatch $srcdir/lfs64.patch + applypatch $srcdir/lfs64-2.patch } build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg @@ -30,25 +33,23 @@ build() { gcc -o $pkg/bin/getent $srcdir/getent.c gcc -o $pkg/bin/iconv $srcdir/iconv.c - ( - cd $pkg/lib - # Remove the symlink, it'll break upgrades and make the system useless - rm ld-musl-$arch.so.1 - # Copy the libc.so as the $arch-specific file - cp libc.so ld-musl-$arch.so.1 - ) + #( + #mkdir -p $pkg/lib + #cd $pkg/lib + #ln -sf ../usr/lib/libc.so ld-musl-$arch.so.1 + #) cp COPYRIGHT $pkgdocs/ - cp $srcdir/{cdefs.h,queue.h,stab.h,tree.h} $pkg/include/sys/ + #cp $srcdir/{cdefs.h,queue.h,stab.h,tree.h} $pkg/include/sys/ - [ "$arch" = "aarch64" ] && install -Dm 644 $srcdir/asm.hwcap.h $pkg/include/asm/hwcap.h + [[ $arch = aarch64 ]] && install -Dm 644 $srcdir/asm.hwcap.h $pkg/include/asm/hwcap.h mkfinalpkg } sha512sums=" -0d47c3a8c34301b81b346dfd90eedc8d7a68b9dd7cdde41f0003f985a55aec30d7eca974be233ae31814e9c608e989807008a56fff986d88ffe8a09f3b869ee5 musl-1.2.3.tar.lz +498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55 musl-1.2.4.tar.gz 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c diff --git a/base/mypaint-brushes/mypaint-brushes.SMBuild b/base/mypaint-brushes/mypaint-brushes.SMBuild index 011a681..4efb990 100755 --- a/base/mypaint-brushes/mypaint-brushes.SMBuild +++ b/base/mypaint-brushes/mypaint-brushes.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/nano/nano.SMBuild b/base/nano/nano.SMBuild index a60258f..04ab05c 100755 --- a/base/nano/nano.SMBuild +++ b/base/nano/nano.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" + --prefix= make make install DESTDIR=$pkg diff --git a/base/nasm/nasm.SMBuild b/base/nasm/nasm.SMBuild index 00346c4..b5b2bdb 100755 --- a/base/nasm/nasm.SMBuild +++ b/base/nasm/nasm.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/ncdu/ncdu.SMBuild b/base/ncdu/ncdu.SMBuild index bf76d3a..1de8c0f 100755 --- a/base/ncdu/ncdu.SMBuild +++ b/base/ncdu/ncdu.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin make diff --git a/base/ndctl/ndctl.SMBuild b/base/ndctl/ndctl.SMBuild deleted file mode 100755 index 0be746a..0000000 --- a/base/ndctl/ndctl.SMBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: PktSurf -app=ndctl -version=72.1 -build=2sml -homepage="https://github.com/pmem/ndctl" -download="https://github.com/pmem/ndctl/archive/refs/tags/v$version.tar.gz" -desc="Library for managing the libnvdimm sub-system in the linux kernel" -requires="util-linux json-c keyutils eudev kmod netbsd-curses" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - ./configure \ - --prefix="" \ - --disable-docs \ - --without-systemd - - make - make install DESTDIR=$pkg - - cp COPYING $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -e1fc3b71da3fc093ea1adcec5843c98460c6a095e31fd7728bda44804835124a7f1993187c6657c1effd6edba9b7d3e05310a987f3cd1bd088ad5d495dbc4fd3 ndctl-72.1.tar.lz -" diff --git a/base/neon/neon.SMBuild b/base/neon/neon.SMBuild index 615f1f1..beadd89 100755 --- a/base/neon/neon.SMBuild +++ b/base/neon/neon.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-static=no \ --enable-shared=yes \ --with-ssl=openssl diff --git a/base/netbsd-curses/netbsd-curses.SMBuild b/base/netbsd-curses/netbsd-curses.SMBuild index 62d1a14..37c036e 100755 --- a/base/netbsd-curses/netbsd-curses.SMBuild +++ b/base/netbsd-curses/netbsd-curses.SMBuild @@ -24,7 +24,7 @@ HOSTCC=gcc AR=ar RANLIB=ranlib CFLAGS=$CFLAGS -PREFIX="" +PREFIX= DESTDIR=$pkg EOF diff --git a/base/nettle/nettle.SMBuild b/base/nettle/nettle.SMBuild index 95422cd..55bd1d8 100755 --- a/base/nettle/nettle.SMBuild +++ b/base/nettle/nettle.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=nettle -version=3.7.2 +version=3.9 build=1sml homepage="http://www.lysator.liu.se/~nisse/nettle/" download="https://ftp.gnu.org/gnu/nettle/nettle-$version.tar.gz" @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make @@ -32,5 +32,5 @@ build() { } sha512sums=" -692f052eb492bcf07690157d1496ea9b87b9e42f01d68b30f5be60f51596db37ce4adc0ea9e636889aba0e84b0357b02d888a77228a80f2d81a6f99c1021236f nettle-3.7.2.tar.lz -" +05de0b705a2759ef684a59fea3cdfef5d3be7ae96fc501c47612ec94ece27bc92a613c1bf881c96ae5d12755d663f2fedfbf45b6f40de920c2c2b523b9583b3b nettle-3.9.tar.lz +" \ No newline at end of file diff --git a/base/nghttp2/nghttp2.SMBuild b/base/nghttp2/nghttp2.SMBuild index 0548935..d5fe0ea 100755 --- a/base/nghttp2/nghttp2.SMBuild +++ b/base/nghttp2/nghttp2.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=nghttp2 -version=1.41.0 +version=1.53.0 build=1sml homepage="https://nghttp2.org/" download="https://github.com/nghttp2/nghttp2/releases/download/v$version/nghttp2-$version.tar.xz" @@ -18,9 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-examples \ - --disable-python-bindings \ --enable-lib-only \ --disable-static @@ -36,5 +35,5 @@ build() { } sha512sums=" -000c8033b882e0e071fdfdadbd808fba8556e83efafe397e5f28dcd3fe2c32fa33eceab502a907d7023084f06ae141dfd85ecee9fdc55037fb1b242df94e976a nghttp2-1.41.0.tar.lz +fa687279cbc54cbbccca9e75b72250df0ca381ebfaeddf2767be8c00e43c89e012a296f64b3ca07a7ecf3b23729c5c30ba91cd6f411112c435efccb7e4ffc01e nghttp2-1.53.0.tar.lz " diff --git a/base/nodejs/nodejs.SMBuild b/base/nodejs/nodejs.SMBuild index db27316..6657003 100755 --- a/base/nodejs/nodejs.SMBuild +++ b/base/nodejs/nodejs.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="/" \ + --prefix=/ \ --shared-zlib \ --shared-openssl diff --git a/base/npth/npth.SMBuild b/base/npth/npth.SMBuild index db5cd6a..64a9ad6 100755 --- a/base/npth/npth.SMBuild +++ b/base/npth/npth.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/oniguruma/oniguruma.SMBuild b/base/oniguruma/oniguruma.SMBuild index 05a7492..240e809 100755 --- a/base/oniguruma/oniguruma.SMBuild +++ b/base/oniguruma/oniguruma.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-posix-api \ --disable-static diff --git a/base/openssl/openssl.SMBuild b/base/openssl/openssl.SMBuild index d8e22a6..1a99e23 100755 --- a/base/openssl/openssl.SMBuild +++ b/base/openssl/openssl.SMBuild @@ -17,19 +17,19 @@ prepbuilddir() { } build() { - if [ "$arch" = "aarch64" ]; then - cpuflag="linux-aarch64" - elif [ "$arch" = "x86_64" ]; then - cpuflag="linux-x86_64" + if [[ $arch = aarch64 ]]; then + cpuflag=linux-aarch64 + elif [[ $arch = x86_64 ]]; then + cpuflag=linux-x86_64 fi - ./Configure "$cpuflag" \ - --prefix="/" \ + ./Configure $cpuflag \ + --prefix=/ \ --openssldir=/etc/ssl \ shared enable-md2 no-weak-ssl-ciphers make - make install LIBDIR=lib DOCDIR="/share/doc/$app-$version" DESTDIR=$pkg + make install LIBDIR=lib DESTDIR=$pkg cp LICENSE $pkgdocs/ diff --git a/base/opus/opus.SMBuild b/base/opus/opus.SMBuild index 7298a01..a8c6b59 100755 --- a/base/opus/opus.SMBuild +++ b/base/opus/opus.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --disable-doc diff --git a/base/opusfile/opusfile.SMBuild b/base/opusfile/opusfile.SMBuild index 9d52987..2c9d185 100755 --- a/base/opusfile/opusfile.SMBuild +++ b/base/opusfile/opusfile.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/p11-kit/p11-kit.SMBuild b/base/p11-kit/p11-kit.SMBuild index 9c96b7b..7528495 100755 --- a/base/p11-kit/p11-kit.SMBuild +++ b/base/p11-kit/p11-kit.SMBuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= \ + --without-trust-paths make make install DESTDIR=$pkg diff --git a/base/p7zip/p7zip.SMBuild b/base/p7zip/p7zip.SMBuild index df4cb8e..55ad29e 100755 --- a/base/p7zip/p7zip.SMBuild +++ b/base/p7zip/p7zip.SMBuild @@ -21,7 +21,7 @@ build() { -e 's/chmod 555/chmod 755/' \ -e 's/chmod 444/chmod 644/' install.sh && make all3 OPTFLAGS="$CXXFLAGS" || true - make install DEST_HOME="" DEST_DIR="$pkg" DEST_MAN="/share/man" + make install DEST_HOME="" DEST_MAN="/share/man" DEST_DIR="$pkg" cp DOC/License.txt $pkgdocs/ diff --git a/base/parted/parted.SMBuild b/base/parted/parted.SMBuild index 035bc9a..6fd5fd5 100755 --- a/base/parted/parted.SMBuild +++ b/base/parted/parted.SMBuild @@ -22,7 +22,7 @@ prepbuilddir() { build() { CFLAGS+=" -Dloff_t=off_t -include sys/sysmacros.h" \ ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --enable-threads=posix \ --disable-static diff --git a/base/patch/patch.SMBuild b/base/patch/patch.SMBuild index 9c2f2e6..01f9466 100755 --- a/base/patch/patch.SMBuild +++ b/base/patch/patch.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/pax-utils/pax-utils.SMBuild b/base/pax-utils/pax-utils.SMBuild index 07f3382..5ddce09 100755 --- a/base/pax-utils/pax-utils.SMBuild +++ b/base/pax-utils/pax-utils.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir smbuild && cd smbuild meson .. \ - --prefix="/" + --prefix=/ ninja DESTDIR="$pkg" ninja install diff --git a/base/pciutils/pciutils.SMBuild b/base/pciutils/pciutils.SMBuild index e80e681..9c7e5a3 100755 --- a/base/pciutils/pciutils.SMBuild +++ b/base/pciutils/pciutils.SMBuild @@ -6,9 +6,9 @@ homepage="https://mj.ucw.cz/sw/pciutils/" download="https://mj.ucw.cz/download/linux/pci/pciutils-$version.tar.gz" desc="PCI bus library and tools" requires="musl" +apparch="x86_64" prepbuilddir() { - compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -22,17 +22,17 @@ prepbuilddir() { build() { make CFLAGS+=" -DHAVE_PREAD" \ LDFLAGS="-llzma" \ - PREFIX="/" \ + PREFIX= \ SHARED=yes \ - SBINDIR="/bin" \ + SBINDIR=/bin \ DESTDIR="$pkg" \ STRIP="" all install make CFLAGS+=" -DHAVE_PREAD" \ LDFLAGS="-llzma" \ - PREFIX="/" \ + PREFIX= \ SHARED=yes \ - SBINDIR="/bin" \ + SBINDIR=/bin \ DESTDIR="$pkg" \ STRIP="" install-lib diff --git a/base/pcre/pcre.SMBuild b/base/pcre/pcre.SMBuild index c117877..fda6626 100755 --- a/base/pcre/pcre.SMBuild +++ b/base/pcre/pcre.SMBuild @@ -20,8 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --enable-pcre16 \ --enable-pcre32 \ --enable-pcregrep-libbz2 \ diff --git a/base/pcre2/pcre2.SMBuild b/base/pcre2/pcre2.SMBuild index 78fb3ae..f0a26b4 100755 --- a/base/pcre2/pcre2.SMBuild +++ b/base/pcre2/pcre2.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=pcre2 -version=10.33 +version=10.42 build=1sml homepage="https://www.pcre.org/" download="https://ftp.pcre.org/pub/pcre/pcre2-$version.tar.gz" @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-pcre2-16 \ --enable-pcre2-32 \ --enable-jit \ @@ -37,5 +37,5 @@ build() { } sha512sums=" -b94e6df0a779c58fce66854b5d64eed1232cc0027362e369a2465b893d9f59c9f01126db6336a5a77714148bf70d4b11c28fd866ee26d061f3f36426495e43bf pcre2-10.33.tar.lz +0ece10943de49f52456c8c8cb51a60d9f00e2a6554643ac4c80d65d8adde7bcb394332c65a6076dfcadcfb23d0d7ac09b3643786bef27d7e4006e419f23e4bdf pcre2-10.42.tar.lz " diff --git a/base/perl/perl.SMBuild b/base/perl/perl.SMBuild index 036fc45..af42146 100755 --- a/base/perl/perl.SMBuild +++ b/base/perl/perl.SMBuild @@ -37,8 +37,8 @@ build() { ./Configure -des \ -Accflags='$CFLAGS -D_BSD_SOURCE' \ - -Dprefix="/" \ - -Dvendorprefix="/" \ + -Dprefix=/ \ + -Dvendorprefix=/ \ -Dsitelib="/lib/perl5/site_perl" \ -Dsitearch="/lib/perl5/site_perl" \ -Darchlib="/lib/perl5/core_perl" \ diff --git a/base/physfs/physfs.SMBuild b/base/physfs/physfs.SMBuild index b8e684e..596c22a 100755 --- a/base/physfs/physfs.SMBuild +++ b/base/physfs/physfs.SMBuild @@ -23,7 +23,7 @@ build() { -DPHYSFS_BUILD_STATIC=OFF \ -DPHYSFS_BUILD_TEST=OFF \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" + -DCMAKE_INSTALL_PREFIX= make make install DESTDIR=$pkg diff --git a/base/pkgconf/pkgconf.SMBuild b/base/pkgconf/pkgconf.SMBuild index 4aa3c39..e072578 100755 --- a/base/pkgconf/pkgconf.SMBuild +++ b/base/pkgconf/pkgconf.SMBuild @@ -18,10 +18,10 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --docdir="/share/doc/$app-$version" \ --disable-static \ - --with-pkg-config-dir="/lib/pkgconfig:/share/pkgconfig" + --with-pkg-config-dir="/lib/pkgconfig:/lib/pkgconfig:/share/pkgconfig" make make install DESTDIR=$pkg diff --git a/base/plzip/plzip.SMBuild b/base/plzip/plzip.SMBuild index 37fb7e8..e09a970 100755 --- a/base/plzip/plzip.SMBuild +++ b/base/plzip/plzip.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ CXXFLAGS="$CXXFLAGS" make diff --git a/base/pm-utils/pm-utils.SMBuild b/base/pm-utils/pm-utils.SMBuild index 3209cc6..b10d6a7 100755 --- a/base/pm-utils/pm-utils.SMBuild +++ b/base/pm-utils/pm-utils.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin make diff --git a/base/polkit/doinst.sh b/base/polkit/doinst.sh deleted file mode 100644 index be34fcc..0000000 --- a/base/polkit/doinst.sh +++ /dev/null @@ -1,8 +0,0 @@ -if ! getent group polkitd ; then - addgroup -S -g 115 polkitd -fi - -if ! getent passwd polkitd ; then - adduser -D -S -u 115 -G polkitd -s "/bin/false" -g "Policykit Daemon Owner" -h "/etc/polkit-1" polkitd -fi - diff --git a/base/polkit/make-innetgr-optional.patch b/base/polkit/make-innetgr-optional.patch deleted file mode 100644 index 8459c67..0000000 --- a/base/polkit/make-innetgr-optional.patch +++ /dev/null @@ -1,239 +0,0 @@ -See https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 - -From 778bb45e0e0cbabe2b04adf67a500af1dab09768 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Wed, 11 Jul 2018 04:54:26 -0500 -Subject: [PATCH] make netgroup support optional - -On at least Linux/musl and Linux/uclibc, netgroup support is not -available. PolKit fails to compile on these systems for that reason. - -This change makes netgroup support conditional on the presence of the -setnetgrent(3) function which is required for the support to work. If -that function is not available on the system, an error will be returned -to the administrator if unix-netgroup: is specified in configuration. - -Fixes bug 50145. - -Closes polkit/polkit#14. - -Signed-off-by: A. Wilcox ---- -diff --git a/configure.ac b/configure.ac -index 4ac2219..ca478df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,7 +100,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], - [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) - AC_SUBST(EXPAT_LIBS) - --AC_CHECK_FUNCS(clearenv fdatasync) -+AC_CHECK_FUNCS(clearenv fdatasync setnetgrent) - - if test "x$GCC" = "xyes"; then - LDFLAGS="-Wl,--as-needed $LDFLAGS" -diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c -index 3aa1f7f..10e9c17 100644 ---- a/src/polkit/polkitidentity.c -+++ b/src/polkit/polkitidentity.c -@@ -182,7 +182,15 @@ polkit_identity_from_string (const gchar *str, - } - else if (g_str_has_prefix (str, "unix-netgroup:")) - { -+#ifndef HAVE_SETNETGRENT -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Netgroups are not available on this machine ('%s')", -+ str); -+#else - identity = polkit_unix_netgroup_new (str + sizeof "unix-netgroup:" - 1); -+#endif - } - - if (identity == NULL && (error != NULL && *error == NULL)) -@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVariant *variant, - GVariant *v; - const char *name; - -+#ifndef HAVE_SETNETGRENT -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Netgroups are not available on this machine"); -+ goto out; -+#else - v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); - if (v == NULL) - { -@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, - name = g_variant_get_string (v, NULL); - ret = polkit_unix_netgroup_new (name); - g_variant_unref (v); -+#endif - } - else - { -diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c -index 8a2b369..83f8d4a 100644 ---- a/src/polkit/polkitunixnetgroup.c -+++ b/src/polkit/polkitunixnetgroup.c -@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUnixNetgroup *group, - PolkitIdentity * - polkit_unix_netgroup_new (const gchar *name) - { -+#ifndef HAVE_SETNETGRENT -+ g_assert_not_reached(); -+#endif - g_return_val_if_fail (name != NULL, NULL); - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, - "name", name, -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index 056d9a8..36c2f3d 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity *group, - GList *ret; - - ret = NULL; -+#ifdef HAVE_SETNETGRENT - name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); - --#ifdef HAVE_SETNETGRENT_RETURN -+# ifdef HAVE_SETNETGRENT_RETURN - if (setnetgrent (name) == 0) - { - g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); - goto out; - } --#else -+# else - setnetgrent (name); --#endif -+# endif /* HAVE_SETNETGRENT_RETURN */ - - for (;;) - { --#if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) -+# if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) - const char *hostname, *username, *domainname; --#else -+# else - char *hostname, *username, *domainname; --#endif -+# endif /* defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) */ - PolkitIdentity *user; - GError *error = NULL; - -@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity *group, - - out: - endnetgrent (); -+#endif /* HAVE_SETNETGRENT */ - return ret; - } - -diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index ca17108..da95180 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.cpp -+++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1520,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - - JS::CallArgs args = JS::CallArgsFromVp (argc, vp); - -+#ifdef HAVE_SETNETGRENT - JS::RootedString usrstr (authority->priv->cx); - usrstr = args[0].toString(); - user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1534,6 +1535,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - { - is_in_netgroup = true; - } -+ #endif - - ret = true; - -diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c -index e91967b..e829aaa 100644 ---- a/test/polkit/polkitidentitytest.c -+++ b/test/polkit/polkitidentitytest.c -@@ -19,6 +19,7 @@ - * Author: Nikki VonHollen - */ - -+#include "config.h" - #include "glib.h" - #include - #include -@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_test_data [] = { - {"unix-group:root", "unix-group:jane", FALSE}, - {"unix-group:jane", "unix-group:jane", TRUE}, - -+#ifdef HAVE_SETNETGRENT - {"unix-netgroup:foo", "unix-netgroup:foo", TRUE}, - {"unix-netgroup:foo", "unix-netgroup:bar", FALSE}, -+#endif - - {"unix-user:root", "unix-group:root", FALSE}, -+#ifdef HAVE_SETNETGRENT - {"unix-user:jane", "unix-netgroup:foo", FALSE}, -+#endif - - {NULL}, - }; -@@ -181,11 +186,13 @@ main (int argc, char *argv[]) - g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string); - g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string); - -+#ifdef HAVE_SETNETGRENT - g_test_add_data_func ("/PolkitIdentity/netgroup_string", "unix-netgroup:foo", test_string); -+ g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); -+#endif - - g_test_add_data_func ("/PolkitIdentity/user_gvariant", "unix-user:root", test_gvariant); - g_test_add_data_func ("/PolkitIdentity/group_gvariant", "unix-group:root", test_gvariant); -- g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); - - add_comparison_tests (); - -diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c -index 3701ba1..e3352eb 100644 ---- a/test/polkit/polkitunixnetgrouptest.c -+++ b/test/polkit/polkitunixnetgrouptest.c -@@ -19,6 +19,7 @@ - * Author: Nikki VonHollen - */ - -+#include "config.h" - #include "glib.h" - #include - #include -@@ -69,7 +70,9 @@ int - main (int argc, char *argv[]) - { - g_test_init (&argc, &argv, NULL); -+#ifdef HAVE_SETNETGRENT - g_test_add_func ("/PolkitUnixNetgroup/new", test_new); - g_test_add_func ("/PolkitUnixNetgroup/set_name", test_set_name); -+#endif - return g_test_run (); - } -diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c -index f97e0e0..fc52149 100644 ---- a/test/polkitbackend/test-polkitbackendjsauthority.c -+++ b/test/polkitbackend/test-polkitbackendjsauthority.c -@@ -137,12 +137,14 @@ test_get_admin_identities (void) - "unix-group:users" - } - }, -+#ifdef HAVE_SETNETGRENT - { - "net.company.action3", - { - "unix-netgroup:foo" - } - }, -+#endif - }; - guint n; - diff --git a/base/polkit/polkit-0.120-security_fix-1.patch b/base/polkit/polkit-0.120-security_fix-1.patch deleted file mode 100644 index 3847516..0000000 --- a/base/polkit/polkit-0.120-security_fix-1.patch +++ /dev/null @@ -1,87 +0,0 @@ -Submitted By: Xi Ruoyao -Date: 2021-01-27 -Initial Package Version: 0.120 -Upstream Status: Applied -Origin: Upstream -Description: Fix CVE-2021-4034, a trivially exploitable local - privilege escalation, to polkit since 0.92. - -From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001 -From: Jan Rybar -Date: Tue, 25 Jan 2022 17:21:46 +0000 -Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034) - ---- - src/programs/pkcheck.c | 5 +++++ - src/programs/pkexec.c | 23 ++++++++++++++++++++--- - 2 files changed, 25 insertions(+), 3 deletions(-) - -diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c -index f1bb4e1..768525c 100644 ---- a/src/programs/pkcheck.c -+++ b/src/programs/pkcheck.c -@@ -363,6 +363,11 @@ main (int argc, char *argv[]) - local_agent_handle = NULL; - ret = 126; - -+ if (argc < 1) -+ { -+ exit(126); -+ } -+ - /* Disable remote file access from GIO. */ - setenv ("GIO_USE_VFS", "local", 1); - -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 7698c5c..84e5ef6 100644 ---- a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -488,6 +488,15 @@ main (int argc, char *argv[]) - pid_t pid_of_caller; - gpointer local_agent_handle; - -+ -+ /* -+ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out. -+ */ -+ if (argc<1) -+ { -+ exit(127); -+ } -+ - ret = 127; - authority = NULL; - subject = NULL; -@@ -614,10 +623,10 @@ main (int argc, char *argv[]) - - path = g_strdup (pwstruct.pw_shell); - if (!path) -- { -+ { - g_printerr ("No shell configured or error retrieving pw_shell\n"); - goto out; -- } -+ } - /* If you change this, be sure to change the if (!command_line) - case below too */ - command_line = g_strdup (path); -@@ -636,7 +645,15 @@ main (int argc, char *argv[]) - goto out; - } - g_free (path); -- argv[n] = path = s; -+ path = s; -+ -+ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated. -+ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination -+ */ -+ if (argv[n] != NULL) -+ { -+ argv[n] = path; -+ } - } - if (access (path, F_OK) != 0) - { --- -GitLab - diff --git a/base/polkit/polkit.SMBuild b/base/polkit/polkit.SMBuild deleted file mode 100755 index 3f27ecd..0000000 --- a/base/polkit/polkit.SMBuild +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: PktSurf -app=polkit -version=0.120 -build=1sml -homepage="http://www.freedesktop.org/wiki/Software/polkit" -download="https://gitlab.freedesktop.org/polkit/polkit/-/archive/$version/polkit-$version.tar.bz2" -desc="Authentication framework to allow communication between unprivileged and privileged processes" -requires="glib netbsd-curses expat libffi zlib dbus" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions - - applypatch $srcdir/make-innetgr-optional.patch - applypatch $srcdir/polkit-0.120-security_fix-1.patch -} - -build() { - ./configure \ - --prefix="/" \ - --disable-man-pages \ - --disable-static \ - --disable-examples \ - --enable-libsystemd-login=no \ - --enable-libelogind=no \ - --with-authfw=shadow \ - --enable-verbose-mode \ - --with-os-type=Slackware \ - --disable-introspection - - make - make install DESTDIR=$pkg - - mkdir -p $pkg/var/lib/polkit - - cp COPYING $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -11368ba4ceb12b431e869b8861afb4457c0aa94fbe2f6c839d6e8e1037b322f2cc5483cfa18bcb516dabab3fffe467189e561fb57d262d3d1ddc4a70be34c8d3 polkit-0.120.tar.lz -0c47751e928a91ce3a477a330ef38b8f6f003b515c94e7fb9842e6f2043be43d749ab7390cc1dbcf1fa6128b62cf0eab353d4f8855d68e595bc53777512f4562 make-innetgr-optional.patch -2606d4ff8ae00be2416da965f6c00c9b2c30ff928b765d9a744f9470805329192949bbca43b42741709e6fb3672c8d6f0bf8b4c97603b4f022d16ca243ab99a2 polkit-0.120-security_fix-1.patch -" diff --git a/base/popt/popt.SMBuild b/base/popt/popt.SMBuild index e3e3617..1a79776 100755 --- a/base/popt/popt.SMBuild +++ b/base/popt/popt.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ $builddist diff --git a/base/portaudio/portaudio.SMBuild b/base/portaudio/portaudio.SMBuild index bd532a0..1e21b10 100755 --- a/base/portaudio/portaudio.SMBuild +++ b/base/portaudio/portaudio.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-cxx \ --disable-static diff --git a/base/procps-ng/procps-ng.SMBuild b/base/procps-ng/procps-ng.SMBuild index 5d7fd2f..9296fc3 100755 --- a/base/procps-ng/procps-ng.SMBuild +++ b/base/procps-ng/procps-ng.SMBuild @@ -27,7 +27,7 @@ prepbuilddir() { build() { CPPFLAGS="$CFLAGS -DGLOB_TILDE=0 -DAF_INET6=10 -DAF_INET=2" \ ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ --sbindir=/bin @@ -40,7 +40,7 @@ build() { LDFLAGS="-static" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/protobuf/protobuf.SMBuild b/base/protobuf/protobuf.SMBuild index f12625e..4e8ac43 100755 --- a/base/protobuf/protobuf.SMBuild +++ b/base/protobuf/protobuf.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/pv/pv.SMBuild b/base/pv/pv.SMBuild index 7f774f4..e5295a5 100755 --- a/base/pv/pv.SMBuild +++ b/base/pv/pv.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/pwgen/pwgen.SMBuild b/base/pwgen/pwgen.SMBuild index eb921e3..bbfbf1a 100755 --- a/base/pwgen/pwgen.SMBuild +++ b/base/pwgen/pwgen.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/pyelftools/pyelftools.SMBuild b/base/pyelftools/pyelftools.SMBuild index 37d9204..213007b 100755 --- a/base/pyelftools/pyelftools.SMBuild +++ b/base/pyelftools/pyelftools.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-cheetah/python-cheetah.SMBuild b/base/python-cheetah/python-cheetah.SMBuild index 318c3f0..e29609f 100755 --- a/base/python-cheetah/python-cheetah.SMBuild +++ b/base/python-cheetah/python-cheetah.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-click/python-click.SMBuild b/base/python-click/python-click.SMBuild index e731ec0..afeb6f6 100755 --- a/base/python-click/python-click.SMBuild +++ b/base/python-click/python-click.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.rst $pkgdocs/ mkfinalpkg diff --git a/base/python-future/python-future.SMBuild b/base/python-future/python-future.SMBuild index 30df968..3c26524 100755 --- a/base/python-future/python-future.SMBuild +++ b/base/python-future/python-future.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root="$pkg" + python setup.py install --root="$pkg" cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-importlib-metadata/python-importlib-metadata.SMBuild b/base/python-importlib-metadata/python-importlib-metadata.SMBuild index 41298b2..d8d2794 100755 --- a/base/python-importlib-metadata/python-importlib-metadata.SMBuild +++ b/base/python-importlib-metadata/python-importlib-metadata.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-jinja2/python-jinja2.SMBuild b/base/python-jinja2/python-jinja2.SMBuild index b12ea6f..da1c39d 100755 --- a/base/python-jinja2/python-jinja2.SMBuild +++ b/base/python-jinja2/python-jinja2.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.rst $pkgdocs/ mkfinalpkg diff --git a/base/python-joblib/python-joblib.SMBuild b/base/python-joblib/python-joblib.SMBuild index d6dfbe9..d16854a 100755 --- a/base/python-joblib/python-joblib.SMBuild +++ b/base/python-joblib/python-joblib.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-livereload/python-livereload.SMBuild b/base/python-livereload/python-livereload.SMBuild index ba13c94..d4c2fe8 100755 --- a/base/python-livereload/python-livereload.SMBuild +++ b/base/python-livereload/python-livereload.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-lunr/python-lunr.SMBuild b/base/python-lunr/python-lunr.SMBuild index a6913e6..c21a82e 100755 --- a/base/python-lunr/python-lunr.SMBuild +++ b/base/python-lunr/python-lunr.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-lxml/python-lxml.SMBuild b/base/python-lxml/python-lxml.SMBuild index 588fb19..5033af7 100755 --- a/base/python-lxml/python-lxml.SMBuild +++ b/base/python-lxml/python-lxml.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { python setup.py build - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSES.txt $pkgdocs/ head -n 1000 CHANGES.txt > $pkgdocs/CHANGELOG diff --git a/base/python-m2crypto/python-m2crypto.SMBuild b/base/python-m2crypto/python-m2crypto.SMBuild index cd8d48b..137a800 100755 --- a/base/python-m2crypto/python-m2crypto.SMBuild +++ b/base/python-m2crypto/python-m2crypto.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp CHANGES LICENCE $pkgdocs/ mkfinalpkg diff --git a/base/python-mako/python-mako.SMBuild b/base/python-mako/python-mako.SMBuild index 483e0a1..407eec0 100755 --- a/base/python-mako/python-mako.SMBuild +++ b/base/python-mako/python-mako.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-markdown/python-markdown.SMBuild b/base/python-markdown/python-markdown.SMBuild index 4cbe455..8433f3d 100755 --- a/base/python-markdown/python-markdown.SMBuild +++ b/base/python-markdown/python-markdown.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.md $pkgdocs/ mkfinalpkg diff --git a/base/python-markupsafe/python-markupsafe.SMBuild b/base/python-markupsafe/python-markupsafe.SMBuild index 5e4bdc8..cac517d 100755 --- a/base/python-markupsafe/python-markupsafe.SMBuild +++ b/base/python-markupsafe/python-markupsafe.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { python setup.py build - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp CHANGES.rst LICENSE.rst $pkgdocs/ mkfinalpkg diff --git a/base/python-mkdocs/python-mkdocs.SMBuild b/base/python-mkdocs/python-mkdocs.SMBuild index a0eef11..a3471ff 100755 --- a/base/python-mkdocs/python-mkdocs.SMBuild +++ b/base/python-mkdocs/python-mkdocs.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-nltk/python-nltk.SMBuild b/base/python-nltk/python-nltk.SMBuild index c674a96..c0e2c2c 100755 --- a/base/python-nltk/python-nltk.SMBuild +++ b/base/python-nltk/python-nltk.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-pip/python-pip.SMBuild b/base/python-pip/python-pip.SMBuild index cd81de9..5f23986 100755 --- a/base/python-pip/python-pip.SMBuild +++ b/base/python-pip/python-pip.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-pyyaml/python-pyyaml.SMBuild b/base/python-pyyaml/python-pyyaml.SMBuild index 8a0c088..5d341c7 100755 --- a/base/python-pyyaml/python-pyyaml.SMBuild +++ b/base/python-pyyaml/python-pyyaml.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-regex/python-regex.SMBuild b/base/python-regex/python-regex.SMBuild index 9af7b6c..812c54b 100755 --- a/base/python-regex/python-regex.SMBuild +++ b/base/python-regex/python-regex.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-setuptools/python-setuptools.SMBuild b/base/python-setuptools/python-setuptools.SMBuild index 0a63ea7..5dc3e70 100755 --- a/base/python-setuptools/python-setuptools.SMBuild +++ b/base/python-setuptools/python-setuptools.SMBuild @@ -20,7 +20,7 @@ build() { # Discard Windows binaries rm -f setuptools/*.exe - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-six/python-six.SMBuild b/base/python-six/python-six.SMBuild index 00c612b..988edf3 100755 --- a/base/python-six/python-six.SMBuild +++ b/base/python-six/python-six.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-tornado/python-tornado.SMBuild b/base/python-tornado/python-tornado.SMBuild index 556d4a6..995bbdf 100755 --- a/base/python-tornado/python-tornado.SMBuild +++ b/base/python-tornado/python-tornado.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-tqdm/python-tqdm.SMBuild b/base/python-tqdm/python-tqdm.SMBuild index 29c7d71..6fa8bcf 100755 --- a/base/python-tqdm/python-tqdm.SMBuild +++ b/base/python-tqdm/python-tqdm.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENCE $pkgdocs/ mkfinalpkg diff --git a/base/python-typing-extensions/python-typing-extensions.SMBuild b/base/python-typing-extensions/python-typing-extensions.SMBuild index 52d316b..01050dd 100755 --- a/base/python-typing-extensions/python-typing-extensions.SMBuild +++ b/base/python-typing-extensions/python-typing-extensions.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-typing/python-typing.SMBuild b/base/python-typing/python-typing.SMBuild index d38cd75..7206eff 100755 --- a/base/python-typing/python-typing.SMBuild +++ b/base/python-typing/python-typing.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python setup.py install --prefix="" --root=$pkg + python setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python-wheel/python-wheel.SMBuild b/base/python-wheel/python-wheel.SMBuild index 605876d..f9dbcc8 100755 --- a/base/python-wheel/python-wheel.SMBuild +++ b/base/python-wheel/python-wheel.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-zipp/python-zipp.SMBuild b/base/python-zipp/python-zipp.SMBuild index f19b20c..5a712a2 100755 --- a/base/python-zipp/python-zipp.SMBuild +++ b/base/python-zipp/python-zipp.SMBuild @@ -16,7 +16,7 @@ prepbuilddir() { } build() { - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg cp LICENSE $pkgdocs/ mkfinalpkg diff --git a/base/python3/python3.SMBuild b/base/python3/python3.SMBuild index ef82127..a62cba8 100755 --- a/base/python3/python3.SMBuild +++ b/base/python3/python3.SMBuild @@ -26,9 +26,7 @@ prepbuilddir() { build() { LDFLAGS="-lncursesw -lterminfo" \ ./configure \ - --prefix="/" \ - --bindir="/bin" \ - --libdir="/lib" \ + --prefix=/usr \ --with-system-expat \ --with-system-ffi \ --without-cxx-main \ @@ -48,7 +46,7 @@ build() { done ( - cd $pkg/bin ; ln -s python3 python + cd $pkg/usr/bin ; ln -s python3 python ) mkfinalpkg diff --git a/base/qpdf/log.txt b/base/qpdf/log.txt new file mode 100644 index 0000000..c54e319 --- /dev/null +++ b/base/qpdf/log.txt @@ -0,0 +1,43 @@ +[ 70%] Linking CXX executable pdf-attach-file +make[2]: Entering directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +cd /tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild/examples && /bin/cmake -E cmake_link_script CMakeFiles/pdf-attach-file.dir/link.txt --verbose=0 +make[2]: Entering directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +[ 70%] Building CXX object examples/CMakeFiles/pdf-create.dir/pdf-create.cc.o +[ 71%] Linking CXX executable pdf-count-strings +cd /tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild/examples && /lib/distcc/g++ -DPOINTERHOLDER_TRANSITION=4 -DQPDF_DISABLE_QTC=1 -I/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/include -Os -DNDEBUG -std=c++14 -fvisibility=hidden -Wall -Wconversion -Wsign-conversion -Wshadow=local -Wold-style-cast -MD -MT examples/CMakeFiles/pdf-create.dir/pdf-create.cc.o -MF CMakeFiles/pdf-create.dir/pdf-create.cc.o.d -o CMakeFiles/pdf-create.dir/pdf-create.cc.o -c /tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/examples/pdf-create.cc +[ 71%] Linking CXX executable pdf-bookmarks +cd /tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild/examples && /bin/cmake -E cmake_link_script CMakeFiles/pdf-count-strings.dir/link.txt --verbose=0 +cd /tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild/examples && /bin/cmake -E cmake_link_script CMakeFiles/pdf-bookmarks.dir/link.txt --verbose=0 +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: pdf-attach-file: hidden symbol `__aarch64_ldadd8_acq_rel' in /aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/libgcc.a(ldadd_8_4.o) is referenced by DSO +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: final link failed: bad value +collect2: error: ld returned 1 exit status +distcc[20826] ERROR: compile (null) on localhost failed +make[2]: *** [examples/CMakeFiles/pdf-attach-file.dir/build.make:98: examples/pdf-attach-file] Error 1 +make[2]: Leaving directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +make[1]: *** [CMakeFiles/Makefile2:1818: examples/CMakeFiles/pdf-attach-file.dir/all] Error 2 +make[1]: *** Waiting for unfinished jobs.... +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: pdf-count-strings: hidden symbol `__aarch64_ldadd8_acq_rel' in /aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/libgcc.a(ldadd_8_4.o) is referenced by DSO +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: final link failed: bad value +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: pdf-bookmarks: hidden symbol `__aarch64_ldadd8_acq_rel' in /aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/libgcc.a(ldadd_8_4.o) is referenced by DSO +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: final link failed: bad value +collect2: error: ld returned 1 exit status +collect2: error: ld returned 1 exit status +distcc[20835] ERROR: compile (null) on localhost failed +distcc[20836] ERROR: compile (null) on localhost failed +make[2]: *** [examples/CMakeFiles/pdf-bookmarks.dir/build.make:98: examples/pdf-bookmarks] Error 1 +make[2]: *** [examples/CMakeFiles/pdf-count-strings.dir/build.make:98: examples/pdf-count-strings] Error 1 +make[2]: Leaving directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +make[2]: Leaving directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +make[1]: *** [CMakeFiles/Makefile2:1870: examples/CMakeFiles/pdf-count-strings.dir/all] Error 2 +make[1]: *** [CMakeFiles/Makefile2:1844: examples/CMakeFiles/pdf-bookmarks.dir/all] Error 2 +[ 72%] Linking CXX executable pdf-create +cd /tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild/examples && /bin/cmake -E cmake_link_script CMakeFiles/pdf-create.dir/link.txt --verbose=0 +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: pdf-create: hidden symbol `__aarch64_ldadd8_acq_rel' in /aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/libgcc.a(ldadd_8_4.o) is referenced by DSO +/aarch64-linux-musl_pi3-12.2.0/bin/../lib/gcc/aarch64-linux-musl/12.2.0/../../../../aarch64-linux-musl/bin/ld: final link failed: bad value +collect2: error: ld returned 1 exit status +distcc[20849] ERROR: compile (null) on localhost failed +make[2]: *** [examples/CMakeFiles/pdf-create.dir/build.make:98: examples/pdf-create] Error 1 +make[2]: Leaving directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +make[1]: *** [CMakeFiles/Makefile2:1896: examples/CMakeFiles/pdf-create.dir/all] Error 2 +make[1]: Leaving directory '/tmp/tmpfsdir/qpdf.src/qpdf-11.1.0/smbuild' +make: *** [Makefile:166: all] Error 2 diff --git a/base/qpdf/qpdf.SMBuild b/base/qpdf/qpdf.SMBuild index 2680eed..df33eb1 100755 --- a/base/qpdf/qpdf.SMBuild +++ b/base/qpdf/qpdf.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=qpdf -version=11.1.0 -build=2sml +version=11.4.0 +build=1sml homepage="https://github.com/qpdf/qpdf" download="https://github.com/qpdf/qpdf/releases/download/v$version/qpdf-$version.tar.gz" desc="Command-line tools and library for transforming PDF files" @@ -17,11 +17,12 @@ prepbuilddir() { } build() { + unset CFLAGS CXXFLAGS mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ -DBUILD_STATIC_LIBS=OFF \ -DINSTALL_EXAMPLES=OFF @@ -34,5 +35,5 @@ build() { } sha512sums=" -ccfc7cfe3b5beaf73c064c36056bf4c9cbecc8709c1afc7b5a1de58055d2818a82f6fffd5b59b700b06215d84646267eaa2cfc014721041af94b6a29d9f67b4d qpdf-11.1.0.tar.lz +6f31a37a9a52752c89d319e0d29d8e6c1e4885ca494de47a65f9374cdb5672497ab93f754481300c8e6c68fc2874860997b778dc05386b6f3e6a5a70a3f9f754 qpdf-11.4.0.tar.gz " diff --git a/base/qrencode/qrencode.SMBuild b/base/qrencode/qrencode.SMBuild index 1f36474..49cd3a6 100755 --- a/base/qrencode/qrencode.SMBuild +++ b/base/qrencode/qrencode.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/readline/readline.SMBuild b/base/readline/readline.SMBuild index e6ba12c..1d9c6e9 100755 --- a/base/readline/readline.SMBuild +++ b/base/readline/readline.SMBuild @@ -22,8 +22,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --with-curses \ --enable-multibyte \ --disable-static diff --git a/base/rpi-userland/10-vchiq.rules b/base/rpi-userland/10-vchiq.rules deleted file mode 100644 index c891542..0000000 --- a/base/rpi-userland/10-vchiq.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEMS=="vchiq",GROUP="video",MODE="0660" diff --git a/base/rpi-userland/rpi-userland.SMBuild b/base/rpi-userland/rpi-userland.SMBuild deleted file mode 100755 index a131de3..0000000 --- a/base/rpi-userland/rpi-userland.SMBuild +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: PktSurf -app=rpi-userland -version=20200603 -build=1sml -homepage="https://github.com/raspberrypi/userland" -desc="Common raspberry-pi userland utilities" -requires="musl" - -prepbuilddir() { - compileonlyfor aarch64 - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions - - # this package does not like execinfo header, and will fail to link against the execinfo - # library, so we temporarily rename the header - [ -e /include/execinfo.h ] && mv /include/execinfo.h /include/execinfo.h.bak - - sed -i -e 's/sudo //' buildme -} - -build() { - ./buildme --aarch64 "$pkg" - - # The build script does not exit with a status 0, so we do a couple of file checks ourselves - if ! [ -e $pkg/opt/vc/bin/dtmerge ] ; then - echo "Oops, compilation failed!" - exit 1 - elif ! [ -e $pkg/opt/vc/bin/tvservice ]; then - echo "Oops, compilation failed!" - exit 1 - fi - - install -Dm 644 $srcdir/10-vchiq.rules $pkg/lib/udev/rules.d/10-vchiq.rules - install -Dm 755 $srcdir/rpi-userland.sh $pkg/etc/profile.d/rpi-userland.sh - - # restore the execinfo header to its original name - [ -e /include/execinfo.h.bak ] && mv /include/execinfo.h.bak /include/execinfo.h - - cp LICENCE $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -dbfe0e6bc50eeb745e66bbfdb5bc6f4774ed51d99f334a3604f73df997bf1a4be4ee8f3e703022f128640a28fac8b2cf7366ad563e07d2afdef67ea4de747f2c rpi-userland-20200603.tar.lz -" diff --git a/base/rpi-userland/rpi-userland.sh b/base/rpi-userland/rpi-userland.sh deleted file mode 100644 index c9f2ecd..0000000 --- a/base/rpi-userland/rpi-userland.sh +++ /dev/null @@ -1,2 +0,0 @@ -[ -d /opt/vc/bin ] && PATH=$PATH:/opt/vc/bin -export PATH diff --git a/base/ruby/ruby.SMBuild b/base/ruby/ruby.SMBuild index 4ad83f1..3fe2528 100755 --- a/base/ruby/ruby.SMBuild +++ b/base/ruby/ruby.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-shared \ --enable-pthread \ --without-jemalloc \ diff --git a/base/rust/1.patch b/base/rust/0001-Fix-LLVM-build.patch similarity index 100% rename from base/rust/1.patch rename to base/rust/0001-Fix-LLVM-build.patch diff --git a/base/rust/2.patch b/base/rust/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch similarity index 89% rename from base/rust/2.patch rename to base/rust/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch index c156945..1759147 100644 --- a/base/rust/2.patch +++ b/base/rust/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch @@ -17,14 +17,14 @@ extended by various void contributors to match our musl setup 9 files changed, 3 insertions(+), 181 deletions(-) diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs -index 52ac3622e..f35e5b9d8 100644 +index c126390f5..7aef73d3b 100644 --- a/compiler/rustc_target/src/spec/crt_objects.rs +++ b/compiler/rustc_target/src/spec/crt_objects.rs @@ -63,28 +63,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects { ]) } --pub(super) fn pre_musl_fallback() -> CrtObjects { +-pub(super) fn pre_musl_self_contained() -> CrtObjects { - new(&[ - (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]), - (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]), @@ -35,7 +35,7 @@ index 52ac3622e..f35e5b9d8 100644 - ]) -} - --pub(super) fn post_musl_fallback() -> CrtObjects { +-pub(super) fn post_musl_self_contained() -> CrtObjects { - new(&[ - (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]), - (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]), @@ -46,24 +46,24 @@ index 52ac3622e..f35e5b9d8 100644 - ]) -} - - pub(super) fn pre_mingw_fallback() -> CrtObjects { + pub(super) fn pre_mingw_self_contained() -> CrtObjects { new(&[ (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]), diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs -index 207a87ab0..88f807a58 100644 +index 61553e71b..88f807a58 100644 --- a/compiler/rustc_target/src/spec/linux_musl_base.rs +++ b/compiler/rustc_target/src/spec/linux_musl_base.rs @@ -1,16 +1,9 @@ --use crate::spec::crt_objects::{self, CrtObjectsFallback}; +-use crate::spec::crt_objects::{self, LinkSelfContainedDefault}; use crate::spec::TargetOptions; pub fn opts() -> TargetOptions { let mut base = super::linux_base::opts(); base.env = "musl".into(); -- base.pre_link_objects_fallback = crt_objects::pre_musl_fallback(); -- base.post_link_objects_fallback = crt_objects::post_musl_fallback(); -- base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); +- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained(); +- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained(); +- base.link_self_contained = LinkSelfContainedDefault::Musl; - - // These targets statically link libc by default - base.crt_static_default = true; @@ -71,11 +71,11 @@ index 207a87ab0..88f807a58 100644 base } diff --git a/config.toml.example b/config.toml.example -index b3284050f..62ac07f87 100644 +index ca54cbd2d..beec9bb04 100644 --- a/config.toml.example +++ b/config.toml.example -@@ -523,14 +523,6 @@ changelog-seen = 2 - # supplementary build information, like distro-specific package versions. +@@ -540,14 +540,6 @@ changelog-seen = 2 + # behavior -- this may lead to miscompilations or other bugs. #description = (string) -# The root location of the musl installation directory. The library directory @@ -90,10 +90,10 @@ index b3284050f..62ac07f87 100644 # platforms to ensure that the compiler is usable by default from the build # directory (as it links to a number of dynamic libraries). This may not be diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs -index dca782c29..8eb35ea43 100644 +index 7128d542a..668245f3c 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs -@@ -97,7 +97,7 @@ pub fn find(build: &mut Build) { +@@ -101,7 +101,7 @@ pub fn find(build: &mut Build) { if let Some(cc) = config.and_then(|c| c.cc.as_ref()) { cfg.compiler(cc); } else { @@ -102,7 +102,7 @@ index dca782c29..8eb35ea43 100644 } let compiler = cfg.get_compiler(); -@@ -125,7 +125,7 @@ pub fn find(build: &mut Build) { +@@ -122,7 +122,7 @@ pub fn find(build: &mut Build) { cfg.compiler(cxx); true } else if build.hosts.contains(&target) || build.build == target { @@ -111,7 +111,7 @@ index dca782c29..8eb35ea43 100644 true } else { // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars). -@@ -161,7 +161,6 @@ fn set_compiler( +@@ -158,7 +158,6 @@ fn set_compiler( compiler: Language, target: TargetSelection, config: Option<&Target>, @@ -119,7 +119,7 @@ index dca782c29..8eb35ea43 100644 ) { match &*target.triple { // When compiling for android we may have the NDK configured in the -@@ -204,26 +203,6 @@ fn set_compiler( +@@ -194,26 +193,6 @@ fn set_compiler( } } @@ -147,10 +147,10 @@ index dca782c29..8eb35ea43 100644 } } diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index b4807d1ab..ce483bf6b 100644 +index 0deed3f99..0bddac5d1 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -200,39 +200,7 @@ fn copy_self_contained_objects( +@@ -228,39 +228,7 @@ fn copy_self_contained_objects( let mut target_deps = vec![]; // Copies the libc and CRT objects. @@ -191,7 +191,7 @@ index b4807d1ab..ce483bf6b 100644 let srcdir = builder .wasi_root(target) .unwrap_or_else(|| { -@@ -316,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car +@@ -344,15 +312,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car .arg("--manifest-path") .arg(builder.src.join("library/test/Cargo.toml")); @@ -208,10 +208,10 @@ index b4807d1ab..ce483bf6b 100644 if let Some(p) = builder.wasi_root(target) { let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap()); diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index 146077419..18a764689 100644 +index d8c15c76e..53f95e49b 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -186,7 +186,6 @@ pub struct Config { +@@ -200,7 +200,6 @@ pub struct Config { pub missing_tools: bool, // Fallback musl-root for all targets @@ -219,7 +219,7 @@ index 146077419..18a764689 100644 pub prefix: Option, pub sysconfdir: Option, pub datadir: Option, -@@ -400,8 +399,6 @@ pub struct Target { +@@ -440,8 +439,6 @@ pub struct Target { pub sanitizers: Option, pub profiler: Option, pub crt_static: Option, @@ -228,7 +228,7 @@ index 146077419..18a764689 100644 pub wasi_root: Option, pub qemu_rootfs: Option, pub no_std: bool, -@@ -689,7 +686,6 @@ define_config! { +@@ -734,7 +731,6 @@ define_config! { default_linker: Option = "default-linker", channel: Option = "channel", description: Option = "description", @@ -236,7 +236,7 @@ index 146077419..18a764689 100644 rpath: Option = "rpath", verbose_tests: Option = "verbose-tests", optimize_tests: Option = "optimize-tests", -@@ -734,8 +730,6 @@ define_config! { +@@ -781,8 +777,6 @@ define_config! { sanitizers: Option = "sanitizers", profiler: Option = "profiler", crt_static: Option = "crt-static", @@ -245,7 +245,7 @@ index 146077419..18a764689 100644 wasi_root: Option = "wasi-root", qemu_rootfs: Option = "qemu-rootfs", no_std: Option = "no-std", -@@ -1107,7 +1101,6 @@ impl Config { +@@ -1187,7 +1181,6 @@ impl Config { set(&mut config.llvm_tools_enabled, rust.llvm_tools); config.rustc_parallel = rust.parallel_compiler.unwrap_or(false); config.rustc_default_linker = rust.default_linker; @@ -253,7 +253,7 @@ index 146077419..18a764689 100644 config.save_toolstates = rust.save_toolstates.map(PathBuf::from); set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings)); set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); -@@ -1164,8 +1157,6 @@ impl Config { +@@ -1251,8 +1244,6 @@ impl Config { target.ranlib = cfg.ranlib.map(PathBuf::from); target.linker = cfg.linker.map(PathBuf::from); target.crt_static = cfg.crt_static; @@ -263,10 +263,10 @@ index 146077419..18a764689 100644 target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from); target.sanitizers = cfg.sanitizers; diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py -index 2fc036082..91737e0ea 100755 +index 6b139decb..a2e19b8f4 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py -@@ -114,34 +114,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", +@@ -112,34 +112,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", "aarch64-linux-android NDK standalone path") v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk", "x86_64-linux-android NDK standalone path") @@ -302,10 +302,10 @@ index 2fc036082..91737e0ea 100755 "rootfs in qemu testing, you probably don't want to use this") v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index b603ae90a..0a7012dbd 100644 +index 3ed534523..c7c7a75f0 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -1153,25 +1153,6 @@ impl Build { +@@ -1181,25 +1181,6 @@ impl Build { } } @@ -332,7 +332,7 @@ index b603ae90a..0a7012dbd 100644 fn wasi_root(&self, target: TargetSelection) -> Option<&Path> { self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p) diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index 64c5dd7ae..b8f9104ea 100644 +index 8a40b0f64..59e11d304 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs @@ -11,7 +11,6 @@ @@ -343,7 +343,7 @@ index 64c5dd7ae..b8f9104ea 100644 use std::path::PathBuf; use std::process::Command; -@@ -190,28 +189,6 @@ than building it. +@@ -205,28 +204,6 @@ than building it. } } @@ -369,9 +369,6 @@ index 64c5dd7ae..b8f9104ea 100644 - } - } - - if need_cmake && target.contains("msvc") { - // There are three builds of cmake on windows: MSVC, MinGW, and - // Cygwin. The Cygwin build does not have generators for Visual --- -2.37.2 - + // Some environments don't want or need these tools, such as when testing Miri. + // FIXME: it would be better to refactor this code to split necessary setup from pure sanity + // checks, and have a regular flag for skipping the latter. Also see diff --git a/base/rust/0003-move-debugger-scripts-to-usr-share-rust.patch b/base/rust/0003-move-debugger-scripts-to-usr-share-rust.patch new file mode 100644 index 0000000..bc70538 --- /dev/null +++ b/base/rust/0003-move-debugger-scripts-to-usr-share-rust.patch @@ -0,0 +1,69 @@ +From 8938b002edbec432be46de7b6f1b9d0a6912873a Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Mon, 20 Dec 2021 00:45:35 +0100 +Subject: [PATCH 03/15] move debugger scripts to /usr/share/rust + +--- + src/bootstrap/dist.rs | 2 +- + src/etc/rust-gdb | 2 +- + src/etc/rust-gdbgui | 2 +- + src/etc/rust-lldb | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index b1fae356d..e7a077134 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -460,7 +460,7 @@ impl Step for DebuggerScripts { + fn run(self, builder: &Builder<'_>) { + let host = self.host; + let sysroot = self.sysroot; +- let dst = sysroot.join("lib/rustlib/etc"); ++ let dst = sysroot.join("share/rust"); + t!(fs::create_dir_all(&dst)); + let cp_debugger_script = |file: &str| { + builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644); +diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb +index b950cea79..559bfe3f1 100755 +--- a/src/etc/rust-gdb ++++ b/src/etc/rust-gdb +@@ -12,7 +12,7 @@ fi + + # Find out where the pretty printer Python module is + RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" +-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust" + + # Run GDB with the additional arguments that load the pretty printers + # Set the environment variable `RUST_GDB` to overwrite the call to a +diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui +index 9744913b6..8722acdcc 100755 +--- a/src/etc/rust-gdbgui ++++ b/src/etc/rust-gdbgui +@@ -41,7 +41,7 @@ fi + + # Find out where the pretty printer Python module is + RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" +-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" ++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust" + + # Set the environment variable `RUST_GDB` to overwrite the call to a + # different/specific command (defaults to `gdb`). +diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb +index bce72f1ba..8abb01245 100755 +--- a/src/etc/rust-lldb ++++ b/src/etc/rust-lldb +@@ -30,8 +30,8 @@ EOF + fi + fi + +-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\"" +-commands_file="$RUSTC_SYSROOT/lib/rustlib/etc/lldb_commands" ++script_import="command script import \"$RUSTC_SYSROOT/share/rust/lldb_lookup.py\"" ++commands_file="$RUSTC_SYSROOT/share/rust/lldb_commands" + + # Call LLDB with the commands added to the argument list + exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@" +-- +2.37.2 + diff --git a/base/rust/4.patch b/base/rust/0005-do-not-install-libunwind-source-removed.patch similarity index 100% rename from base/rust/4.patch rename to base/rust/0005-do-not-install-libunwind-source-removed.patch diff --git a/base/rust/5.patch b/base/rust/0007-link-stage-2-tools-dynamically-to-libstd.patch similarity index 100% rename from base/rust/5.patch rename to base/rust/0007-link-stage-2-tools-dynamically-to-libstd.patch diff --git a/base/rust/6.patch b/base/rust/0009-do-not-export-LD_LIBRARY_PATH.patch similarity index 100% rename from base/rust/6.patch rename to base/rust/0009-do-not-export-LD_LIBRARY_PATH.patch diff --git a/base/rust/7.patch b/base/rust/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch similarity index 100% rename from base/rust/7.patch rename to base/rust/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch diff --git a/base/rust/8.patch b/base/rust/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch similarity index 100% rename from base/rust/8.patch rename to base/rust/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch diff --git a/base/rust/3.patch b/base/rust/3.patch deleted file mode 100644 index 2ca7ffe..0000000 --- a/base/rust/3.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d7d7fc24d1744a3db70a9fb010c31daa14a46df7 Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Mon, 20 Dec 2021 00:55:18 +0100 -Subject: [PATCH 04/15] fix shebang on install-template.sh - ---- - src/tools/rust-installer/install-template.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh -index e68be8911..beaa90f7b 100644 ---- a/src/tools/rust-installer/install-template.sh -+++ b/src/tools/rust-installer/install-template.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # Copyright 2014 The Rust Project Developers. See the COPYRIGHT - # file at the top-level directory of this distribution and at - # http://rust-lang.org/COPYRIGHT. --- -2.37.2 - diff --git a/base/rust/config.toml b/base/rust/config.toml index dcba060..0d7432e 100644 --- a/base/rust/config.toml +++ b/base/rust/config.toml @@ -17,8 +17,8 @@ docs = false [install] prefix = "/" -libdir = "lib" -mandir = "share/man" +libdir = "/lib" +mandir = "/share/man" [rust] codegen-units = 0 diff --git a/base/rust/links b/base/rust/links new file mode 100644 index 0000000..522effc --- /dev/null +++ b/base/rust/links @@ -0,0 +1 @@ +https://dev-static.rust-lang.org/dist/2023-04-17/rust-1.69.0-aarch64-unknown-linux-musl.tar.xz diff --git a/base/rust/rust.SMBuild b/base/rust/rust.SMBuild index e25612f..7a37c9f 100755 --- a/base/rust/rust.SMBuild +++ b/base/rust/rust.SMBuild @@ -1,6 +1,6 @@ # Maintainer: PktSurf app=rust -version=1.64.0 +version=1.69.0 build=1sml homepage="https://rust-lang.org" download="https://static.rust-lang.org/dist/rustc-$version-src.tar.xz" @@ -10,6 +10,8 @@ requires="gcc-libs bash llvm clang gdb" preservestaticlibs=1 prepbuilddir() { + arch="$HOSTTYPE" + export arch mkandenterbuilddir rm -rf rustc-$version-src @@ -24,7 +26,7 @@ prepbuilddir() { cd temp-toolchain # Extract the toolchain into it - tar xf $srcdir/$app-$version-$arch-unknown-linux-musl.tar.gz + tar xf $srcdir/$app-$version-$arch-unknown-linux-musl.tar.?z cd $app-$version-$arch-unknown-linux-musl # Now install the toolchain @@ -34,14 +36,14 @@ prepbuilddir() { cd ../../ fi - applypatch $srcdir/1.patch - applypatch $srcdir/2.patch - applypatch $srcdir/3.patch - applypatch $srcdir/4.patch - applypatch $srcdir/5.patch - applypatch $srcdir/6.patch - applypatch $srcdir/7.patch - applypatch $srcdir/8.patch + applypatch $srcdir/0001-Fix-LLVM-build.patch + applypatch $srcdir/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch + applypatch $srcdir/0003-move-debugger-scripts-to-usr-share-rust.patch + applypatch $srcdir/0005-do-not-install-libunwind-source-removed.patch + applypatch $srcdir/0007-link-stage-2-tools-dynamically-to-libstd.patch + applypatch $srcdir/0009-do-not-export-LD_LIBRARY_PATH.patch + applypatch $srcdir/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch + applypatch $srcdir/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch clear_vendor_checksums() { sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json @@ -56,9 +58,9 @@ prepbuilddir() { cp $srcdir/config.toml . - if [ "$arch" = "aarch64" ] ; then + if [[ $arch = aarch64 ]] ; then sed -i 's@ARCH@aarch64@g' config.toml - elif [ "$arch" = "x86_64" ] ; then + elif [[ $arch = x86_64 ]] ; then sed -i 's@ARCH@x86_64@g' config.toml fi } @@ -75,7 +77,7 @@ build() { find $pkg/lib -name "*.so" -exec chmod 755 "{}" \+ - if [ -x /bin/rustc ] && [ -d temp-toolchain ]; then + if [[ -x /bin/rustc ]] && [[ -d temp-toolchain ]]; then # Remove the temporary toolchain cd temp-toolchain/$app-$version-$arch-unknown-linux-musl ./install.sh --uninstall --prefix="/" @@ -85,15 +87,15 @@ build() { } sha512sums=" -6276b72762a833c992326cb4f2fc09c55f621af1dccc793d0eb75840bc4b408697e95fa8140f0459514cfa7fdfbaa30e433c93f0475a790ff6170af6e8e696a3 rust-1.64.0-aarch64-unknown-linux-musl.tar.gz -5c1e2ec6060559970862384152d37a52ce5a81296506db7158945fc253d102550dfad49488bd8fc00dccd86c1ab06057046917eed1b11c21fbc3e7aca0bf57f8 rust-1.64.0-x86_64-unknown-linux-musl.tar.gz -6d1cc90bb73468b6f3118bc8f2c1177dd424fd8ebc27dcb9b61d14a14fa7b5fdec3d109a51ab725c5cfc2119f994a668b0ffd4d3bc7491928d3b7ba07f3e610a rustc-1.64.0-src.tar.lz -e4683f00c6c273dfd915bd4a3aa3e00ceb37633f8869f29faccee93b2e40def1b9733b67e1e57a632cc6aaf069fe36297109ab708122bffc432cfd34560854bb 1.patch -5b77f8b5505e7d1bc8225f8bde5fdfd67680fcb5e9774e77fc1842ca32c1042fe8e59e329fccc556e3805db3c0768c273fa17fc0446750503d4be53e92db8b71 2.patch -7309d2add788061f83e0e11a4cfa1433bcbbab4dc11584ae865c0fce36b9a97f5f553bcf6d4f8933e2734869b3c95edbe62950e5fe622165b922301187c31c50 3.patch -47dd902d06e10f39648e73098b01c5db7ff3f842c449e1b5bff5a403f75d6295144875e4b27af38746441e093906494e990da0242a6a8d245e7d83973bba62cd 4.patch -0b07980a5172178ae9249eb1ff3afe3ca62065049763eef14a8404d3c0c02a539f4b0f3c38eca07f631e9bafc4252da8241e0d0223e54213ac27573bb2ddc1c9 5.patch -bae78b62536a13d7ab3396bd69d162013a863ff86dee0e6be8d0b4d18dc5812812e15ac208b6ce5ceb5d71482e70befe13589cb92361daac49f718226bc3480f 6.patch -a38344aa316e4d459e4887b1f0bdfd7378930b3cc1209b36fdf8f4196352f5e7499c1ff03223d23567089e0485968cbc688ec82640ce34d4a3ff9240b4948074 7.patch -3c7e7cb9a3a1b483455096e31c071a746207e638dd9e7d6445c0a128d003a35fdfe974c5978e0fcefe3e7a2a13c8cc351b2c809d8b026ad7116a69a68285e02f 8.patch +c5ee5bba97b48e1a5d313d88eed8df8f492b4a8b962b91516cb883af16d359150db6727f01dcc933d19e8bba0cb75a2015a09cb26d4d03afd54c13a52d454003 rust-1.69.0-aarch64-unknown-linux-musl.tar.xz +8879f9031a98169880433c18f71ec08ea1770e59e27279b0d96dcf8aafa67594b2c50f322a5d9b5eb766d6b4da00c969111142e9d4ddd000daf4b3b2ac0b848a rust-1.69.0-x86_64-unknown-linux-musl.tar.xz +724398fc208ec18adbd8ba81a445e23d1001b746990f36b869126be8a45f1cdfa75f5b9cbdd0abbab506f91a56d3736ab247677699ebd69525245558cfc01a60 rustc-1.69.0-src.tar.xz +e4683f00c6c273dfd915bd4a3aa3e00ceb37633f8869f29faccee93b2e40def1b9733b67e1e57a632cc6aaf069fe36297109ab708122bffc432cfd34560854bb 0001-Fix-LLVM-build.patch +7658be28ad7543863a2e6599cf1553854efc5796edfd3f630ea491376e141f27f0d2bc005ca1c23534b8d12d40dcfa0d2de3a3b729f6bcefd90b1dd54618730c 0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch +efe1db25508e469379be6b6eef9328e3f7becc48f42451df9e54ea915c1f5dbf5e03524d0acc7aa2720f9f073325bd43b143c441e8900b4dd5b027c030346139 0003-move-debugger-scripts-to-usr-share-rust.patch +47dd902d06e10f39648e73098b01c5db7ff3f842c449e1b5bff5a403f75d6295144875e4b27af38746441e093906494e990da0242a6a8d245e7d83973bba62cd 0005-do-not-install-libunwind-source-removed.patch +0b07980a5172178ae9249eb1ff3afe3ca62065049763eef14a8404d3c0c02a539f4b0f3c38eca07f631e9bafc4252da8241e0d0223e54213ac27573bb2ddc1c9 0007-link-stage-2-tools-dynamically-to-libstd.patch +bae78b62536a13d7ab3396bd69d162013a863ff86dee0e6be8d0b4d18dc5812812e15ac208b6ce5ceb5d71482e70befe13589cb92361daac49f718226bc3480f 0009-do-not-export-LD_LIBRARY_PATH.patch +a38344aa316e4d459e4887b1f0bdfd7378930b3cc1209b36fdf8f4196352f5e7499c1ff03223d23567089e0485968cbc688ec82640ce34d4a3ff9240b4948074 0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch +3c7e7cb9a3a1b483455096e31c071a746207e638dd9e7d6445c0a128d003a35fdfe974c5978e0fcefe3e7a2a13c8cc351b2c809d8b026ad7116a69a68285e02f 0013-allow-specifying-native-sysroot-to-use-for-linkage.patch " diff --git a/base/sbc/sbc.SMBuild b/base/sbc/sbc.SMBuild index 6362ec6..de5893a 100755 --- a/base/sbc/sbc.SMBuild +++ b/base/sbc/sbc.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --disable-tester diff --git a/base/sccache/sccache.SMBuild b/base/sccache/sccache.SMBuild deleted file mode 100755 index cfff3d5..0000000 --- a/base/sccache/sccache.SMBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: PktSurf -app=sccache -version=0.3.3 -build=1sml -homepage="https://github.com/mozilla/sccache" -download="https://github.com/mozilla/sccache/archive/refs/tags/v$version.tar.gz" -desc="Compile caching tool like ccache which can also cache rust objects" -requires="rust" - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions -} - -build() { - cargo build \ - --release --frozen \ - --manifest-path Cargo.toml \ - --features native-zlib - - install -Dm 755 target/release/$app "$pkg/bin/$app" - cp LICENSE $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -d8431cd99d657c749437fe5816dce7c416ef5c93bd7a75d020c7ab77593e87b9c4600d3c3d338cd1e6fc5cd3e7fe1b236eb073f90f73e2ea4a649d1a9ffab53e sccache-0.3.3.tar.lz -" diff --git a/base/scons/scons.SMBuild b/base/scons/scons.SMBuild index 46042b1..e37ddcb 100755 --- a/base/scons/scons.SMBuild +++ b/base/scons/scons.SMBuild @@ -6,6 +6,7 @@ homepage="http://www.scons.org/" download="https://sourceforge.net/projects/scons/files/scons/$version/scons-$version.tar.gz" desc="A software construction tool based on python" requires="python3" +ignoreusr=1 prepbuilddir() { mkandenterbuilddir @@ -18,11 +19,11 @@ prepbuilddir() { build() { python3 setup.py build - python3 setup.py install --prefix="" --root=$pkg + python3 setup.py install --root=$pkg mkdir -p $pkg/share/man - mv $pkg/man/man1 $pkg/share/man/ - rm -rf $pkg/man + mv $pkg/usr/man/man1/* $pkg/share/man/ + rm -r $pkg/usr/man cp LICENSE.txt $pkgdocs/ diff --git a/base/sed/sed.SMBuild b/base/sed/sed.SMBuild index 437f499..9de751b 100755 --- a/base/sed/sed.SMBuild +++ b/base/sed/sed.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/shellcheck-bin/shellcheck-bin.SMBuild b/base/shellcheck-bin/shellcheck-bin.SMBuild index 23f289e..447e07e 100755 --- a/base/shellcheck-bin/shellcheck-bin.SMBuild +++ b/base/shellcheck-bin/shellcheck-bin.SMBuild @@ -26,4 +26,4 @@ build() { sha512sums=" d5469f50489884b766b0ad684f6b33fa54683660241428684fb9e561c862f2904427ddb53fdcaec75cb2e520612fa1450aa1eb21a3e575b6cd1c2fdf6d672be6 shellcheck-bins-0.8.0.tar.lz -" \ No newline at end of file +" diff --git a/base/smartmontools/smartmontools.SMBuild b/base/smartmontools/smartmontools.SMBuild index 3a65e34..f65b8d2 100755 --- a/base/smartmontools/smartmontools.SMBuild +++ b/base/smartmontools/smartmontools.SMBuild @@ -18,10 +18,9 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sysconfdir=/etc \ --sbindir=/bin \ - --docdir="/share/doc/$app-$version" \ --with-initscriptdir=no make diff --git a/base/soxr/soxr.SMBuild b/base/soxr/soxr.SMBuild index cb205f0..f261634 100755 --- a/base/soxr/soxr.SMBuild +++ b/base/soxr/soxr.SMBuild @@ -20,7 +20,7 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DBUILD_EXAMPLES='OFF' \ -DBUILD_TESTS='OFF' \ -DDOC_INSTALL_DIR="/share/doc/$app-$version" \ diff --git a/base/speexdsp/speexdsp.SMBuild b/base/speexdsp/speexdsp.SMBuild index db45728..c4d6557 100755 --- a/base/speexdsp/speexdsp.SMBuild +++ b/base/speexdsp/speexdsp.SMBuild @@ -17,8 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/sqlite/sqlite.SMBuild b/base/sqlite/sqlite.SMBuild index 8a657ed..81f26c9 100755 --- a/base/sqlite/sqlite.SMBuild +++ b/base/sqlite/sqlite.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=sqlite -version=3320100 -build=2sml +version=3420000 +build=1sml homepage="https://www.sqlite.org/" download="https://www.sqlite.org/2020/sqlite-autoconf-$version.tar.gz" desc="Simple, self contained database engine" @@ -18,10 +18,10 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static - make -j1 + make make install DESTDIR=$pkg cp tea/license.terms $pkgdocs/ @@ -30,5 +30,5 @@ build() { } sha512sums=" -12b463c0749403b22c160ebbea2e41434968167b9e0f95d1772b2043d791130c7a73726f8be68f8a1760e0c94b8f5b0ca6666b9de90e9ad7ae4446c33c7c4776 sqlite-autoconf-3320100.tar.lz +1450ee59f157b8774c7650c4b4f6cd01c6d2e736c9732260df0c0aafd9adc686b7d37ccffbf296fe7ba6ef6feba8eaa2dfe3c7b8e682f35c2a92a1310411a0f8 sqlite-autoconf-3420000.tar.lz " diff --git a/base/strace/strace.SMBuild b/base/strace/strace.SMBuild index 30c76de..099344f 100755 --- a/base/strace/strace.SMBuild +++ b/base/strace/strace.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --enable-mpers=no make diff --git a/base/swig/swig.SMBuild b/base/swig/swig.SMBuild index c6aafee..f5dedb4 100755 --- a/base/swig/swig.SMBuild +++ b/base/swig/swig.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/sysfsutils/sysfsutils.SMBuild b/base/sysfsutils/sysfsutils.SMBuild index cd61b45..c4b033e 100755 --- a/base/sysfsutils/sysfsutils.SMBuild +++ b/base/sysfsutils/sysfsutils.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --mandir=/share/man \ --disable-static \ $builddist diff --git a/base/syslinux/syslinux.SMBuild b/base/syslinux/syslinux.SMBuild index 58b1b52..07c2dae 100755 --- a/base/syslinux/syslinux.SMBuild +++ b/base/syslinux/syslinux.SMBuild @@ -5,9 +5,9 @@ build=1sml homepage="https://wiki.syslinux.org/wiki/index.php?title=The_Syslinux_Project" desc="Boot loader for the linux operating system which boots off of MS-DOS Windows FAT filesystem" requires="musl" +apparch="x86_64" prepbuilddir() { - compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version diff --git a/base/tar/tar.SMBuild b/base/tar/tar.SMBuild index ce785f0..8e3ae72 100755 --- a/base/tar/tar.SMBuild +++ b/base/tar/tar.SMBuild @@ -24,7 +24,7 @@ build() { FORCE_UNSAFE_CONFIGURE=1 \ LDFLAGS="-static" \ ./configure \ - --prefix="" \ + --prefix= \ --sbindir=/bin \ --libexecdir=/lib \ --enable-backup-scripts diff --git a/base/tarlz/tarlz.SMBuild b/base/tarlz/tarlz.SMBuild index 7fd61d1..ec009ca 100755 --- a/base/tarlz/tarlz.SMBuild +++ b/base/tarlz/tarlz.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ CXXFLAGS="$CXXFLAGS" \ make diff --git a/base/texinfo/texinfo.SMBuild b/base/texinfo/texinfo.SMBuild index d16480a..83ac6de 100755 --- a/base/texinfo/texinfo.SMBuild +++ b/base/texinfo/texinfo.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/time/time.SMBuild b/base/time/time.SMBuild index 768aa5f..efec835 100755 --- a/base/time/time.SMBuild +++ b/base/time/time.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/toluapp/toluapp.SMBuild b/base/toluapp/toluapp.SMBuild index 553ae41..f10f05f 100755 --- a/base/toluapp/toluapp.SMBuild +++ b/base/toluapp/toluapp.SMBuild @@ -19,15 +19,12 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ - -DCMAKE_INSTALL_PREFIX="" \ - -DCMAKE_BUILD_TYPE=Release \ - -DINSTALL_DOC="/share/doc/$app-$version" + -DCMAKE_INSTALL_PREFIX= \ + -DCMAKE_BUILD_TYPE=Release make make install DESTDIR=$pkg - rm -r $pkg/share/$app - cp ../README* $pkgdocs/ mkfinalpkg diff --git a/base/twolame/twolame.SMBuild b/base/twolame/twolame.SMBuild index 7059da3..6ec48a4 100755 --- a/base/twolame/twolame.SMBuild +++ b/base/twolame/twolame.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ - --docdir="/share/doc/$app-$version" \ + --prefix= \ --disable-static make diff --git a/base/unzip/unzip.SMBuild b/base/unzip/unzip.SMBuild index 8383469..dae5df2 100755 --- a/base/unzip/unzip.SMBuild +++ b/base/unzip/unzip.SMBuild @@ -22,7 +22,7 @@ build() { CC="$CC" STRIP=true LF2= sed -i 's@-DNO_LCHMOD@@' flags - sed -i 's@-O3@''@' flags + sed -i "s@-O3@$CFLAGS@" flags make -f unix/Makefile generic diff --git a/base/usbutils/usbutils.SMBuild b/base/usbutils/usbutils.SMBuild index 826fa80..5907d0e 100755 --- a/base/usbutils/usbutils.SMBuild +++ b/base/usbutils/usbutils.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --sysconfdir=/etc \ --sbindir=/bin \ --datadir=/share/hwdata diff --git a/base/util-linux/util-linux.SMBuild b/base/util-linux/util-linux.SMBuild index 8709ad1..125d44e 100755 --- a/base/util-linux/util-linux.SMBuild +++ b/base/util-linux/util-linux.SMBuild @@ -24,7 +24,7 @@ build() { CFLAGS="$CFLAGS -include sys/sysmacros.h" \ LDFLAGS="-lcurses -lterminfo" \ ./configure \ - --prefix="" --sbindir=/bin --libdir=/lib \ + --prefix= --bindir=/bin --sbindir=/bin --libdir=/lib \ --includedir=/include \ --disable-fsck\ --enable-libmount-support-mtab \ diff --git a/base/wavpack/wavpack.SMBuild b/base/wavpack/wavpack.SMBuild index 48db692..f905c45 100755 --- a/base/wavpack/wavpack.SMBuild +++ b/base/wavpack/wavpack.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static make diff --git a/base/wayland-protocols/wayland-protocols.SMBuild b/base/wayland-protocols/wayland-protocols.SMBuild index 2b9bc56..d7d86da 100755 --- a/base/wayland-protocols/wayland-protocols.SMBuild +++ b/base/wayland-protocols/wayland-protocols.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild meson .. \ - --prefix="/" + --prefix=/ ninja DESTDIR=$pkg ninja install diff --git a/base/wayland/wayland.SMBuild b/base/wayland/wayland.SMBuild index e13f7de..a362b39 100755 --- a/base/wayland/wayland.SMBuild +++ b/base/wayland/wayland.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --disable-static \ --disable-documentation diff --git a/base/which/which.SMBuild b/base/which/which.SMBuild index 694e244..c95f371 100755 --- a/base/which/which.SMBuild +++ b/base/which/which.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/woff2/woff2.SMBuild b/base/woff2/woff2.SMBuild index c57bee2..1a83ac1 100755 --- a/base/woff2/woff2.SMBuild +++ b/base/woff2/woff2.SMBuild @@ -20,7 +20,7 @@ build() { sed -i "s/NOT BUILD_SHARED_LIBS/TRUE/" CMakeLists.txt mkdir -p smbuild && cd smbuild cmake .. -GNinja \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR=lib DESTDIR="$pkg" ninja install diff --git a/base/x264/x264.SMBuild b/base/x264/x264.SMBuild index fcccf05..dfdb6b5 100755 --- a/base/x264/x264.SMBuild +++ b/base/x264/x264.SMBuild @@ -21,7 +21,7 @@ build() { unset CFLAGS CXXFLAGS ./configure \ - --prefix="" \ + --prefix= \ --enable-shared make diff --git a/base/xmlto/xmlto.SMBuild b/base/xmlto/xmlto.SMBuild index c6ff069..84f3ac1 100755 --- a/base/xmlto/xmlto.SMBuild +++ b/base/xmlto/xmlto.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/xz/xz.SMBuild b/base/xz/xz.SMBuild index d161315..342998b 100755 --- a/base/xz/xz.SMBuild +++ b/base/xz/xz.SMBuild @@ -18,9 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix="" \ + --prefix= \ --bindir=/bin \ - --docdir="/share/doc/$app-$version" \ --enable-static \ --with-pic diff --git a/base/yasm/yasm.SMBuild b/base/yasm/yasm.SMBuild index 6379da1..fd418a9 100755 --- a/base/yasm/yasm.SMBuild +++ b/base/yasm/yasm.SMBuild @@ -18,13 +18,13 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= - make + sed -i 's@gnu99@gnu99 -fPIC@g' Makefile + + make make install DESTDIR=$pkg - rm -rv $pkg/lib - cp GNU* $pkgdocs/ mkfinalpkg diff --git a/base/zlib/zlib.SMBuild b/base/zlib/zlib.SMBuild index d80c7f7..fd3ebad 100755 --- a/base/zlib/zlib.SMBuild +++ b/base/zlib/zlib.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix="" + --prefix= make make install DESTDIR=$pkg diff --git a/base/zsh/zsh.SMBuild b/base/zsh/zsh.SMBuild index 1ffd2de..7f52cff 100755 --- a/base/zsh/zsh.SMBuild +++ b/base/zsh/zsh.SMBuild @@ -20,7 +20,7 @@ build() { sed -i '/autoheader/d' Makefile.in ./configure \ - --prefix="" \ + --prefix= \ --enable-libc-musl make diff --git a/base/zstd/zstd.SMBuild b/base/zstd/zstd.SMBuild index e6179b8..ebc90e5 100755 --- a/base/zstd/zstd.SMBuild +++ b/base/zstd/zstd.SMBuild @@ -20,7 +20,7 @@ build() { mkdir -p smbuild && cd smbuild cmake ../build/cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="" \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR="lib" \ -DZSTD_ZLIB_SUPPORT=ON \ -DZSTD_LZMA_SUPPORT=ON \