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

[Eli Schwartz]

    Date: Friday, April 19, 2019 @ 17:51:55
  Author: eschwartz
Revision: 452039

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

fix loader script installed as libc.so; it is easier to pretend everything is
being installed to $DESTDIR/usr/$_target

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 17:50:49 UTC (rev 452038)
+++ PKGBUILD	2019-04-19 17:51:55 UTC (rev 452039)
@@ -4,7 +4,7 @@
 _target=aarch64-linux-gnu
 pkgname=$_target-glibc
 pkgver=2.28
-pkgrel=2
+pkgrel=3
 _commit=be176490b818b65b5162c332eb6b581690b16e5c
 pkgdesc="GNU C Library ARM64 target"
 arch=(any)
@@ -24,10 +24,10 @@
 build() {
   cd glibc-build
 
-  echo "slibdir=/usr/${_target}/lib" >> configparms
-  echo "rtlddir=/usr/lib" >> configparms
-  echo "sbindir=/usr/bin" >> configparms
-  echo "rootsbindir=/usr/bin" >> configparms
+  echo "slibdir=/lib" >> configparms
+  echo "rtlddir=/lib" >> configparms
+  echo "sbindir=/bin" >> configparms
+  echo "rootsbindir=/bin" >> configparms
 
   # remove hardening options for building libraries
   export CFLAGS="-U_FORTIFY_SOURCE -mlittle-endian -O2"
@@ -45,9 +45,9 @@
       --target=$_target \
       --host=$_target \
       --build=$CHOST \
-      --includedir=/usr/${_target}/include \
-      --libdir=/usr/${_target}/lib \
-      --libexecdir=/usr/${_target}/lib \
+      --includedir=/include \
+      --libdir=/lib \
+      --libexecdir=/lib \
       --with-headers=/usr/$_target/include \
       --with-bugurl=https://bugs.archlinux.org/ \
       --enable-add-ons \
@@ -67,7 +67,7 @@
 package() {
   cd glibc-build
 
-  make install_root="$pkgdir" install
+  make install_root="$pkgdir"/usr/$_target install
 
-  rm -r "$pkgdir"/{etc,usr/share,var}
+  rm -r "$pkgdir"/usr/$_target/{etc,usr/share,var}
 }