public inbox for libc-ports@sourceware.org
 help / color / mirror / Atom feed
From: Andreas Schwab <schwab@suse.de>
To: Marcus Shawcroft <marcus.shawcroft@linaro.org>
Cc: libc-ports@sourceware.org
Subject: [PATCH] aarch64: use lib64 as default lib and slib directory
Date: Wed, 13 Mar 2013 11:33:00 -0000	[thread overview]
Message-ID: <mvmd2v3o7om.fsf@hawking.suse.de> (raw)

The default (s)libdir for aarch64 should be /lib64.

Andreas.

	* sysdeps/unix/sysv/linux/aarch64/configure.in: Set
	libc_cv_slibdir, libdir and libc_cv_localedir.
	* sysdeps/unix/sysv/linux/aarch64/configure.in: Regenerate.

diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure b/ports/sysdeps/unix/sysv/linux/aarch64/configure
index 5a22126..04b6c81 100644
--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure
@@ -1,3 +1,16 @@
 # 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
+
+test -n "$libc_cv_slibdir" ||
+case "$prefix" in
+  /usr | /usr/)
+    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
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
index d1995d4..6596a15 100644
--- a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
@@ -2,3 +2,15 @@ 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
+
+test -n "$libc_cv_slibdir" ||
+case "$prefix" in
+  /usr | /usr/)
+    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
-- 
1.8.1.5

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

             reply	other threads:[~2013-03-13 11:33 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-13 11:33 Andreas Schwab [this message]
2013-03-13 13:42 ` Carlos O'Donell
2013-03-13 13:47   ` Jakub Jelinek
2013-03-13 14:57     ` Carlos O'Donell
2013-03-14  8:40       ` Marcus Shawcroft
2013-03-13 16:29     ` Joseph S. Myers
2013-03-14  7:58       ` Jakub Jelinek
2013-03-14  8:46       ` Marcus Shawcroft
2013-03-14 15:12         ` Carlos O'Donell
2013-03-18 11:25           ` Marcus Shawcroft
2013-03-18 11:41             ` Jakub Jelinek
2013-03-15 14:53 ` Marcus Shawcroft
2013-03-15 16:16   ` Joseph S. Myers
2013-03-15 18:11     ` Mike Frysinger
2013-03-18 11:53   ` [PATCH] Add support for rtld directory different from " Andreas Schwab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=mvmd2v3o7om.fsf@hawking.suse.de \
    --to=schwab@suse.de \
    --cc=libc-ports@sourceware.org \
    --cc=marcus.shawcroft@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).