e5ed97dcc4
- Update crypt ABI for aarch64 - Use lib64 for aarch64 and add link for /lib/ld-linux-aarch64.so.1 - Don't build profiling libraries for aarch64 OBS-URL: https://build.opensuse.org/request/show/155840 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=272
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure b/ports/sysdeps/unix/sysv/linux/aarch64/configure
|
|
index 5a22126..b806d27 100644
|
|
--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure
|
|
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure
|
|
@@ -1,3 +1,22 @@
|
|
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
|
|
+ # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
|
|
|
|
arch_minimum_kernel=3.7.0
|
|
+
|
|
+case "$prefix" in
|
|
+/usr | /usr/)
|
|
+ # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
|
|
+ # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
|
|
+ # and libc_cv_localedir.
|
|
+ test -n "$libc_cv_slibdir" ||
|
|
+ case $machine in
|
|
+ aarch64*)
|
|
+ libc_cv_slibdir="/lib64"
|
|
+ if test "$libdir" = '${exec_prefix}/lib'; then
|
|
+ libdir='${exec_prefix}/lib64';
|
|
+ # Locale data can be shared between 32bit and 64bit libraries
|
|
+ libc_cv_localedir='${exec_prefix}/lib/locale'
|
|
+ fi
|
|
+ ;;
|
|
+ esac
|
|
+esac
|
|
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
|
|
index d1995d4..e93fb3a 100644
|
|
--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
|
|
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
|
|
@@ -2,3 +2,21 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
|
|
# Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
|
|
|
|
arch_minimum_kernel=3.7.0
|
|
+
|
|
+case "$prefix" in
|
|
+/usr | /usr/)
|
|
+ # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
|
|
+ # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
|
|
+ # and libc_cv_localedir.
|
|
+ test -n "$libc_cv_slibdir" ||
|
|
+ case $machine in
|
|
+ aarch64*)
|
|
+ libc_cv_slibdir="/lib64"
|
|
+ if test "$libdir" = '${exec_prefix}/lib'; then
|
|
+ libdir='${exec_prefix}/lib64';
|
|
+ # Locale data can be shared between 32bit and 64bit libraries
|
|
+ libc_cv_localedir='${exec_prefix}/lib/locale'
|
|
+ fi
|
|
+ ;;
|
|
+ esac
|
|
+esac
|