LIBC_SLIBDIR_RTLDDIR: substitute arguments in single quotes
Commit Message
The arguments of the LIBC_SLIBDIR_RTLDDIR macro are used both in unquoted
and single quoted context, so that neither shell nor makefile variable
references work. Consistently put them in single quotes so that they can
refer to makefile variables.
---
ChangeLog | 14 ++++++++++++++
aclocal.m4 | 4 ++--
sysdeps/gnu/configure | 4 ++--
sysdeps/unix/sysv/linux/aarch64/configure | 4 ++--
sysdeps/unix/sysv/linux/mips/configure | 8 ++++----
sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 4 ++--
sysdeps/unix/sysv/linux/s390/s390-64/configure | 4 ++--
sysdeps/unix/sysv/linux/sparc/sparc64/configure | 4 ++--
sysdeps/unix/sysv/linux/tile/configure | 4 ++--
sysdeps/unix/sysv/linux/x86_64/64/configure | 4 ++--
sysdeps/unix/sysv/linux/x86_64/x32/configure | 4 ++--
11 files changed, 36 insertions(+), 22 deletions(-)
Comments
On 01/25/2018 02:00 AM, Andreas Schwab wrote:
> The arguments of the LIBC_SLIBDIR_RTLDDIR macro are used both in unquoted
> and single quoted context, so that neither shell nor makefile variable
> references work. Consistently put them in single quotes so that they can
> refer to makefile variables.
> ---
> ChangeLog | 14 ++++++++++++++
> aclocal.m4 | 4 ++--
> sysdeps/gnu/configure | 4 ++--
> sysdeps/unix/sysv/linux/aarch64/configure | 4 ++--
> sysdeps/unix/sysv/linux/mips/configure | 8 ++++----
> sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 4 ++--
> sysdeps/unix/sysv/linux/s390/s390-64/configure | 4 ++--
> sysdeps/unix/sysv/linux/sparc/sparc64/configure | 4 ++--
> sysdeps/unix/sysv/linux/tile/configure | 4 ++--
> sysdeps/unix/sysv/linux/x86_64/64/configure | 4 ++--
> sysdeps/unix/sysv/linux/x86_64/x32/configure | 4 ++--
> 11 files changed, 36 insertions(+), 22 deletions(-)
LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
On Thu, 25 Jan 2018, Andreas Schwab wrote:
> The arguments of the LIBC_SLIBDIR_RTLDDIR macro are used both in unquoted
> and single quoted context, so that neither shell nor makefile variable
> references work. Consistently put them in single quotes so that they can
> refer to makefile variables.
Is there some sequence of operations that demonstrates breakage arising
from this inconsistency, or is it just a cleanup?
(There's at least one bug report - bug 6441 - related to this code, but
that looks unrelated.)
On Jan 25 2018, Joseph Myers <joseph@codesourcery.com> wrote:
> Is there some sequence of operations that demonstrates breakage arising
> from this inconsistency, or is it just a cleanup?
The previous version of the RISC-V patches were broken by this, though
the current incarnation use a different approach, so this is no longer a
prerequisite. But there may be room for improvement now.
Andreas.
@@ -1,3 +1,17 @@
+2018-01-25 Andreas Schwab <schwab@suse.de>
+
+ * aclocal.m4 (LIBC_SLIBDIR_RTLDDIR): Consistently put arguments in
+ single quotes.
+ * sysdeps/gnu/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/aarch64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/mips/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/s390/s390-64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/tile/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/x86_64/64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/x86_64/x32/configure: Regenerate.
+
2018-01-25 Samuel Thibault <samuel.thibault@ens-lyon.org>
* scripts/build-many-glibcs.py (checkout_vcs): Add hurd repository
@@ -293,8 +293,8 @@ AC_DEFUN([LIBC_SLIBDIR_RTLDDIR],
[test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/$1
- libc_cv_rtlddir=/$2
+ libc_cv_slibdir='/$1'
+ libc_cv_rtlddir='/$2'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/$1';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -9,8 +9,8 @@
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib
- libc_cv_rtlddir=/lib
+ libc_cv_slibdir='/lib'
+ libc_cv_rtlddir='/lib'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -6,8 +6,8 @@ arch_minimum_kernel=3.7.0
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib64
- libc_cv_rtlddir=/lib
+ libc_cv_slibdir='/lib64'
+ libc_cv_rtlddir='/lib'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -442,8 +442,8 @@ mips/mips64/n64/*)
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib64
- libc_cv_rtlddir=/lib64
+ libc_cv_slibdir='/lib64'
+ libc_cv_rtlddir='/lib64'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -456,8 +456,8 @@ mips/mips64/n32/*)
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib32
- libc_cv_rtlddir=/lib32
+ libc_cv_slibdir='/lib32'
+ libc_cv_rtlddir='/lib32'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib32';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -4,8 +4,8 @@
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib64
- libc_cv_rtlddir=/lib64
+ libc_cv_slibdir='/lib64'
+ libc_cv_rtlddir='/lib64'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -4,8 +4,8 @@
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib64
- libc_cv_rtlddir=/lib
+ libc_cv_slibdir='/lib64'
+ libc_cv_rtlddir='/lib'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -4,8 +4,8 @@
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib64
- libc_cv_rtlddir=/lib64
+ libc_cv_slibdir='/lib64'
+ libc_cv_rtlddir='/lib64'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -8,8 +8,8 @@ tile/tilegx32)
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib32
- libc_cv_rtlddir=/lib32
+ libc_cv_slibdir='/lib32'
+ libc_cv_rtlddir='/lib32'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib32';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -4,8 +4,8 @@
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/lib64
- libc_cv_rtlddir=/lib64
+ libc_cv_slibdir='/lib64'
+ libc_cv_rtlddir='/lib64'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
@@ -6,8 +6,8 @@ arch_minimum_kernel=3.4.0
test -n "$libc_cv_slibdir" ||
case "$prefix" in
/usr | /usr/)
- libc_cv_slibdir=/libx32
- libc_cv_rtlddir=/libx32
+ libc_cv_slibdir='/libx32'
+ libc_cv_rtlddir='/libx32'
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/libx32';
# Locale data can be shared between 32-bit and 64-bit libraries.