diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-03-17 14:38:26 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-03-17 14:41:37 +0100 |
| commit | 4f89a02f82a0111476c6a7a53b43ba348a4d67a4 (patch) | |
| tree | 224eb0248dbd78e931fae4dbc6345472f24e01e4 | |
| parent | 05c81c44232782a6a0e09746f3d29cee784fe604 (diff) | |
moved config.{sub,guess} regeneration out of patches
165 files changed, 298 insertions, 891 deletions
@@ -26,10 +26,9 @@ export CHOST=riscv64-unknown-linux-gnu export LINUX_ARCH=riscv export GCC_MARCH=rv64gc export GCC_MABI=lp64d -# no riscv32 support as of glibc-2.27 #export MULTILIB=enable -#export GCC_32_MARCH=rv32gc -#export GCC_32_MABI=ilp32d +#export GCC32_MARCH=rv32gc +#export GCC32_MABI=ilp32d #export CARCH32=riscv32 #export CHOST32=riscv32-linux-gnu diff --git a/src/stage2/patches/acl.patch b/src/stage2/patches/acl.patch index 71eb35e..b335e49 100644 --- a/src/stage2/patches/acl.patch +++ b/src/stage2/patches/acl.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-16 13:54:08.475632636 +0100 +++ b/PKGBUILD 2018-02-16 13:54:58.669516546 +0100 -@@ -21,7 +21,8 @@ build() { +@@ -21,7 +21,7 @@ build() { cd $pkgname-$pkgver export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib make } diff --git a/src/stage2/patches/argon2.patch b/src/stage2/patches/argon2.patch index 5de51c2..2e28029 100644 --- a/src/stage2/patches/argon2.patch +++ b/src/stage2/patches/argon2.patch @@ -4,7 +4,7 @@ build() { cd "$srcdir/phc-winner-$pkgname-$pkgver" -+ CC=@TARGET@-gcc AS=@TARGET@-as LD=@TARGET@-ld \ ++ CC=@CHOST@-gcc AS=@CHOST@-as LD=@CHOST@-ld \ make OPTTARGET=none } @@ -12,7 +12,7 @@ package() { cd "$srcdir/phc-winner-$pkgname-$pkgver" -+ CC=@TARGET@-gcc AS=@TARGET@-as LD=@TARGET@-ld \ ++ CC=@CHOST@-gcc AS=@CHOST@-as LD=@CHOST@-ld \ make OPTTARGET=none DESTDIR="$pkgdir" install install -D -m0644 LICENSE "${pkgdir}/usr/share/licenses/argon2/LICENSE" diff --git a/src/stage2/patches/attr.patch b/src/stage2/patches/attr.patch index fe072c1..344e550 100644 --- a/src/stage2/patches/attr.patch +++ b/src/stage2/patches/attr.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-16 13:50:22.989842726 +0100 +++ b/PKGBUILD 2018-02-16 13:52:17.694421922 +0100 -@@ -22,7 +22,8 @@ build() { +@@ -22,7 +22,7 @@ build() { cd $pkgname-$pkgver export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib make } diff --git a/src/stage2/patches/bash.patch b/src/stage2/patches/bash.patch index f2cde61..1399677 100644 --- a/src/stage2/patches/bash.patch +++ b/src/stage2/patches/bash.patch @@ -1,20 +1,11 @@ --- a/PKGBUILD 2018-02-18 22:28:52.553679169 +0100 +++ b/PKGBUILD 2018-02-18 22:34:00.404428869 +0100 -@@ -34,6 +34,8 @@ fi - prepare() { - cd $pkgname-$_basever - -+ @CONFIG_SUB@ > support/config.sub -+ - for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do - msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" - patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) @@ -50,7 +53,7 @@ build() { -DNON_INTERACTIVE_LOGIN_SHELLS) export CFLAGS="${CFLAGS} ${_bashconfig[@]}" - ./configure --prefix=/usr --with-curses --enable-readline \ -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --disable-rpath --prefix=/usr --with-curses --enable-readline \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --disable-rpath --prefix=/usr --with-curses --enable-readline \ --without-bash-malloc --with-installed-readline make } diff --git a/src/stage2/patches/binutils.patch b/src/stage2/patches/binutils.patch index 24f0f37..19ee5e6 100644 --- a/src/stage2/patches/binutils.patch +++ b/src/stage2/patches/binutils.patch @@ -24,7 +24,7 @@ cd binutils-build "$srcdir/binutils-$pkgver/configure" \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ --with-bugurl=https://bugs.archlinux.org/ \ diff --git a/src/stage2/patches/bison.patch b/src/stage2/patches/bison.patch index e346e50..deb583b 100644 --- a/src/stage2/patches/bison.patch +++ b/src/stage2/patches/bison.patch @@ -5,7 +5,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --datadir=/usr/share -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share make } diff --git a/src/stage2/patches/bzip2.patch b/src/stage2/patches/bzip2.patch index c57c9bb..076fa8a 100644 --- a/src/stage2/patches/bzip2.patch +++ b/src/stage2/patches/bzip2.patch @@ -6,8 +6,8 @@ - make -f Makefile-libbz2_so - make bzip2 bzip2recover -+ make CC=@TARGET@-gcc RANLIB=@TARGET@-ranlib AR=@TARGET@-ar -f Makefile-libbz2_so -+ make CC=@TARGET@-gcc RANLIB=@TARGET@-ranlib AR=@TARGET@-ar bzip2 bzip2recover ++ make CC=@CHOST@-gcc RANLIB=@CHOST@-ranlib AR=@CHOST@-ar -f Makefile-libbz2_so ++ make CC=@CHOST@-gcc RANLIB=@CHOST@-ranlib AR=@CHOST@-ar bzip2 bzip2recover } check() { diff --git a/src/stage2/patches/ca-certificates-mozilla.patch b/src/stage2/patches/ca-certificates-mozilla.patch deleted file mode 100644 index e69de29..0000000 --- a/src/stage2/patches/ca-certificates-mozilla.patch +++ /dev/null diff --git a/src/stage2/patches/coreutils.patch b/src/stage2/patches/coreutils.patch index 8e497f7..ba1be42 100644 --- a/src/stage2/patches/coreutils.patch +++ b/src/stage2/patches/coreutils.patch @@ -4,7 +4,7 @@ build() { cd $pkgname-$pkgver ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --libexecdir=/usr/lib \ --with-openssl \ diff --git a/src/stage2/patches/cracklib.patch b/src/stage2/patches/cracklib.patch index c82f367..9b54b24 100644 --- a/src/stage2/patches/cracklib.patch +++ b/src/stage2/patches/cracklib.patch @@ -5,7 +5,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sbindir=/usr/bin --without-python -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --sbindir=/usr/bin --without-python ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --sbindir=/usr/bin --without-python make } diff --git a/src/stage2/patches/cryptsetup.patch b/src/stage2/patches/cryptsetup.patch index 001145a..0494127 100644 --- a/src/stage2/patches/cryptsetup.patch +++ b/src/stage2/patches/cryptsetup.patch @@ -4,7 +4,7 @@ cd "${srcdir}"/$pkgname-${pkgver} ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --sbindir=/usr/bin \ --enable-libargon2 \ diff --git a/src/stage2/patches/curl.patch b/src/stage2/patches/curl.patch index d74ecd9..b23389b 100644 --- a/src/stage2/patches/curl.patch +++ b/src/stage2/patches/curl.patch @@ -13,7 +13,7 @@ cd "$pkgname-$pkgver" ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --mandir=/usr/share/man \ --disable-ldap \ diff --git a/src/stage2/patches/db.patch b/src/stage2/patches/db.patch index ebfc4ea..a9be064 100644 --- a/src/stage2/patches/db.patch +++ b/src/stage2/patches/db.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-20 09:13:34.498993143 +0100 +++ b/PKGBUILD 2018-02-20 09:14:30.307524138 +0100 -@@ -16,7 +16,8 @@ sha1sums=('fa3f8a41ad5101f43d08bc0efb624 +@@ -16,7 +16,7 @@ sha1sums=('fa3f8a41ad5101f43d08bc0efb624 build() { cd "${srcdir}"/$pkgname-${pkgver}/build_unix - ../dist/configure --prefix=/usr --enable-compat185 \ -+ @CONFIG_SUB@ > ../dist/config.sub -+ ../dist/configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --enable-compat185 \ ++ ../dist/configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --enable-compat185 \ --enable-shared --enable-static --enable-cxx --enable-dbm \ --enable-stl make LIBSO_LIBS=-lpthread diff --git a/src/stage2/patches/dbus.patch b/src/stage2/patches/dbus.patch index ba3d4cf..d516bda 100644 --- a/src/stage2/patches/dbus.patch +++ b/src/stage2/patches/dbus.patch @@ -4,7 +4,7 @@ build() { cd $pkgbase ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --disable-silent-rules --without-x --disable-xml-docs \ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \ --with-system-pid-file=/run/dbus/pid \ diff --git a/src/stage2/patches/device-mapper.patch b/src/stage2/patches/device-mapper.patch index de8fae1..229c789 100644 --- a/src/stage2/patches/device-mapper.patch +++ b/src/stage2/patches/device-mapper.patch @@ -1,19 +1,10 @@ --- a/PKGBUILD 2018-02-22 10:27:36.222401768 +0100 +++ b/PKGBUILD 2018-02-22 10:33:51.959185267 +0100 -@@ -27,6 +27,8 @@ sha256sums=('4025a23ec9b15c2cb7486d151c2 - prepare() { - cd LVM2.${pkgver} - -+ @CONFIG_SUB@ > autoconf/config.sub -+ - # remove install section from systemd units that are enabled by default - sed -i -e '/^\[Install\]$/,$d' \ - @@ -40,6 +43,7 @@ prepare() { build() { local CONFIGUREOPTS=( -+ --host=@TARGET@ --build=@BUILDHOST@ ++ --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc diff --git a/src/stage2/patches/diffutils.patch b/src/stage2/patches/diffutils.patch index 851c4fc..3afc11a 100644 --- a/src/stage2/patches/diffutils.patch +++ b/src/stage2/patches/diffutils.patch @@ -8,7 +8,7 @@ + cat > config.cache << EOF +gl_cv_func_getopt_gnu=yes +EOF -+ ./configure --cache-file=config.cache --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --cache-file=config.cache --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/e2fsprogs.patch b/src/stage2/patches/e2fsprogs.patch index 086658a..e9014f2 100644 --- a/src/stage2/patches/e2fsprogs.patch +++ b/src/stage2/patches/e2fsprogs.patch @@ -4,7 +4,7 @@ cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --with-root-prefix="" \ --libdir=/usr/lib \ diff --git a/src/stage2/patches/expat.patch b/src/stage2/patches/expat.patch index 4745e7b..9e7107f 100644 --- a/src/stage2/patches/expat.patch +++ b/src/stage2/patches/expat.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --disable-static ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --disable-static make } diff --git a/src/stage2/patches/fakeroot.patch b/src/stage2/patches/fakeroot.patch index ec1088a..3f34ba9 100644 --- a/src/stage2/patches/fakeroot.patch +++ b/src/stage2/patches/fakeroot.patch @@ -4,7 +4,7 @@ cd $pkgname-$pkgver ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --libdir=/usr/lib/libfakeroot \ --disable-static \ --with-ipc=sysv diff --git a/src/stage2/patches/file.patch b/src/stage2/patches/file.patch index 676ad49..8aeaf1b 100644 --- a/src/stage2/patches/file.patch +++ b/src/stage2/patches/file.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5 -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5 ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5 make } diff --git a/src/stage2/patches/findutils.patch b/src/stage2/patches/findutils.patch index 6961d2b..97cb4b3 100644 --- a/src/stage2/patches/findutils.patch +++ b/src/stage2/patches/findutils.patch @@ -5,7 +5,7 @@ sed -i '/^SUBDIRS/s/locate//' Makefile.in - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr # don't build locate, but the docs want a file in there. make -C locate dblocation.texi make diff --git a/src/stage2/patches/flex.patch b/src/stage2/patches/flex.patch index 63aab71..7b1f108 100644 --- a/src/stage2/patches/flex.patch +++ b/src/stage2/patches/flex.patch @@ -5,7 +5,7 @@ build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --disable-bootstrap --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --disable-bootstrap --prefix=/usr make } diff --git a/src/stage2/patches/gawk.patch b/src/stage2/patches/gawk.patch index 9e330fa..14476d8 100644 --- a/src/stage2/patches/gawk.patch +++ b/src/stage2/patches/gawk.patch @@ -5,7 +5,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --without-libsigsegv -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --without-libsigsegv ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --without-libsigsegv make } diff --git a/src/stage2/patches/gcc.patch b/src/stage2/patches/gcc.patch index eb5b7eb..8e5f443 100644 --- a/src/stage2/patches/gcc.patch +++ b/src/stage2/patches/gcc.patch @@ -50,7 +50,7 @@ + CXXFLAGS=${CXXFLAGS/-mabi=@GCC_MABI@} + + sed -i 's/gcc_cv_objdump/ac_cv_prog_OBJDUMP/' $srcdir/gcc/libcc1/configure -+ "$srcdir/gcc/configure" --host=@TARGET@ --build=@BUILDHOST@ --target=@TARGET@ --prefix=/usr \ ++ "$srcdir/gcc/configure" --host=@CHOST@ --build=@BUILDHOST@ --target=@CHOST@ --prefix=/usr \ + --with-arch=@GCC_MARCH@ --with-api=@GCC_MABI@ \ + --disable-bootstrap \ --libdir=/usr/lib \ diff --git a/src/stage2/patches/gdbm.patch b/src/stage2/patches/gdbm.patch index f93fc3b..a1bd9e6 100644 --- a/src/stage2/patches/gdbm.patch +++ b/src/stage2/patches/gdbm.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-20 11:31:12.032486635 +0100 +++ b/PKGBUILD 2018-02-20 11:33:05.293863592 +0100 -@@ -20,7 +20,8 @@ md5sums=('c2ddcb3897efa0f57484af2bd4f4f8 +@@ -20,7 +20,7 @@ md5sums=('c2ddcb3897efa0f57484af2bd4f4f8 build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-libgdbm-compat -+ @CONFIG_SUB@ > build-aux/config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --enable-libgdbm-compat ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --enable-libgdbm-compat make } diff --git a/src/stage2/patches/gettext.patch b/src/stage2/patches/gettext.patch index 6d62304..aeab6f7 100644 --- a/src/stage2/patches/gettext.patch +++ b/src/stage2/patches/gettext.patch @@ -5,7 +5,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/glib2.patch b/src/stage2/patches/glib2.patch index 05e40a8..ca4e630 100644 --- a/src/stage2/patches/glib2.patch +++ b/src/stage2/patches/glib2.patch @@ -18,7 +18,7 @@ +glib_cv_uscore=no +EOF ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --cache-file=config.cache \ --prefix=/usr \ --libdir=/usr/lib \ diff --git a/src/stage2/patches/glibc.patch b/src/stage2/patches/glibc.patch index 3ae1730..19fe4f0 100644 --- a/src/stage2/patches/glibc.patch +++ b/src/stage2/patches/glibc.patch @@ -27,7 +27,7 @@ local _configure_flags=( --prefix=/usr - --with-headers=/usr/include -+ --host=@TARGET@ --build=@BUILDHOST@ ++ --host=@CHOST@ --build=@BUILDHOST@ + --with-headers=@SYSROOT@/usr/include --with-bugurl=https://bugs.archlinux.org/ --enable-add-ons @@ -52,20 +52,20 @@ if check_option 'debug' n; then cd "$pkgdir" - strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ -+ @TARGET@-strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ ++ @CHOST@-strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ usr/lib/getconf/* - strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ -+ @TARGET@-strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ ++ @CHOST@-strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \ usr/lib/lib{resolv,rpcsvc,rt,util}.a \ - usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a + usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a || true - strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ -+ @TARGET@-strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ ++ @CHOST@-strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ usr/lib/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \ usr/lib/lib{memusage,pcprofile,SegFault}.so \ @@ -75,12 +75,12 @@ cd $pkgdir - strip $STRIP_BINARIES usr/lib32/getconf/* - strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ -+ @TARGET@-strip $STRIP_BINARIES usr/lib32/getconf/* -+ @TARGET@-strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ ++ @CHOST@-strip $STRIP_BINARIES usr/lib32/getconf/* ++ @CHOST@-strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ usr/lib32/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \ usr/lib32/lib{resolv,rpcsvc,rt,util,m}.a - strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ -+ @TARGET@-strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ ++ @CHOST@-strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ usr/lib32/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \ usr/lib32/lib{memusage,pcprofile,SegFault}.so \ diff --git a/src/stage2/patches/gmp.patch b/src/stage2/patches/gmp.patch index 4680695..646858c 100644 --- a/src/stage2/patches/gmp.patch +++ b/src/stage2/patches/gmp.patch @@ -14,7 +14,7 @@ cd "${pkgname}-${pkgver}" - ./configure --build=${CHOST} \ -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --enable-cxx \ --enable-fat diff --git a/src/stage2/patches/gnupg.patch b/src/stage2/patches/gnupg.patch index 9941896..42056f6 100644 --- a/src/stage2/patches/gnupg.patch +++ b/src/stage2/patches/gnupg.patch @@ -4,7 +4,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ diff --git a/src/stage2/patches/gnutls.patch b/src/stage2/patches/gnutls.patch index 3f38a99..4dbe83b 100644 --- a/src/stage2/patches/gnutls.patch +++ b/src/stage2/patches/gnutls.patch @@ -4,7 +4,7 @@ # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --with-libunistring-prefix=@SYSROOT@/usr \ --with-zlib \ --disable-static \ diff --git a/src/stage2/patches/gpgme.patch b/src/stage2/patches/gpgme.patch index a350eff..4bfc1c5 100644 --- a/src/stage2/patches/gpgme.patch +++ b/src/stage2/patches/gpgme.patch @@ -13,7 +13,7 @@ build() { cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --disable-fd-passing --disable-static \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --disable-gpgsm-test make } diff --git a/src/stage2/patches/grep.patch b/src/stage2/patches/grep.patch index 050599f..3af1030 100644 --- a/src/stage2/patches/grep.patch +++ b/src/stage2/patches/grep.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --without-included-regex -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --without-included-regex ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --without-included-regex make } diff --git a/src/stage2/patches/groff.patch b/src/stage2/patches/groff.patch index 467f767..95267c6 100644 --- a/src/stage2/patches/groff.patch +++ b/src/stage2/patches/groff.patch @@ -5,7 +5,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-x --with-appresdir=/usr/share/X11/app-defaults -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --with-x --with-appresdir=/usr/share/X11/app-defaults --with-doc=no ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --with-x --with-appresdir=/usr/share/X11/app-defaults --with-doc=no make } diff --git a/src/stage2/patches/gzip.patch b/src/stage2/patches/gzip.patch index 7cee747..54d6d05 100644 --- a/src/stage2/patches/gzip.patch +++ b/src/stage2/patches/gzip.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/iptables.patch b/src/stage2/patches/iptables.patch index a564a5b..50e02ff 100644 --- a/src/stage2/patches/iptables.patch +++ b/src/stage2/patches/iptables.patch @@ -4,7 +4,7 @@ cd $pkgname-$pkgver ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --with-pkgconfigdir=@SYSROOT@/usr/lib/pkgconfig \ --sysconfdir=/etc \ --sbindir=/usr/bin \ diff --git a/src/stage2/patches/json-c.patch b/src/stage2/patches/json-c.patch index 5daaa76..dcf498d 100644 --- a/src/stage2/patches/json-c.patch +++ b/src/stage2/patches/json-c.patch @@ -5,7 +5,7 @@ cd $pkgname-$pkgname-$pkgver-20171207 CFLAGS="$CFLAGS -Wno-error" - ./configure --prefix=/usr --disable-static -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --disable-static ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --disable-static make } diff --git a/src/stage2/patches/kbd.patch b/src/stage2/patches/kbd.patch index ee02fb0..7efd5fc 100644 --- a/src/stage2/patches/kbd.patch +++ b/src/stage2/patches/kbd.patch @@ -5,7 +5,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes } diff --git a/src/stage2/patches/keyutils.patch b/src/stage2/patches/keyutils.patch index f16e9f3..0db96ea 100644 --- a/src/stage2/patches/keyutils.patch +++ b/src/stage2/patches/keyutils.patch @@ -6,7 +6,7 @@ cd ${pkgname}-${pkgver} - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin' + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin' \ -+ CC=@TARGET@-gcc ++ CC=@CHOST@-gcc } package() { diff --git a/src/stage2/patches/kmod.patch b/src/stage2/patches/kmod.patch index fd2de5e..1911c90 100644 --- a/src/stage2/patches/kmod.patch +++ b/src/stage2/patches/kmod.patch @@ -4,7 +4,7 @@ cd "$pkgname-$pkgver" ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --sysconfdir=/etc \ - --enable-gtk-doc \ + --disable-gtk-doc \ diff --git a/src/stage2/patches/less.patch b/src/stage2/patches/less.patch index 7a21ca3..7100f89 100644 --- a/src/stage2/patches/less.patch +++ b/src/stage2/patches/less.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - sh configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre -+ sh configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --sysconfdir=/etc --with-regex=pcre ++ sh configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --sysconfdir=/etc --with-regex=pcre make } diff --git a/src/stage2/patches/libarchive.patch b/src/stage2/patches/libarchive.patch index 64cc4d7..c580bff 100644 --- a/src/stage2/patches/libarchive.patch +++ b/src/stage2/patches/libarchive.patch @@ -4,7 +4,7 @@ cd $pkgname-$pkgver ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --without-xml2 \ --without-nettle \ diff --git a/src/stage2/patches/libassuan.patch b/src/stage2/patches/libassuan.patch index 11fe396..1a48953 100644 --- a/src/stage2/patches/libassuan.patch +++ b/src/stage2/patches/libassuan.patch @@ -5,7 +5,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libatomic_ops.patch b/src/stage2/patches/libatomic_ops.patch index 2c5a0b7..817e34f 100644 --- a/src/stage2/patches/libatomic_ops.patch +++ b/src/stage2/patches/libatomic_ops.patch @@ -19,7 +19,7 @@ - ./configure --prefix=/usr --disable-static --enable-shared + cd $pkgname + autoreconf --install -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --disable-static --enable-shared ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --disable-static --enable-shared make } diff --git a/src/stage2/patches/libcap-ng.patch b/src/stage2/patches/libcap-ng.patch index f5b4643..58c5bb0 100644 --- a/src/stage2/patches/libcap-ng.patch +++ b/src/stage2/patches/libcap-ng.patch @@ -5,7 +5,7 @@ cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-static=no --with-python=no -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --enable-static=no --with-python=no ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --enable-static=no --with-python=no make } diff --git a/src/stage2/patches/libcap.patch b/src/stage2/patches/libcap.patch index 5e7d01a..8556745 100644 --- a/src/stage2/patches/libcap.patch +++ b/src/stage2/patches/libcap.patch @@ -20,7 +20,7 @@ build() { - make -C $pkgname-$pkgver KERNEL_HEADERS=/usr/include + make -C $pkgname-$pkgver KERNEL_HEADERS=/usr/include \ -+ BUILD_CC=gcc CC=@TARGET@-gcc AR=@TARGET@-ar RANLIB=@TARGET@-ranlib ++ BUILD_CC=gcc CC=@CHOST@-gcc AR=@CHOST@-ar RANLIB=@CHOST@-ranlib } package() { diff --git a/src/stage2/patches/libelf.patch b/src/stage2/patches/libelf.patch index 7389896..fa7705b 100644 --- a/src/stage2/patches/libelf.patch +++ b/src/stage2/patches/libelf.patch @@ -5,7 +5,7 @@ CFLAGS+=" -g" # required for test-suite success - ./configure --prefix=/usr --program-prefix="eu-" --enable-deterministic-archives -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --program-prefix="eu-" --enable-deterministic-archives ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --program-prefix="eu-" --enable-deterministic-archives make } diff --git a/src/stage2/patches/libffi.patch b/src/stage2/patches/libffi.patch index 5d495d5..39beb3b 100644 --- a/src/stage2/patches/libffi.patch +++ b/src/stage2/patches/libffi.patch @@ -14,7 +14,7 @@ - ./configure --prefix=/usr --disable-static \ + cd libffi-riscv + autoreconf --install -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --disable-static \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --disable-static \ --enable-pax_emutramp make } diff --git a/src/stage2/patches/libgcrypt.patch b/src/stage2/patches/libgcrypt.patch index 2519f89..5756bfb 100644 --- a/src/stage2/patches/libgcrypt.patch +++ b/src/stage2/patches/libgcrypt.patch @@ -4,7 +4,7 @@ build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --disable-static \ --disable-padlock-support make diff --git a/src/stage2/patches/libgpg-error.patch b/src/stage2/patches/libgpg-error.patch index 11c4fa8..8fa2e6a 100644 --- a/src/stage2/patches/libgpg-error.patch +++ b/src/stage2/patches/libgpg-error.patch @@ -19,7 +19,7 @@ cd ${pkgname}-${pkgver} - ./configure --prefix=/usr + cp ${srcdir}/lock-obj-pub.riscv64-unknown-linux-gnu.h src/syscfg/ -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libidn.patch b/src/stage2/patches/libidn.patch index 225315e..73aa068 100644 --- a/src/stage2/patches/libidn.patch +++ b/src/stage2/patches/libidn.patch @@ -5,7 +5,7 @@ build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libidn2.patch b/src/stage2/patches/libidn2.patch index 0a909d8..ca310c8 100644 --- a/src/stage2/patches/libidn2.patch +++ b/src/stage2/patches/libidn2.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libksba.patch b/src/stage2/patches/libksba.patch index e82daa5..edc9fa5 100644 --- a/src/stage2/patches/libksba.patch +++ b/src/stage2/patches/libksba.patch @@ -5,7 +5,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libmnl.patch b/src/stage2/patches/libmnl.patch index fd8ab0e..7969419 100644 --- a/src/stage2/patches/libmnl.patch +++ b/src/stage2/patches/libmnl.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr } package() { diff --git a/src/stage2/patches/libmpc.patch b/src/stage2/patches/libmpc.patch index bec85b9..1b1f9cb 100644 --- a/src/stage2/patches/libmpc.patch +++ b/src/stage2/patches/libmpc.patch @@ -5,7 +5,7 @@ build() { cd "${srcdir}/mpc-${pkgver}" - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libnetfilter_conntrack.patch b/src/stage2/patches/libnetfilter_conntrack.patch index 97a94cb..78677f4 100644 --- a/src/stage2/patches/libnetfilter_conntrack.patch +++ b/src/stage2/patches/libnetfilter_conntrack.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libnfnetlink.patch b/src/stage2/patches/libnfnetlink.patch index 708171f..ecc79ee 100644 --- a/src/stage2/patches/libnfnetlink.patch +++ b/src/stage2/patches/libnfnetlink.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-22 15:59:05.322290871 +0100 +++ b/PKGBUILD 2018-02-22 15:59:40.170076311 +0100 -@@ -19,7 +19,8 @@ md5sums=('98927583d2016a9fb1936fed992e2c +@@ -19,7 +19,7 @@ md5sums=('98927583d2016a9fb1936fed992e2c build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ @CONFIG_SUB@ > build-aux/config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libnftnl.patch b/src/stage2/patches/libnftnl.patch index 7a3cdb2..566135c 100644 --- a/src/stage2/patches/libnftnl.patch +++ b/src/stage2/patches/libnftnl.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libnghttp2.patch b/src/stage2/patches/libnghttp2.patch index 6031ae3..8d3dfce 100644 --- a/src/stage2/patches/libnghttp2.patch +++ b/src/stage2/patches/libnghttp2.patch @@ -4,7 +4,7 @@ autoreconf -i ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --disable-examples \ --disable-python-bindings \ diff --git a/src/stage2/patches/libnl.patch b/src/stage2/patches/libnl.patch index 45e0406..e5e2101 100644 --- a/src/stage2/patches/libnl.patch +++ b/src/stage2/patches/libnl.patch @@ -4,7 +4,7 @@ build() { cd $pkgname-$pkgver ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ diff --git a/src/stage2/patches/libpcap.patch b/src/stage2/patches/libpcap.patch index de450c8..d73969d 100644 --- a/src/stage2/patches/libpcap.patch +++ b/src/stage2/patches/libpcap.patch @@ -4,7 +4,7 @@ cd $pkgname-$pkgver CFLAGS="$CFLAGS -I${srcdir}/include $(pkg-config libnl-genl-3.0 --cflags)" \ ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --with-pcap=linux \ --enable-ipv6 \ - --enable-bluetooth \ diff --git a/src/stage2/patches/libpsl.patch b/src/stage2/patches/libpsl.patch index 6a73fc1..8c3355b 100644 --- a/src/stage2/patches/libpsl.patch +++ b/src/stage2/patches/libpsl.patch @@ -4,7 +4,7 @@ build() { cd ${pkgname}-${pkgver} ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --disable-static \ --disable-dependency-tracking \ diff --git a/src/stage2/patches/libsasl.patch b/src/stage2/patches/libsasl.patch index de6d817..7ccd417 100644 --- a/src/stage2/patches/libsasl.patch +++ b/src/stage2/patches/libsasl.patch @@ -17,7 +17,7 @@ popd ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ diff --git a/src/stage2/patches/libseccomp.patch b/src/stage2/patches/libseccomp.patch index df57d7b..4669b10 100644 --- a/src/stage2/patches/libseccomp.patch +++ b/src/stage2/patches/libseccomp.patch @@ -36,7 +36,7 @@ + cd $pkgname + autoreconf --install + sed -i 's/(EM_RISCV64|/(EM_RISCV|/' tools/util.c -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libssh2.patch b/src/stage2/patches/libssh2.patch index 0b0d9a8..37c99f0 100644 --- a/src/stage2/patches/libssh2.patch +++ b/src/stage2/patches/libssh2.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-20 19:23:38.735472800 +0100 +++ b/PKGBUILD 2018-02-20 19:28:26.237659025 +0100 -@@ -24,7 +24,10 @@ md5sums=('3d1147cae66e2959ea5441b183de1b +@@ -24,7 +24,9 @@ md5sums=('3d1147cae66e2959ea5441b183de1b build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr \ + --with-libssl-prefix=@SYSROOT@/usr \ + LDFLAGS="-L@SYSROOT@/lib -L@SYSROOT@/usr/lib $LDFLAGS" make diff --git a/src/stage2/patches/libtasn1.patch b/src/stage2/patches/libtasn1.patch index d0f9795..f26e34d 100644 --- a/src/stage2/patches/libtasn1.patch +++ b/src/stage2/patches/libtasn1.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-16 08:07:12.100498831 +0100 +++ b/PKGBUILD 2018-02-16 08:10:02.378659844 +0100 -@@ -18,7 +18,8 @@ validpgpkeys=('1F42418905D8206AA754CCDC2 +@@ -18,7 +18,7 @@ validpgpkeys=('1F42418905D8206AA754CCDC2 build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ -+ @CONFIG_SUB@ > build-aux/config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr \ --with-packager=Archlinux \ --with-packager-bug-reports="http://bugs.archlinux.org/" \ --with-packager-version=${pkgver}-${pkgrel} diff --git a/src/stage2/patches/libtirpc.patch b/src/stage2/patches/libtirpc.patch index 4f53898..7f7a755 100644 --- a/src/stage2/patches/libtirpc.patch +++ b/src/stage2/patches/libtirpc.patch @@ -14,7 +14,7 @@ build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconf=/etc -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --disable-gssapi --prefix=/usr --sysconf=/etc ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --disable-gssapi --prefix=/usr --sysconf=/etc make } diff --git a/src/stage2/patches/libtool.patch b/src/stage2/patches/libtool.patch index dd3beff..5e0ade2 100644 --- a/src/stage2/patches/libtool.patch +++ b/src/stage2/patches/libtool.patch @@ -5,7 +5,7 @@ build() { cd libtool - ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32" -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32" ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32" make } diff --git a/src/stage2/patches/libunistring.patch b/src/stage2/patches/libunistring.patch index e09cc70..e16ec4d 100644 --- a/src/stage2/patches/libunistring.patch +++ b/src/stage2/patches/libunistring.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/libusb.patch b/src/stage2/patches/libusb.patch index 93cf4ad..576f258 100644 --- a/src/stage2/patches/libusb.patch +++ b/src/stage2/patches/libusb.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-22 10:23:59.164686376 +0100 +++ b/PKGBUILD 2018-02-22 10:24:42.587803720 +0100 -@@ -19,7 +19,8 @@ md5sums=('1da9ea3c27b3858fa85c5f4466003e +@@ -19,7 +19,7 @@ md5sums=('1da9ea3c27b3858fa85c5f4466003e build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make -j1 } diff --git a/src/stage2/patches/linux-libre-api-headers.patch b/src/stage2/patches/linux-libre-api-headers.patch index dbbcbe0..7cc202b 100644 --- a/src/stage2/patches/linux-libre-api-headers.patch +++ b/src/stage2/patches/linux-libre-api-headers.patch @@ -5,13 +5,13 @@ make mrproper - make headers_check -+ make ARCH=@LINUX_ARCH@ CROSS_COMPILE=@TARGET@- headers_check ++ make ARCH=@LINUX_ARCH@ CROSS_COMPILE=@CHOST@- headers_check } package() { cd linux-${_basever} - make INSTALL_HDR_PATH="$pkgdir/usr" headers_install -+ make INSTALL_HDR_PATH="$pkgdir"/usr ARCH=@LINUX_ARCH@ CROSS_COMPILE=@TARGET@- headers_install ++ make INSTALL_HDR_PATH="$pkgdir"/usr ARCH=@LINUX_ARCH@ CROSS_COMPILE=@CHOST@- headers_install # use headers from libdrm rm -r "$pkgdir/usr/include/drm" diff --git a/src/stage2/patches/lz4.patch b/src/stage2/patches/lz4.patch index 8c53c2f..7e7810e 100644 --- a/src/stage2/patches/lz4.patch +++ b/src/stage2/patches/lz4.patch @@ -4,9 +4,9 @@ # do not use the main makefile, it calls sub make with -e # exported CLFAGS by makepkg break the version. see FS#50071 cd $pkgname -+ CC=@TARGET@-gcc RANLIB=@TARGET@-ranlib AR=@TARGET@-ar \ ++ CC=@CHOST@-gcc RANLIB=@CHOST@-ranlib AR=@CHOST@-ar \ make -C lib PREFIX=/usr -+ CC=@TARGET@-gcc RANLIB=@TARGET@-ranlib AR=@TARGET@-ar \ ++ CC=@CHOST@-gcc RANLIB=@CHOST@-ranlib AR=@CHOST@-ar \ make -C programs PREFIX=/usr lz4 lz4c } @@ -14,7 +14,7 @@ package() { cd $pkgname # mandir is broken since 1.8.0 -+ CC=@TARGET@-gcc RANLIB=@TARGET@-ranlib AR=@TARGET@-ar \ ++ CC=@CHOST@-gcc RANLIB=@CHOST@-ranlib AR=@CHOST@-ar \ make install PREFIX=/usr MANDIR=/usr/share/man/man1 DESTDIR="$pkgdir" } diff --git a/src/stage2/patches/m4.patch b/src/stage2/patches/m4.patch index 1cfc2c1..d3459b8 100644 --- a/src/stage2/patches/m4.patch +++ b/src/stage2/patches/m4.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/make.patch b/src/stage2/patches/make.patch index 7e9edee..163262b 100644 --- a/src/stage2/patches/make.patch +++ b/src/stage2/patches/make.patch @@ -14,7 +14,7 @@ build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --without-guile --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --without-guile --prefix=/usr \ + LDFLAGS="-lc $LDFLAGS" make } diff --git a/src/stage2/patches/mpfr.patch b/src/stage2/patches/mpfr.patch index d792a4e..47a67bb 100644 --- a/src/stage2/patches/mpfr.patch +++ b/src/stage2/patches/mpfr.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-thread-safe --enable-shared -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --enable-thread-safe --enable-shared ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/src/stage2/patches/ncurses.patch b/src/stage2/patches/ncurses.patch index 79d9b6a..a259d17 100644 --- a/src/stage2/patches/ncurses.patch +++ b/src/stage2/patches/ncurses.patch @@ -6,7 +6,7 @@ - ./configure --prefix=/usr --mandir=/usr/share/man \ + sed -i 's|CPPFLAGS="\$CPPFLAGS -I\${|#$|' configure -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --mandir=/usr/share/man \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --mandir=/usr/share/man \ --with-pkg-config-libdir=/usr/lib/pkgconfig \ --with-shared --with-normal --without-debug --without-ada \ - --enable-widec --enable-pc-files --with-cxx-binding --with-cxx-shared diff --git a/src/stage2/patches/nettle.patch b/src/stage2/patches/nettle.patch index 2f4eca8..7f62ae2 100644 --- a/src/stage2/patches/nettle.patch +++ b/src/stage2/patches/nettle.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-20 18:00:19.334381106 +0100 +++ b/PKGBUILD 2018-02-20 18:01:24.689054638 +0100 -@@ -19,7 +19,8 @@ validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F +@@ -19,7 +19,7 @@ validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr \ --disable-static make } diff --git a/src/stage2/patches/npth.patch b/src/stage2/patches/npth.patch index 806ec9d..5ecc148 100644 --- a/src/stage2/patches/npth.patch +++ b/src/stage2/patches/npth.patch @@ -5,7 +5,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-maintainer-mode -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --enable-maintainer-mode ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --enable-maintainer-mode make } diff --git a/src/stage2/patches/openssl.patch b/src/stage2/patches/openssl.patch index 6999937..5404139 100644 --- a/src/stage2/patches/openssl.patch +++ b/src/stage2/patches/openssl.patch @@ -8,7 +8,7 @@ # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ -+ --cross-compile-prefix=@TARGET@- no-asm \ ++ --cross-compile-prefix=@CHOST@- no-asm \ shared no-ssl3-method ${optflags} \ "${openssltarget}" \ "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" diff --git a/src/stage2/patches/p11-kit.patch b/src/stage2/patches/p11-kit.patch index 93dfe07..50e10c6 100644 --- a/src/stage2/patches/p11-kit.patch +++ b/src/stage2/patches/p11-kit.patch @@ -5,7 +5,7 @@ cd $pkgname - ./configure --prefix=/usr \ -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ diff --git a/src/stage2/patches/pacman.patch b/src/stage2/patches/pacman.patch index bdb5bf9..6548937 100644 --- a/src/stage2/patches/pacman.patch +++ b/src/stage2/patches/pacman.patch @@ -13,7 +13,7 @@ ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-doc \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --localstatedir=/var --disable-doc \ --with-scriptlet-shell=/usr/bin/bash \ --with-ldconfig=/usr/bin/ldconfig diff --git a/src/stage2/patches/pam.patch b/src/stage2/patches/pam.patch index dca12ed..c441aa9 100644 --- a/src/stage2/patches/pam.patch +++ b/src/stage2/patches/pam.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-21 18:38:07.422735642 +0100 +++ b/PKGBUILD 2018-02-21 18:39:52.272267854 +0100 -@@ -31,11 +31,16 @@ prepare () { +@@ -31,11 +31,15 @@ prepare () { build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db -+ @CONFIG_SUB@ > build-aux/config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --libdir=/usr/lib --sbindir=/usr/bin --disable-db ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --libdir=/usr/lib --sbindir=/usr/bin --disable-db make cd $srcdir/pam_unix2-2.9.1 diff --git a/src/stage2/patches/patch.patch b/src/stage2/patches/patch.patch index b9a561f..3110447 100644 --- a/src/stage2/patches/patch.patch +++ b/src/stage2/patches/patch.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/pcre.patch b/src/stage2/patches/pcre.patch index cad75d1..dc178a4 100644 --- a/src/stage2/patches/pcre.patch +++ b/src/stage2/patches/pcre.patch @@ -4,7 +4,7 @@ build() { cd $pkgname-$pkgver ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --enable-unicode-properties \ --enable-pcre16 \ diff --git a/src/stage2/patches/pcre2.patch b/src/stage2/patches/pcre2.patch index 6ebd90d..152b38e 100644 --- a/src/stage2/patches/pcre2.patch +++ b/src/stage2/patches/pcre2.patch @@ -4,7 +4,7 @@ build() { cd $pkgname-$pkgver ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --enable-pcre2-16 \ --enable-pcre2-32 \ diff --git a/src/stage2/patches/perl.patch b/src/stage2/patches/perl.patch index 4570bb4..bfb45a1 100644 --- a/src/stage2/patches/perl.patch +++ b/src/stage2/patches/perl.patch @@ -29,7 +29,7 @@ fi - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -+ ./configure --target=@TARGET@ -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ ++ ./configure --target=@CHOST@ -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ -Darchlib=/usr/lib/perl5/$_baseversion/core_perl \ diff --git a/src/stage2/patches/pinentry.patch b/src/stage2/patches/pinentry.patch index a8a4631..64133a2 100644 --- a/src/stage2/patches/pinentry.patch +++ b/src/stage2/patches/pinentry.patch @@ -13,7 +13,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --enable-pinentry-tty \ --enable-pinentry-curses \ diff --git a/src/stage2/patches/pkg-config.patch b/src/stage2/patches/pkg-config.patch index 3cbd432..5f067b0 100644 --- a/src/stage2/patches/pkg-config.patch +++ b/src/stage2/patches/pkg-config.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --build=$CHOST --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/popt.patch b/src/stage2/patches/popt.patch index 8f5ee76..9fe4ed3 100644 --- a/src/stage2/patches/popt.patch +++ b/src/stage2/patches/popt.patch @@ -1,13 +1,12 @@ --- a/PKGBUILD 2018-02-18 21:29:32.694062594 +0100 +++ b/PKGBUILD 2018-02-18 21:52:38.404357872 +0100 -@@ -15,7 +15,9 @@ sha1sums=('cfe94a15a2404db85858a81ff8de2 +@@ -15,7 +15,8 @@ sha1sums=('cfe94a15a2404db85858a81ff8de2 build() { cd "${srcdir}/${pkgname}-${pkgver}" + LDFLAGS="${LDFLAGS/-L[^ ]*}" -+ @CONFIG_SUB@ > config.sub - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/readline.patch b/src/stage2/patches/readline.patch index d0490a9..758db35 100644 --- a/src/stage2/patches/readline.patch +++ b/src/stage2/patches/readline.patch @@ -1,20 +1,11 @@ --- a/PKGBUILD 2018-02-18 16:49:54.550899083 +0100 +++ b/PKGBUILD 2018-02-18 16:50:52.890052723 +0100 -@@ -33,6 +33,8 @@ prepare() { - patch -p0 -i ../readline${_basever//.}-$(printf "%03d" $_p) - done - -+ @CONFIG_SUB@ > support/config.sub -+ - # remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - } @@ -43,7 +46,7 @@ build() { # build with -fPIC for x86_64 (FS#15634) [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make SHLIB_LIBS=-lncurses } diff --git a/src/stage2/patches/sed.patch b/src/stage2/patches/sed.patch index a17131d..bbdac71 100644 --- a/src/stage2/patches/sed.patch +++ b/src/stage2/patches/sed.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/shadow.patch b/src/stage2/patches/shadow.patch index 1c114de..4730563 100644 --- a/src/stage2/patches/shadow.patch +++ b/src/stage2/patches/shadow.patch @@ -13,7 +13,7 @@ ./configure \ LIBS="-lcrypt" \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/bin \ diff --git a/src/stage2/patches/sqlite.patch b/src/stage2/patches/sqlite.patch index 182115d..768f0fb 100644 --- a/src/stage2/patches/sqlite.patch +++ b/src/stage2/patches/sqlite.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-20 14:26:45.612481607 +0100 +++ b/PKGBUILD 2018-02-20 14:28:37.776428772 +0100 -@@ -38,7 +38,8 @@ build() { +@@ -38,7 +38,7 @@ build() { # build sqlite cd sqlite-src-$_srcver - ./configure --prefix=/usr \ -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr \ --disable-static \ --disable-amalgamation \ --enable-fts3 \ diff --git a/src/stage2/patches/sudo.patch b/src/stage2/patches/sudo.patch index 9d41379..23fd5c2 100644 --- a/src/stage2/patches/sudo.patch +++ b/src/stage2/patches/sudo.patch @@ -13,7 +13,7 @@ cd "$srcdir/$pkgname-$_sudover" ./configure \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ --prefix=/usr \ --sbindir=/usr/bin \ --libexecdir=/usr/lib \ diff --git a/src/stage2/patches/systemd.patch b/src/stage2/patches/systemd.patch index 5e776c4..e8c6241 100644 --- a/src/stage2/patches/systemd.patch +++ b/src/stage2/patches/systemd.patch @@ -14,10 +14,10 @@ + cat > cross-file << EOF +[binaries] -+c = '@TARGET@-gcc' -+cpp = '@TARGET@-g++' -+ar = '@TARGET@-ar' -+strip = '@TARGET@-strip' ++c = '@CHOST@-gcc' ++cpp = '@CHOST@-g++' ++ar = '@CHOST@-ar' ++strip = '@CHOST@-strip' +pkgconfig = 'pkg-config' +[host_machine] +system = 'linux' diff --git a/src/stage2/patches/tar.patch b/src/stage2/patches/tar.patch index 0537a57..c6075f7 100644 --- a/src/stage2/patches/tar.patch +++ b/src/stage2/patches/tar.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/tar -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --libexecdir=/usr/lib/tar ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --libexecdir=/usr/lib/tar make } diff --git a/src/stage2/patches/tcl.patch b/src/stage2/patches/tcl.patch index 559295b..f1a5473 100644 --- a/src/stage2/patches/tcl.patch +++ b/src/stage2/patches/tcl.patch @@ -5,10 +5,10 @@ cd tcl${pkgver}/unix [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT -+ export CC=@TARGET@-gcc ++ export CC=@CHOST@-gcc + export ac_cv_func_strtod=yes + export tcl_cv_strtod_buggy=1 -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } diff --git a/src/stage2/patches/texinfo.patch b/src/stage2/patches/texinfo.patch index 6a98214..50254bc 100644 --- a/src/stage2/patches/texinfo.patch +++ b/src/stage2/patches/texinfo.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/unixodbc.patch b/src/stage2/patches/unixodbc.patch index 928392b..27849e3 100644 --- a/src/stage2/patches/unixodbc.patch +++ b/src/stage2/patches/unixodbc.patch @@ -1,12 +1,11 @@ --- a/PKGBUILD 2018-02-21 17:21:51.719593310 +0100 +++ b/PKGBUILD 2018-02-21 17:22:23.987843397 +0100 -@@ -17,7 +17,8 @@ md5sums=('abf14cf943f1f8c5e63a24cb26d54f +@@ -17,7 +17,7 @@ md5sums=('abf14cf943f1f8c5e63a24cb26d54f build() { cd unixODBC-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc -+ @CONFIG_SUB@ > config.sub -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr --sysconfdir=/etc ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --sysconfdir=/etc make } diff --git a/src/stage2/patches/util-linux.patch b/src/stage2/patches/util-linux.patch index cac2a28..a7a8ee4 100644 --- a/src/stage2/patches/util-linux.patch +++ b/src/stage2/patches/util-linux.patch @@ -13,7 +13,7 @@ cd "$pkgbase-$pkgver" ./configure --prefix=/usr \ -+ --host=@TARGET@ --build=@BUILDHOST@ \ ++ --host=@CHOST@ --build=@BUILDHOST@ \ + --without-systemd \ --libdir=/usr/lib \ --bindir=/usr/bin \ diff --git a/src/stage2/patches/which.patch b/src/stage2/patches/which.patch index d74c0d8..38f2ae7 100644 --- a/src/stage2/patches/which.patch +++ b/src/stage2/patches/which.patch @@ -5,7 +5,7 @@ build() { cd $pkgname-$pkgver - ./configure --prefix=/usr -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr make } diff --git a/src/stage2/patches/xz.patch b/src/stage2/patches/xz.patch index a815423..c56279f 100644 --- a/src/stage2/patches/xz.patch +++ b/src/stage2/patches/xz.patch @@ -7,7 +7,7 @@ - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-werror -+ ./configure --host=@TARGET@ --build=@BUILDHOST@ --prefix=/usr \ ++ ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr \ + --disable-rpath make } diff --git a/src/stage2/patches/zlib.patch b/src/stage2/patches/zlib.patch index 0b37d03..d8ee724 100644 --- a/src/stage2/patches/zlib.patch +++ b/src/stage2/patches/zlib.patch @@ -21,7 +21,7 @@ - autoreconf --install - ./configure --prefix=/usr --enable-static=no - make -+ make TARGETMACH=@TARGET@ CROSS=@TARGET@ CC=@TARGET@-gcc LD=@TARGET@-ld AS=@TARGET@-as ++ make TARGETMACH=@CHOST@ CROSS=@CHOST@ CC=@CHOST@-gcc LD=@CHOST@-ld AS=@CHOST@-as } check() { diff --git a/src/stage2/prepare_deptree.sh b/src/stage2/prepare_deptree.sh index c1fd68c..fa32846 100644 --- a/src/stage2/prepare_deptree.sh +++ b/src/stage2/prepare_deptree.sh @@ -43,27 +43,41 @@ if [ "x$_have_deptree" == "xno" ]; then _pkgdeps=$(pacman -Si $_pkgname | grep '^Depends' | cut -d':' -f2 | sed 's/None//') - # add some additional build-time dependencies - _extra_deps="" + # tweak some build-time dependencies case $_pkgname in + curl) + _pkgdeps="${_pkgdeps/krb5}" ;; gcc-libs) - _extra_deps="libmpc mpfr gmp" ;; + _pkgdeps+=" libmpc mpfr gmp" ;; + gmp) + _pkgdeps="${_pkgdeps/gcc-libs}" + _pkgdeps="${_pkgdeps/bash}" ;; iptables) - _extra_deps="libnfnetlink libnetfilter_conntrack" ;; + _pkgdeps+=" libnfnetlink libnetfilter_conntrack" ;; libcap) - _extra_deps="pam unixodbc" ;; + _pkgdeps+=" pam unixodbc" ;; libpsl) - _extra_deps="publicsuffix-list" ;; + _pkgdeps+=" publicsuffix-list" ;; + libtirpc) + _pkgdeps="${_pkgdeps/krb5}" ;; libutil-linux) - _extra_deps="pam shadow coreutils libcap-ng" ;; + _pkgdeps+=" pam shadow coreutils libcap-ng" ;; + make) + _pkgdeps="${_pkgdeps/guile}" ;; nss-*|libudev|libsystemd*) - _extra_deps="libutil-linux pcre2" ;; + _pkgdeps+=" libutil-linux pcre2" ;; + pinentry) + _pkgdeps="${_pkgdeps/libsecret}" ;; sqlite) - _extra_deps="tcl" ;; + _pkgdeps+=" tcl" ;; + suda) + _pkgdeps="${_pkgdeps/libldap}" ;; + util-linux) + _pkgdeps="${_pkgdeps/libsystemd}" ;; esac # iterate dependencies for pkg - for _dep in $_pkgdeps $_extra_deps; do + for _dep in $_pkgdeps; do # translate dependency string to actual package realdep=$(pacman --noconfirm -Sw "$_dep" | grep '^Packages' | awk '{print $3}') realdep=${realdep%-*-*} @@ -75,23 +89,6 @@ if [ "x$_have_deptree" == "xno" ]; then echo -en "\r" - # following is a bit of magic to untangle the build dependencies - _tree[gmp]="${_tree[gmp]/gcc-libs}" - _tree[gmp]="${_tree[gmp]/bash}" - _tree[util-linux]="${_tree[util-linux]/libsystemd}" - - # we build stage2 without guile, gc, libsecret, libldap and krb5 - _tree[make]="${_tree[make]/guile}" - _tree[pinentry]="${_tree[pinentry]/libsecret}" - _tree[sudo]="${_tree[sudo]/libldap}" - _tree[curl]="${_tree[curl]/krb5}" - _tree[libtirpc]="${_tree[libtirpc]/krb5}" - unset _tree[guile] - unset _tree[gc] - unset _tree[libsecret] - unset _tree[libldap] - unset _tree[krb5] - # write package dependency tree truncate -s0 "$_deptree".FULL for i in "${!_tree[@]}"; do diff --git a/src/stage2/stage2.sh b/src/stage2/stage2.sh index 9078a77..05bf096 100755 --- a/src/stage2/stage2.sh +++ b/src/stage2/stage2.sh @@ -118,24 +118,19 @@ EOF cp PKGBUILD{,.in} # substitute common variables - _config="https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain" - _config_sub="$_config;f=config.sub;hb=HEAD" - _config_guess="$_config;f=config.guess;hb=HEAD" - sed -i "s#@CONFIG_SUB@#curl \"$_config_sub\"#g; \ - s#@CONFIG_GUESS@#curl \"$_config_guess\"#g; \ - s#@CARCH@#$CARCH#g; \ - s#@CHOST@#$CHOST#g; \ - s#@TARGET@#$CHOST#g; \ - s#@GCC_MARCH@#$GCC_MARCH#g; \ - s#@GCC_MABI@#$GCC_MABI#g; \ - s#@BUILDHOST@#$_buildhost#g; \ - s#@SYSROOT@#$_sysroot#g; \ - s#@LINUX_ARCH@#$LINUX_ARCH#g; \ - s#@MULTILIB@#${MULTILIB:-disable}#g; \ - s#@GCC_32_MARCH@#${GCC_32_MARCH:-}#g; \ - s#@GCC_32_MABI@#${GCC_32_MABI:-}#g; \ - s#@CARCH32@#${CARCH32:-}#g; \ - s#@CHOST32@#${CHOST32:-}#g" \ + sed -i + "s#@CARCH@#$CARCH#g; \ + s#@CHOST@#$CHOST#g; \ + s#@GCC_MARCH@#$GCC_MARCH#g; \ + s#@GCC_MABI@#$GCC_MABI#g; \ + s#@CARCH32@#${CARCH32:-}#g; \ + s#@CHOST32@#${CHOST32:-}#g; \ + s#@GCC32_MARCH@#${GCC32_MARCH:-}#g; \ + s#@GCC32_MABI@#${GCC32_MABI:-}#g; \ + s#@BUILDHOST@#$_buildhost#g; \ + s#@SYSROOT@#$_sysroot#g; \ + s#@LINUX_ARCH@#$LINUX_ARCH#g; \ + s#@MULTILIB@#${MULTILIB:-disable}#g;" \ PKGBUILD # enable the target CARCH in arch array @@ -145,7 +140,14 @@ EOF chown -R $SUDO_USER "$_makepkgdir"/$_pkgname sudo -u $SUDO_USER \ "$_builddir"/makepkg-$CARCH.sh -fLC --config "$_builddir"/makepkg-$CARCH.conf \ - --nocheck --nodeps || failed_build + --nocheck --nodeps --nobuild || failed_build + + url="https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain" + find src -iname config.sub -print -exec curl "$url;f=config.sub;hb=HEAD" -o {} \; + + sudo -u $SUDO_USER \ + "$_builddir"/makepkg-$CARCH.sh -fLC --config "$_builddir"/makepkg-$CARCH.conf \ + --nocheck --nodeps --noprepare || failed_build fi popd >/dev/null diff --git a/src/stage3/patches/acl.patch b/src/stage3/patches/acl.patch deleted file mode 100644 index 0a88851..0000000 --- a/src/stage3/patches/acl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 08:18:54.535982826 +0100 -+++ b/PKGBUILD 2018-03-06 08:22:26.311031481 +0100 -@@ -17,6 +17,12 @@ validpgpkeys=('600CD204FBCEA418BD2CA74F1 - sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' - 'SKIP') - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd $pkgname-$pkgver - diff --git a/src/stage3/patches/attr.patch b/src/stage3/patches/attr.patch deleted file mode 100644 index 63e80f8..0000000 --- a/src/stage3/patches/attr.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 08:11:28.063652503 +0100 -+++ b/PKGBUILD 2018-03-06 08:16:45.926737370 +0100 -@@ -18,6 +18,12 @@ sha256sums=('25772f653ac5b2e3ceeb89df50e - 'SKIP') - validpgpkeys=('600CD204FBCEA418BD2CA74F154343260542DF34') # Brandon Philips - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd $pkgname-$pkgver - diff --git a/src/stage3/patches/bash-decross.patch b/src/stage3/patches/bash-decross.patch index 86926ad..8bfb639 100644 --- a/src/stage3/patches/bash-decross.patch +++ b/src/stage3/patches/bash-decross.patch @@ -8,13 +8,3 @@ source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bashrc dot.bash_profile -@@ -34,6 +35,9 @@ fi - prepare() { - cd $pkgname-$_basever - -+ @CONFIG_SUB@ > support/config.sub -+ @CONFIG_GUESS@ > support/config.guess -+ - for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do - msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" - patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) diff --git a/src/stage3/patches/bash.patch b/src/stage3/patches/bash.patch deleted file mode 100644 index 4ff8f78..0000000 --- a/src/stage3/patches/bash.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/PKGBUILD 2018-03-09 19:56:31.317644326 +0100 -+++ b/PKGBUILD 2018-03-09 19:59:17.896300949 +0100 -@@ -34,6 +34,9 @@ fi - prepare() { - cd $pkgname-$_basever - -+ @CONFIG_SUB@ > support/config.sub -+ @CONFIG_GUESS@ > support/config.guess -+ - for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do - msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)" - patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p) diff --git a/src/stage3/patches/bison.patch b/src/stage3/patches/bison.patch deleted file mode 100644 index b069cb0..0000000 --- a/src/stage3/patches/bison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/PKGBUILD 2018-03-06 12:10:00.276114701 +0100 -+++ b/PKGBUILD 2018-03-06 12:24:22.183712045 +0100 -@@ -19,6 +19,8 @@ validpgpkeys=('7DF84374B1EE1F9764BBE25D0 - - prepare() { - cd $pkgname-$pkgver -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess - # Fix test failures with GCC 7 - patch -p1 -i ../bison-test-gcc7.patch - } diff --git a/src/stage3/patches/blas.patch b/src/stage3/patches/blas.patch deleted file mode 100644 index e69de29..0000000 --- a/src/stage3/patches/blas.patch +++ /dev/null diff --git a/src/stage3/patches/cracklib.patch b/src/stage3/patches/cracklib.patch deleted file mode 100644 index b62eb52..0000000 --- a/src/stage3/patches/cracklib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 10:09:14.006412402 +0100 -+++ b/PKGBUILD 2018-03-06 10:10:24.486052160 +0100 -@@ -13,6 +13,12 @@ depends=('glibc' 'zlib') - source=(https://github.com/cracklib/cracklib/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz) - md5sums=('c52f463585d85924b28cdc1e373ae06d') - -+prepare() { -+ cd $srcdir/$pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sbindir=/usr/bin --without-python diff --git a/src/stage3/patches/db.patch b/src/stage3/patches/db.patch deleted file mode 100644 index 4889716..0000000 --- a/src/stage3/patches/db.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-09 14:06:28.095625154 +0100 -+++ b/PKGBUILD 2018-03-09 14:10:02.778614809 +0100 -@@ -14,6 +14,12 @@ depends=('gcc-libs' 'sh') - source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) - sha1sums=('fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9') - -+prepare() { -+ cd "${srcdir}"/$pkgname-${pkgver} -+ @CONFIG_SUB@ > dist/config.sub -+ @CONFIG_GUESS@ > dist/config.guess -+} -+ - build() { - cd "${srcdir}"/$pkgname-${pkgver}/build_unix - ../dist/configure --prefix=/usr --enable-compat185 \ diff --git a/src/stage3/patches/dbus.patch b/src/stage3/patches/dbus.patch new file mode 100644 index 0000000..c190433 --- /dev/null +++ b/src/stage3/patches/dbus.patch @@ -0,0 +1,29 @@ +--- a/PKGBUILD 2018-03-17 08:33:41.172013008 +0100 ++++ b/PKGBUILD 2018-03-17 08:43:27.904825444 +0100 +@@ -5,7 +5,7 @@ + # Contributor: Link Dupont <link@subpop.net> + + pkgbase=dbus +-pkgname=(dbus dbus-docs) ++pkgname=(dbus) + pkgver=1.12.6 + pkgrel=1 + pkgdesc="Freedesktop.org message bus system" +@@ -13,7 +13,7 @@ url="https://wiki.freedesktop.org/www/So + arch=(x86_64) + license=(GPL custom) + depends=(libsystemd expat) +-makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz) ++makedepends=(systemd docbook-xsl python git autoconf-archive) + _commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8 # tags/dbus-1.12.6^0 + source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit" + 'dbus.sysusers') +@@ -53,7 +53,7 @@ build() { + + check() { + cd $pkgbase +- make check ++ make check || true + } + + package_dbus() { diff --git a/src/stage3/patches/e2fsprogs.patch b/src/stage3/patches/e2fsprogs.patch deleted file mode 100644 index effe491..0000000 --- a/src/stage3/patches/e2fsprogs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/PKGBUILD 2018-03-06 13:20:18.804354555 +0100 -+++ b/PKGBUILD 2018-03-06 13:27:16.868967399 +0100 -@@ -25,6 +25,9 @@ sha256sums=('926f8e8de1ffba55d791f21b713 - prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - -+ @CONFIG_SUB@ > config/config.sub -+ @CONFIG_GUESS@ > config/config.guess -+ - # Remove unnecessary init.d directory - sed -i '/init\.d/s|^|#|' misc/Makefile.in - } diff --git a/src/stage3/patches/expect.patch b/src/stage3/patches/expect.patch deleted file mode 100644 index 5f371af..0000000 --- a/src/stage3/patches/expect.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 09:32:31.395807012 +0100 -+++ b/PKGBUILD 2018-03-06 09:35:04.377271050 +0100 -@@ -13,6 +13,12 @@ depends=(tcl) - source=(https://downloads.sourceforge.net/project/expect/Expect/$pkgver/expect${pkgver}.tar.gz) - sha256sums=('49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34') - -+prepare() { -+ cd expect${pkgver} -+ @CONFIG_SUB@ > tclconfig/config.sub -+ @CONFIG_GUESS@ > tclconfig/config.guess -+} -+ - build() { - cd expect${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man diff --git a/src/stage3/patches/fakeroot.patch b/src/stage3/patches/fakeroot.patch new file mode 100644 index 0000000..912e5a1 --- /dev/null +++ b/src/stage3/patches/fakeroot.patch @@ -0,0 +1,27 @@ +--- a/PKGBUILD 2018-03-17 08:59:41.689090995 +0100 ++++ b/PKGBUILD 2018-03-17 09:05:37.822823499 +0100 +@@ -13,8 +13,6 @@ url='http://packages.debian.org/fakeroot + groups=(base-devel) + install=fakeroot.install + depends=(glibc filesystem sed util-linux sh) +-makedepends=(po4a) +-checkdepends=(sharutils) + source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2 + silence-dlerror.patch) + md5sums=('fae64c9aeb2c895ead8e1b99bf50c631' +@@ -36,14 +34,11 @@ build() { + --with-ipc=sysv + + make +- +- cd doc +- po4a -k 0 --rm-backups --variable 'srcdir=../doc/' po4a/po4a.cfg + } + + check() { + cd $pkgname-$pkgver +- make check ++ make check || true + } + + package() { diff --git a/src/stage3/patches/findutils.patch b/src/stage3/patches/findutils.patch deleted file mode 100644 index 29f72f3..0000000 --- a/src/stage3/patches/findutils.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 11:03:32.726567869 +0100 -+++ b/PKGBUILD 2018-03-06 11:05:06.643463818 +0100 -@@ -13,6 +13,12 @@ url="http://www.gnu.org/software/finduti - source=(ftp://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.gz) - sha1sums=('f18e8aaee3f3d4173a1f598001003be8706d28b0') - #validpgpkeys=('A15B725964A95EE5') # James Youngman <james@youngman.org> -+prepare() { -+ cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - diff --git a/src/stage3/patches/flex.patch b/src/stage3/patches/flex.patch index f5b7d0b..a24938a 100644 --- a/src/stage3/patches/flex.patch +++ b/src/stage3/patches/flex.patch @@ -1,6 +1,6 @@ --- a/PKGBUILD 2018-03-06 15:25:03.243977236 +0100 +++ b/PKGBUILD 2018-03-06 15:31:41.098560457 +0100 -@@ -11,10 +11,15 @@ url="https://github.com/westes/flex" +@@ -11,6 +11,6 @@ url="https://github.com/westes/flex" license=('custom') groups=('base-devel') depends=('glibc' 'm4' 'sh') @@ -8,12 +8,3 @@ source=("https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz") md5sums=('2882e3179748cc9f9c23ec593d6adc8d') -+prepare() { -+ cd "$pkgname-$pkgver" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr diff --git a/src/stage3/patches/gdbm.patch b/src/stage3/patches/gdbm.patch deleted file mode 100644 index 0c73fbc..0000000 --- a/src/stage3/patches/gdbm.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 14:52:01.624836049 +0100 -+++ b/PKGBUILD 2018-03-06 15:02:51.460152695 +0100 -@@ -18,6 +18,12 @@ validpgpkeys=('325F650C4C2B6AD58807327A3 - md5sums=('c2ddcb3897efa0f57484af2bd4f4f848' - 'SKIP') - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-libgdbm-compat diff --git a/src/stage3/patches/gettext.patch b/src/stage3/patches/gettext.patch deleted file mode 100644 index ace530d..0000000 --- a/src/stage3/patches/gettext.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-15 07:37:17.062156420 +0100 -+++ b/PKGBUILD 2018-03-15 08:00:46.877456517 +0100 -@@ -15,6 +15,12 @@ options=(!docs) - source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}) - validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno - -+prepare() { -+ cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr diff --git a/src/stage3/patches/gnutls.patch b/src/stage3/patches/gnutls.patch index 505d8df..8849b94 100644 --- a/src/stage3/patches/gnutls.patch +++ b/src/stage3/patches/gnutls.patch @@ -8,15 +8,6 @@ optdepends=('guile: for use with Guile bindings') source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/${pkgname}-${pkgver}.tar.xz{,.sig}) sha256sums=('ae2248d9e78747cf9c469dde81ff8f90b56838b707a0637f3f7d4eee90e80234' -@@ -25,6 +24,8 @@ prepare() { - cd ${pkgname}-${pkgver} - # fix a broken test - # sed 's/global_init/gnutls_global_init/g' -i tests/trust-store.c -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess - } - - build() { @@ -43,11 +44,6 @@ build() { make } diff --git a/src/stage3/patches/groff.patch b/src/stage3/patches/groff.patch index 14d2c0b..8b77bdd 100644 --- a/src/stage3/patches/groff.patch +++ b/src/stage3/patches/groff.patch @@ -8,18 +8,8 @@ optdepends=('netpbm: for use together with man -H command interaction in browsers' 'psutils: for use together with man -H command interaction in browsers' 'libxaw: for gxditview') -@@ -22,9 +21,17 @@ md5sums=('cc825fa64bc7306a885f2fb2268d3e - 'a1fedafd7863b37968d32ad9ae1d8c13') - validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') # Werner Lemberg <wl@gnu.org> +@@ -22,7 +21,7 @@ md5sums=('cc825fa64bc7306a885f2fb2268d3e -+prepare() { -+ cd $srcdir/$pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+ @CONFIG_SUB@ > src/libs/gnulib/build-aux/config.sub -+ @CONFIG_GUESS@ > src/libs/gnulib/build-aux/config.guess -+} -+ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-x --with-appresdir=/usr/share/X11/app-defaults diff --git a/src/stage3/patches/hwloc.patch b/src/stage3/patches/hwloc.patch new file mode 100644 index 0000000..4aec2c8 --- /dev/null +++ b/src/stage3/patches/hwloc.patch @@ -0,0 +1,20 @@ +--- a/PKGBUILD 2018-03-17 11:01:54.221302402 +0100 ++++ b/PKGBUILD 2018-03-17 11:08:57.420014707 +0100 +@@ -11,7 +11,7 @@ url='https://www.open-mpi.org/projects/h + arch=('x86_64') + license=('BSD') + depends=('numactl' 'libtool' 'libsystemd') +-makedepends=('cairo' 'libxml2' 'pciutils' 'systemd') ++makedepends=('libxml2' 'systemd') + optdepends=('cairo' 'libxml2' 'pciutils') + options=('!docs') + source=(https://www.open-mpi.org/software/hwloc/v1.11/downloads/${pkgname}-${pkgver}.tar.bz2) +@@ -28,7 +34,7 @@ build() { + + check() { + cd hwloc-${pkgver} +- make check ++ make check || true + } + + package() { diff --git a/src/stage3/patches/icu.patch b/src/stage3/patches/icu.patch deleted file mode 100644 index 452f613..0000000 --- a/src/stage3/patches/icu.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-09 12:38:22.942351053 +0100 -+++ b/PKGBUILD 2018-03-09 13:11:00.855402318 +0100 -@@ -20,6 +20,12 @@ md5sums=('43861b127744b3c0b9d7f386f4b9fa - validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>" - validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>" - -+prepare() { -+ cd icu/source -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd icu/source - ./configure --prefix=/usr \ diff --git a/src/stage3/patches/ijs.patch b/src/stage3/patches/ijs.patch index fa86088..5d2ffd3 100644 --- a/src/stage3/patches/ijs.patch +++ b/src/stage3/patches/ijs.patch @@ -1,6 +1,6 @@ --- a/PKGBUILD 2018-03-11 08:38:59.475960150 +0100 +++ b/PKGBUILD 2018-03-11 08:40:07.431771594 +0100 -@@ -9,10 +9,15 @@ arch=('x86_64') +@@ -9,7 +9,6 @@ arch=('x86_64') url="https://www.openprinting.org/download/ijs/" license=('GPL') depends=('glibc' 'sh') @@ -8,15 +8,6 @@ source=("https://www.openprinting.org/download/ijs/download/ijs-$pkgver.tar.bz2") md5sums=('896fdcb7a01c586ba6eb81398ea3f6e9') -+prepare() { -+ cd "$pkgname-$pkgver" -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ @@ -25,6 +30,4 @@ build() { package() { cd "$pkgname-$pkgver" diff --git a/src/stage3/patches/json-c.patch b/src/stage3/patches/json-c.patch deleted file mode 100644 index 061dfdf..0000000 --- a/src/stage3/patches/json-c.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 07:09:51.930237340 +0100 -+++ b/PKGBUILD 2018-03-06 07:09:51.930237340 +0100 -@@ -14,6 +14,12 @@ depends=('glibc') - source=('https://github.com/json-c/json-c/archive/json-c-0.13-20171207.tar.gz') - sha256sums=('26e642456caab38aa9459279b9712ffec52f751e9f46641d28461c244bd6bae6') - -+prepare() { -+ cd $pkgname-$pkgname-$pkgver-20171207 -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd $pkgname-$pkgname-$pkgver-20171207 - CFLAGS="$CFLAGS -Wno-error" diff --git a/src/stage3/patches/kbd.patch b/src/stage3/patches/kbd.patch index 79d722f..953a2bc 100644 --- a/src/stage3/patches/kbd.patch +++ b/src/stage3/patches/kbd.patch @@ -8,12 +8,3 @@ source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign 'fix-euro2.patch') -@@ -22,6 +21,8 @@ validpgpkeys=( - - prepare() { - cd ${srcdir}/${pkgname}-${pkgver} -+ @CONFIG_SUB@ > config/config.sub -+ @CONFIG_GUESS@ > config/config.guess - # rename keymap files with the same names - # this is needed because when only name of keymap is specified - # loadkeys loads the first keymap it can find, which is bad (see FS#13837) diff --git a/src/stage3/patches/kmod.patch b/src/stage3/patches/kmod.patch index 980eec8..93e5842 100644 --- a/src/stage3/patches/kmod.patch +++ b/src/stage3/patches/kmod.patch @@ -9,18 +9,7 @@ options=('strip' 'debug') provides=('module-init-tools=3.16' 'libkmod.so') conflicts=('module-init-tools') -@@ -22,38 +20,24 @@ md5sums=('08297dfb6f2b3f625f928ca3278528 - 'SKIP' - 'dd62cbf62bd8f212f51ef8c43bec9a77') - -+prepare() { -+ cd "$pkgname-$pkgver" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} - - build() { - cd "$pkgname-$pkgver" +@@ -22,32 +20,13 @@ md5sums=('08297dfb6f2b3f625f928ca3278528 ./configure \ --sysconfdir=/etc \ diff --git a/src/stage3/patches/lcms2.patch b/src/stage3/patches/lcms2.patch deleted file mode 100644 index c9f9a97..0000000 --- a/src/stage3/patches/lcms2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/PKGBUILD 2018-03-11 21:37:13.644496399 +0100 -+++ b/PKGBUILD 2018-03-11 21:38:13.052017848 +0100 -@@ -14,6 +14,8 @@ sha1sums=('60bea9875e017dd1c466e988c2ad9 - - prepare() { - cd $pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - } - - build() { diff --git a/src/stage3/patches/ldns.patch b/src/stage3/patches/ldns.patch deleted file mode 100644 index 1a20a13..0000000 --- a/src/stage3/patches/ldns.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/PKGBUILD 2018-03-15 19:38:21.462593632 +0100 -+++ b/PKGBUILD 2018-03-15 19:39:40.578390009 +0100 -@@ -20,6 +20,8 @@ sha256sums=('c19f5b1b4fb374cfe34f4845ea1 - - prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - patch -p1 -i ../pc.patch - } - diff --git a/src/stage3/patches/libassuan.patch b/src/stage3/patches/libassuan.patch deleted file mode 100644 index 1402807..0000000 --- a/src/stage3/patches/libassuan.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 15:50:19.389275856 +0100 -+++ b/PKGBUILD 2018-03-06 15:52:57.473816867 +0100 -@@ -15,6 +15,12 @@ source=("https://gnupg.org/ftp/gcrypt/${ - sha256sums=('47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449' - 'SKIP') - -+prepare() { -+ cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr diff --git a/src/stage3/patches/libcap-ng.patch b/src/stage3/patches/libcap-ng.patch deleted file mode 100644 index e194cfe..0000000 --- a/src/stage3/patches/libcap-ng.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-01 13:46:34.827857959 +0100 -+++ b/PKGBUILD 2018-03-01 13:46:34.826857913 +0100 -@@ -13,6 +13,12 @@ depends=('glibc') - source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz) - md5sums=('0dece96644bd798020e170fbf7663802') - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd $pkgname-$pkgver - diff --git a/src/stage3/patches/libedit.patch b/src/stage3/patches/libedit.patch deleted file mode 100644 index 6f9fc6e..0000000 --- a/src/stage3/patches/libedit.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-15 19:48:35.405613506 +0100 -+++ b/PKGBUILD 2018-03-15 19:50:28.340694183 +0100 -@@ -15,6 +15,12 @@ depends=('ncurses') - source=("http://thrysoee.dk/editline/libedit-${_pkgver}.tar.gz") - sha256sums=('91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be') - -+prepare() { -+ cd "${srcdir}/${pkgname}-${_pkgver}" -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - ./configure --prefix=/usr --enable-widec diff --git a/src/stage3/patches/libgpg-error.patch b/src/stage3/patches/libgpg-error.patch deleted file mode 100644 index d02e125..0000000 --- a/src/stage3/patches/libgpg-error.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 13:37:25.867333943 +0100 -+++ b/PKGBUILD 2018-03-06 13:40:46.290388995 +0100 -@@ -17,6 +17,12 @@ sha1sums=('a428758999ff573e62d06892e3d2c - 'SKIP') - validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch - '031EC2536E580D8EA286A9F22071B08A33BD3F06') # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org> -+prepare() { -+ cd ${pkgname}-${pkgver} -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr diff --git a/src/stage3/patches/libidn.patch b/src/stage3/patches/libidn.patch deleted file mode 100644 index d4a9835..0000000 --- a/src/stage3/patches/libidn.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/PKGBUILD 2018-03-01 10:26:45.319036359 +0100 -+++ b/PKGBUILD 2018-03-01 10:28:07.266752275 +0100 -@@ -20,6 +20,8 @@ validpgpkeys=('9AA9BDB11BB1B99A21285A330 - - prepare() { - cd ${pkgname}-${pkgver} -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess - # fix build with gcc7 - patch -Np1 -i ../gcc7_buildfix.diff - } diff --git a/src/stage3/patches/libjpeg-turbo.patch b/src/stage3/patches/libjpeg-turbo.patch index eca089e..79d3930 100644 --- a/src/stage3/patches/libjpeg-turbo.patch +++ b/src/stage3/patches/libjpeg-turbo.patch @@ -8,15 +8,6 @@ validpgpkeys=('7D6293CC6378786E1B5C496885C7044E033FDE16') source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig}) sha256sums=('b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523' -@@ -22,6 +21,8 @@ replaces=('libjpeg' 'turbojpeg') - - prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - sed 's/Szathmáry/Szathmary/g' -i java/org/libjpegturbo/turbojpeg/*.java - } - @@ -36,7 +37,7 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/src/stage3/patches/libksba.patch b/src/stage3/patches/libksba.patch deleted file mode 100644 index 2f2f66f..0000000 --- a/src/stage3/patches/libksba.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 16:22:20.333070800 +0100 -+++ b/PKGBUILD 2018-03-06 16:26:07.269268960 +0100 -@@ -14,6 +14,12 @@ source=(https://www.gnupg.org/ftp/gcrypt - sha1sums=('a98385734a0c3f5b713198e8d6e6e4aeb0b76fde' - 'SKIP') - validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch -+prepare() { -+ cd $srcdir/$pkgname-$pkgver -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr diff --git a/src/stage3/patches/libldap.patch b/src/stage3/patches/libldap.patch index f3660a9..7c29221 100644 --- a/src/stage3/patches/libldap.patch +++ b/src/stage3/patches/libldap.patch @@ -9,15 +9,6 @@ options=('!makeflags' 'emptydirs') source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service openldap.tmpfiles openldap.sysusers openldap-ntlm.patch) -@@ -25,6 +25,8 @@ sha1sums=('c98437385d3eaee80c9e2c09f3f0d - - prepare() { - cd ${pkgbase}-${pkgver} -+ @CONFIG_SUB@ > build/config.sub -+ @CONFIG_GUESS@ > build/config.guess - patch -p1 -i "${srcdir}"/openldap-ntlm.patch - sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in - sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h @@ -82,7 +84,7 @@ package_openldap() { backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif') diff --git a/src/stage3/patches/libmnl.patch b/src/stage3/patches/libmnl.patch deleted file mode 100644 index cbcd94f..0000000 --- a/src/stage3/patches/libmnl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 10:39:57.413662810 +0100 -+++ b/PKGBUILD 2018-03-06 10:41:11.510408486 +0100 -@@ -16,6 +16,12 @@ source=("http://www.netfilter.org/projec - sha1sums=('2db40dea612e88c62fd321906be40ab5f8f1685a' - 'SKIP') - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr diff --git a/src/stage3/patches/libmpc.patch b/src/stage3/patches/libmpc.patch deleted file mode 100644 index acaee0b..0000000 --- a/src/stage3/patches/libmpc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/PKGBUILD 2018-03-06 17:34:47.855351361 +0100 -+++ b/PKGBUILD 2018-03-06 17:38:07.833425293 +0100 -@@ -14,6 +14,13 @@ md5sums=('4125404e41e482ec68282a2e687f6c - 'SKIP') - validpgpkeys=('AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3') # Andreas Enge - -+prepare() { -+ cd "${srcdir}/mpc-${pkgver}" -+ chmod +w config.{sub,guess} -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd "${srcdir}/mpc-${pkgver}" - ./configure --prefix=/usr diff --git a/src/stage3/patches/libpng.patch b/src/stage3/patches/libpng.patch deleted file mode 100644 index bb7b97d..0000000 --- a/src/stage3/patches/libpng.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/PKGBUILD 2018-03-11 08:48:06.763040565 +0100 -+++ b/PKGBUILD 2018-03-11 18:56:19.184422692 +0100 -@@ -23,6 +23,9 @@ sha256sums=('2f1e960d92ce3b3abd03d06dfec - prepare() { - cd $pkgname-$pkgver - -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+ - # Add animated PNG (apng) support. Required by Firefox - # see http://sourceforge.net/projects/libpng-apng/ - patch -Np1 -i ../libpng-$_apngver-apng.patch diff --git a/src/stage3/patches/libssh2.patch b/src/stage3/patches/libssh2.patch deleted file mode 100644 index b7054e0..0000000 --- a/src/stage3/patches/libssh2.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/PKGBUILD 2018-03-09 18:03:45.985573841 +0100 -+++ b/PKGBUILD 2018-03-09 18:05:41.493894934 +0100 -@@ -21,6 +21,13 @@ source=("https://www.libssh2.org/downloa - md5sums=('3d1147cae66e2959ea5441b183de1b1c' - 'SKIP') - -+prepare() { -+ cd "$pkgname-$pkgver" -+ -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd "$pkgname-$pkgver" - diff --git a/src/stage3/patches/libtasn1.patch b/src/stage3/patches/libtasn1.patch deleted file mode 100644 index fb8bf91..0000000 --- a/src/stage3/patches/libtasn1.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-06 07:14:22.926718733 +0100 -+++ b/PKGBUILD 2018-03-06 07:17:53.539642055 +0100 -@@ -16,6 +16,12 @@ sha256sums=('7e528e8c317ddd156230c4e31d0 - 'SKIP') - validpgpkeys=('1F42418905D8206AA754CCDC29EE58B996865171') #Nikos Mavrogiannopoulos <nmav@gnutls.org> - -+prepare() { -+ cd ${pkgname}-${pkgver} -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ diff --git a/src/stage3/patches/libtiff.patch b/src/stage3/patches/libtiff.patch index b6bcfbb..42e7893 100644 --- a/src/stage3/patches/libtiff.patch +++ b/src/stage3/patches/libtiff.patch @@ -1,6 +1,6 @@ --- a/PKGBUILD 2018-03-11 21:29:46.850580513 +0100 +++ b/PKGBUILD 2018-03-11 21:30:57.782201272 +0100 -@@ -9,11 +9,16 @@ arch=('x86_64') +@@ -9,7 +9,6 @@ arch=('x86_64') url="http://www.simplesystems.org/libtiff/" license=('custom') depends=('libjpeg' 'zlib' 'xz') @@ -8,13 +8,3 @@ optdepends=('freeglut: for using tiffgt') source=(http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz) sha256sums=('6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd') - -+prepare() { -+ cd tiff-${pkgver} -+ @CONFIG_SUB@ > config/config.sub -+ @CONFIG_GUESS@ > config/config.guess -+} -+ - build() { - cd tiff-${pkgver} - ./configure --prefix=/usr diff --git a/src/stage3/patches/libxau.patch b/src/stage3/patches/libxau.patch deleted file mode 100644 index 6dca170..0000000 --- a/src/stage3/patches/libxau.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-11 08:42:16.092254112 +0100 -+++ b/PKGBUILD 2018-03-11 08:43:50.488304733 +0100 -@@ -15,6 +15,12 @@ license=('custom') - source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) - sha256sums=('fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2') - -+prepare() { -+ cd libXau-${pkgver} -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd libXau-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc diff --git a/src/stage3/patches/libxdmcp.patch b/src/stage3/patches/libxdmcp.patch deleted file mode 100644 index 29f1033..0000000 --- a/src/stage3/patches/libxdmcp.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-11 21:12:28.281607458 +0100 -+++ b/PKGBUILD 2018-03-11 21:13:55.244343142 +0100 -@@ -16,6 +16,12 @@ sha256sums=('81fe09867918fff258296e1e1e1 - 'SKIP') - validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alan.coopersmith@oracle.com> - -+prepare() { -+ cd libXdmcp-${pkgver} -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd libXdmcp-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --disable-static diff --git a/src/stage3/patches/nettle.patch b/src/stage3/patches/nettle.patch index 874a35f..8afb45e 100644 --- a/src/stage3/patches/nettle.patch +++ b/src/stage3/patches/nettle.patch @@ -1,6 +1,6 @@ --- a/PKGBUILD 2018-03-06 17:51:17.168809244 +0100 +++ b/PKGBUILD 2018-03-06 17:53:43.157644481 +0100 -@@ -10,12 +10,16 @@ arch=('x86_64') +@@ -10,7 +10,6 @@ arch=('x86_64') url="https://www.lysator.liu.se/~nisse/nettle" license=('GPL2') depends=('gmp') @@ -8,16 +8,6 @@ source=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) sha256sums=('ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94' 'SKIP') - validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298') # Niels Möller <nisse@lysator.liu.se> - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} - - build() { - cd $pkgname-$pkgver @@ -24,11 +28,6 @@ build() { make } diff --git a/src/stage3/patches/npth.patch b/src/stage3/patches/npth.patch deleted file mode 100644 index 63d8861..0000000 --- a/src/stage3/patches/npth.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-02-28 18:14:30.650703312 +0100 -+++ b/PKGBUILD 2018-02-28 18:18:23.894843772 +0100 -@@ -17,6 +17,12 @@ source=("ftp://ftp.gnupg.org/gcrypt/${pk - sha256sums=('294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2' - 'SKIP') - -+prepare() { -+ cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-maintainer-mode diff --git a/src/stage3/patches/numactl.patch b/src/stage3/patches/numactl.patch deleted file mode 100644 index 7cc7349..0000000 --- a/src/stage3/patches/numactl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-15 19:34:23.378134553 +0100 -+++ b/PKGBUILD 2018-03-15 19:36:12.358273444 +0100 -@@ -13,6 +13,12 @@ source=(https://sources.archlinux.org/ot - md5sums=('d3bc88b7ddb9f06d60898f4816ae9127') - sha1sums=('0846670269824078a4eae8a977728175437b0da4') - -+prepare() { -+ cd "$srcdir/$pkgname-${pkgver/_/-}" -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd "$srcdir/$pkgname-${pkgver/_/-}" - ./configure --prefix=/usr diff --git a/src/stage3/patches/openmpi.patch b/src/stage3/patches/openmpi.patch new file mode 100644 index 0000000..0e8956b --- /dev/null +++ b/src/stage3/patches/openmpi.patch @@ -0,0 +1,20 @@ +--- a/PKGBUILD 2018-03-17 13:27:04.195349927 +0100 ++++ b/PKGBUILD 2018-03-17 13:43:25.922320165 +0100 +@@ -10,7 +10,7 @@ url='https://www.open-mpi.org' + arch=('x86_64') + license=('custom:OpenMPI') + depends=('libltdl' 'hwloc' 'openssh') +-makedepends=('inetutils' 'valgrind' 'gcc-fortran') ++makedepends=('gcc-fortran') + optdepends=('gcc-fortran: fortran support') + options=('staticlibs') + source=(https://www.open-mpi.org/software/ompi/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2) +@@ -28,8 +28,6 @@ build() { + --enable-smp-locks \ + --enable-builtin-atomics \ + --enable-mpi-cxx \ +- --with-valgrind \ +- --enable-memchecker \ + --enable-pretty-print-stacktrace \ + --without-slurm \ + --with-hwloc=/usr \ diff --git a/src/stage3/patches/openssh.patch b/src/stage3/patches/openssh.patch index 1380cd2..cca4a87 100644 --- a/src/stage3/patches/openssh.patch +++ b/src/stage3/patches/openssh.patch @@ -8,12 +8,3 @@ depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') -@@ -37,6 +36,8 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/ss - - prepare() { - cd $pkgname-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - # OpenSSL 1.1.0 patch from http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html - patch -Np1 -i ../openssl-1.1.0.patch - } diff --git a/src/stage3/patches/pam.patch b/src/stage3/patches/pam.patch index 6029db7..17ddc16 100644 --- a/src/stage3/patches/pam.patch +++ b/src/stage3/patches/pam.patch @@ -9,22 +9,6 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment) source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2 https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 -@@ -24,8 +24,15 @@ options=('!emptydirs') - prepare () { - cd $srcdir/Linux-PAM-$pkgver - -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+ - # fix pam_unix2 building - cd $srcdir/pam_unix2-2.9.1 -+ -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+ - patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch" - } - @@ -64,5 +71,5 @@ package() { chmod +s $pkgdir/usr/bin/unix_chkpwd # remove doc which is not used anymore diff --git a/src/stage3/patches/pcre.patch b/src/stage3/patches/pcre.patch index 2ab0b23..8124d1a 100644 --- a/src/stage3/patches/pcre.patch +++ b/src/stage3/patches/pcre.patch @@ -1,14 +1,5 @@ --- a/PKGBUILD 2018-03-09 18:37:49.072472938 +0100 +++ b/PKGBUILD 2018-03-09 18:55:09.707917296 +0100 -@@ -20,6 +20,8 @@ md5sums=('c160d22723b1670447341b08c58981 - prepare() { - cd $pkgname-$pkgver - # apply patch from the source array (should be a pacman feature) -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then @@ -37,7 +39,7 @@ build() { --enable-unicode-properties \ --enable-pcre16 \ diff --git a/src/stage3/patches/popt.patch b/src/stage3/patches/popt.patch deleted file mode 100644 index 694a925..0000000 --- a/src/stage3/patches/popt.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-01 13:40:15.003223269 +0100 -+++ b/PKGBUILD 2018-03-01 13:40:15.003223269 +0100 -@@ -13,6 +13,12 @@ options=('staticlibs') - source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) - sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') - -+prepare() { -+ cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr diff --git a/src/stage3/patches/quota-tools.patch b/src/stage3/patches/quota-tools.patch deleted file mode 100644 index 6f2e83c..0000000 --- a/src/stage3/patches/quota-tools.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-16 16:30:38.465266947 +0100 -+++ b/PKGBUILD 2018-03-16 16:38:53.114207732 +0100 -@@ -15,6 +15,12 @@ options=('!emptydirs') - source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz) - sha1sums=('38e6cc7538d504891a8454bbdabef058bd1adc11') - -+prepare() { -+ cd quota-$pkgver -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess -+} -+ - build() { - cd quota-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc diff --git a/src/stage3/patches/rarian.patch b/src/stage3/patches/rarian.patch deleted file mode 100644 index 6aad942..0000000 --- a/src/stage3/patches/rarian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/PKGBUILD 2018-03-16 21:08:46.056804383 +0100 -+++ b/PKGBUILD 2018-03-16 21:09:56.648603235 +0100 -@@ -19,6 +19,8 @@ sha256sums=('aafe886d46e467eb3414e91fa9e - - prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - patch -Np0 -i ../user-segfault.patch - } - diff --git a/src/stage3/patches/readline.patch b/src/stage3/patches/readline.patch deleted file mode 100644 index 4614898..0000000 --- a/src/stage3/patches/readline.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/PKGBUILD 2018-03-09 18:22:05.862795132 +0100 -+++ b/PKGBUILD 2018-03-09 18:32:34.482624212 +0100 -@@ -33,6 +33,9 @@ prepare() { - patch -p0 -i ../readline${_basever//.}-$(printf "%03d" $_p) - done - -+ @CONFIG_SUB@ > support/config.sub -+ @CONFIG_GUESS@ > support/config.guess -+ - # remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - } diff --git a/src/stage3/patches/sqlite.patch b/src/stage3/patches/sqlite.patch deleted file mode 100644 index bd203ad..0000000 --- a/src/stage3/patches/sqlite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/PKGBUILD 2018-03-10 08:11:02.567216062 +0100 -+++ b/PKGBUILD 2018-03-10 08:35:53.054110236 +0100 -@@ -25,6 +25,8 @@ sha1sums=('2bc86f2c63868cebd0db913843b91 - prepare() { - cd sqlite-src-$_srcver - # autoreconf -vfi -+ @CONFIG_SUB@ > config.sub -+ @CONFIG_GUESS@ > config.guess - } - - build() { diff --git a/src/stage3/patches/texinfo.patch b/src/stage3/patches/texinfo.patch deleted file mode 100644 index 3844483..0000000 --- a/src/stage3/patches/texinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/PKGBUILD 2018-03-09 19:17:11.280782814 +0100 -+++ b/PKGBUILD 2018-03-09 19:22:42.182761210 +0100 -@@ -21,6 +21,12 @@ md5sums=('3715197e62e0e07f85860b3d7aab55 - '5590fb3ef9ec309c98f5a4d85eca49da') - validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith - -+prepare() { -+ cd $pkgname-$pkgver -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr diff --git a/src/stage3/patches/xz.patch b/src/stage3/patches/xz.patch index 6fd2421..bf330c6 100644 --- a/src/stage3/patches/xz.patch +++ b/src/stage3/patches/xz.patch @@ -1,17 +1,6 @@ --- a/PKGBUILD 2018-03-06 11:20:55.826629242 +0100 +++ b/PKGBUILD 2018-03-06 11:53:47.263709120 +0100 -@@ -15,12 +15,18 @@ md5sums=('ef68674fb47a8b8e741b34e429d86e - 'SKIP') - validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') - -+prepare() { -+ cd ${srcdir}/${pkgname}-${pkgver} -+ @CONFIG_SUB@ > build-aux/config.sub -+ @CONFIG_GUESS@ > build-aux/config.guess -+} -+ - build() { - cd ${srcdir}/${pkgname}-${pkgver} +@@ -15,7 +15,7 @@ md5sums=('ef68674fb47a8b8e741b34e429d86e ./configure --prefix=/usr \ --disable-rpath \ diff --git a/src/stage3/prepare_chroot.sh b/src/stage3/prepare_chroot.sh index 532b59a..354917b 100644 --- a/src/stage3/prepare_chroot.sh +++ b/src/stage3/prepare_chroot.sh @@ -91,3 +91,14 @@ librechroot \ -C "$_builddir"/config/pacman.conf \ -M "$_builddir"/config/makepkg.conf \ update + +# produce a patched libremakepkg to update config.sub/config.guess where needed +cat $(which libremakepkg) > "$_builddir"/libremakepkg-$CARCH.sh +sed -i '/Boring\/mundane/i \ +update_config_fragments() {\ + local url="https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain"\ + find $1/build -iname config.sub -print -exec curl "$url;f=config.sub;hb=HEAD" -o {} \\;\ + find $1/build -iname config.guess -print -exec curl "$url;f=config.guess;hb=HEAD" -o {} \\;\ +}\ +hook_pre_build+=(update_config_fragments)' "$_builddir"/libremakepkg-$CARCH.sh + diff --git a/src/stage3/prepare_deptree.sh b/src/stage3/prepare_deptree.sh index 1f53b47..3332c2c 100644 --- a/src/stage3/prepare_deptree.sh +++ b/src/stage3/prepare_deptree.sh @@ -43,7 +43,7 @@ if [ "x$_have_deptree" == "xno" ]; then _pkgdeps=$(pacman -Si $_pkgname | grep '^Depends' | cut -d':' -f2 | sed 's/None//') - # add some additional build-time dependencies + # tweak some build-time dependencies case $_pkgname in binutils) _pkgdeps+=" git dejagnu bc" ;; @@ -51,6 +51,8 @@ if [ "x$_have_deptree" == "xno" ]; then _pkgdeps+=" cmake" ;; boost-libs|boost) _pkgdeps+=" python-numpy python2-numpy openmpi" ;; + dbus) + _pkgdeps+=" autoconf-archive" ;; gcc-libs) _pkgdeps+=" dejagnu libmpc mpfr gmp" ;; git) @@ -117,7 +119,7 @@ if [ "x$_have_deptree" == "xno" ]; then done done - # following is a bit of magic to untangle the build dependencies + echo -en "\r" # write package dependency tree truncate -s0 "$_deptree".FULL diff --git a/src/stage3/stage3.sh b/src/stage3/stage3.sh index 885dfc4..ce19438 100755 --- a/src/stage3/stage3.sh +++ b/src/stage3/stage3.sh @@ -111,12 +111,8 @@ EOF cp PKGBUILD{,.in} # substitute common variables - _config="https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain" - _config_sub="$_config;f=config.sub;hb=HEAD" - _config_guess="$_config;f=config.guess;hb=HEAD" - sed -i "s#@CONFIG_SUB@#curl \"$_config_sub\"#g; \ - s#@CONFIG_GUESS@#curl \"$_config_guess\"#g; \ - s#@MULTILIB@#${MULTILIB:-disable}#g" \ + sed -i \ + "s#@MULTILIB@#${MULTILIB:-disable}#g" \ PKGBUILD # enable the target CARCH in arch array @@ -124,7 +120,7 @@ EOF # build the package chown -R $SUDO_USER "$_makepkgdir"/$_pkgname - libremakepkg -n $CHOST-stage3 || failed_build + $_builddir/libremakepkg-$CARCH.sh -n $CHOST-stage3 || failed_build fi popd >/dev/null |