[arch-commits] Commit in aarch64-linux-gnu-glibc/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Thursday, April 18, 2019 @ 01:05:05
  Author: eschwartz
Revision: 451961

upgpkg: aarch64-linux-gnu-glibc 2.28-2

Adopt, reorganize headers/libraries to fit the cross-compiler directory layout
and deduplicate arch-independent data with core/glibc. Fixes FS#61504

Move rtld to /usr/lib to match what gcc adds to PT_INTERP, in order to be more
friendly to e.g. qemu-user or other attempts to execute cross-compiled dynamic
executables.

Modified:
  aarch64-linux-gnu-glibc/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-17 23:29:53 UTC (rev 451960)
+++ PKGBUILD	2019-04-18 01:05:05 UTC (rev 451961)
@@ -1,9 +1,10 @@
 # Maintainer: Anatol Pomozov
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
 
 _target=aarch64-linux-gnu
 pkgname=$_target-glibc
 pkgver=2.28
-pkgrel=1
+pkgrel=2
 _commit=be176490b818b65b5162c332eb6b581690b16e5c
 pkgdesc="GNU C Library ARM64 target"
 arch=(any)
@@ -23,10 +24,10 @@
 build() {
   cd glibc-build
 
-  echo "slibdir=/lib" >> configparms
-  echo "rtlddir=/lib" >> configparms
-  echo "sbindir=/bin" >> configparms
-  echo "rootsbindir=/bin" >> configparms
+  echo "slibdir=/usr/${_target}/lib" >> configparms
+  echo "rtlddir=/usr/lib" >> configparms
+  echo "sbindir=/usr/bin" >> configparms
+  echo "rootsbindir=/usr/bin" >> configparms
 
   # remove hardening options for building libraries
   export CFLAGS="-U_FORTIFY_SOURCE -mlittle-endian -O2"
@@ -44,8 +45,9 @@
       --target=$_target \
       --host=$_target \
       --build=$CHOST \
-      --libdir=/usr/lib \
-      --libexecdir=/usr/lib \
+      --includedir=/usr/${_target}/include \
+      --libdir=/usr/${_target}/lib \
+      --libexecdir=/usr/${_target}/lib \
       --with-headers=/usr/$_target/include \
       --with-bugurl=https://bugs.archlinux.org/ \
       --enable-add-ons \
@@ -65,7 +67,7 @@
 package() {
   cd glibc-build
 
-  make install_root=$pkgdir/usr/$_target install
+  make install_root="$pkgdir" install
 
-  rm -rf $pkgdir/usr/$_target/{bin,sbin,etc,share,var}
+  rm -r "$pkgdir"/{etc,usr/share,var}
 }