# HG changeset patch # User Bruno Haible # Date 1551716704 -3600 # Node ID 9e8fb35d403237695221516d5f53f751e05f441b # Parent db8428454956beff2c9b8332ee1328dc74b3e406 relocatable-prog: Revert "Use wrapper-free installation on Mac OS X." * build-aux/install-reloc: Revert change. * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Likewise. diff -r db8428454956 -r 9e8fb35d4032 ChangeLog --- a/ChangeLog Sun Mar 03 14:09:37 2019 -0800 +++ b/ChangeLog Mon Mar 04 17:25:04 2019 +0100 @@ -1,3 +1,9 @@ +2019-03-04 Bruno Haible + + relocatable-prog: Revert "Use wrapper-free installation on Mac OS X." + * build-aux/install-reloc: Revert change. + * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Likewise. + 2019-02-24 Paul Eggert nstrftime: support the ‘+’ flag diff -r db8428454956 -r 9e8fb35d4032 build-aux/install-reloc --- a/build-aux/install-reloc Sun Mar 03 14:09:37 2019 -0800 +++ b/build-aux/install-reloc Mon Mar 04 17:25:04 2019 +0100 @@ -1,8 +1,5 @@ #!/bin/sh -# install-reloc - install a program in a way that it will find its shared -# libraries even when relocated, -# - either including a relocating wrapper, -# - or using Mac OS X specific tools. +# install-reloc - install a program including a relocating wrapper # Copyright (C) 2003-2019 Free Software Foundation, Inc. # Written by Bruno Haible , 2003. # @@ -20,15 +17,10 @@ # along with this program. If not, see . # Usage 1: -# install-reloc -- 'wrapper' \ -# library_path_var library_path_value prefix destdir \ +# install-reloc -- library_path_var library_path_value prefix destdir \ # compile_command srcdir builddir config_h_dir exeext \ # strip_command \ # install_command... destprog -# install-reloc -- 'macosx' \ -# prefix destdir \ -# strip_command \ -# install_command... destprog # where # - library_path_var is the platform dependent runtime library path variable # - library_path_value is a colon separated list of directories that contain @@ -48,8 +40,7 @@ # - install_command is the install command line, excluding the final destprog # - destprog is the destination program name # Usage 2: -# env RELOC_MODE='wrapper' \ -# RELOC_LIBRARY_PATH_VAR=library_path_var \ +# env RELOC_LIBRARY_PATH_VAR=library_path_var \ # RELOC_LIBRARY_PATH_VALUE=library_path_value \ # RELOC_PREFIX=prefix \ # RELOC_DESTDIR=destdir \ @@ -60,120 +51,59 @@ # RELOC_EXEEXT=exeext \ # RELOC_STRIP_PROG=strip_command \ # RELOC_INSTALL_PROG=install_command... \ -# install-reloc prog1 ... destprog -# env RELOC_MODE='macosx' \ -# RELOC_PREFIX=prefix \ -# RELOC_DESTDIR=destdir \ -# RELOC_STRIP_PROG=strip_command \ -# RELOC_INSTALL_PROG=install_command... \ -# install-reloc prog1 ... destprog +# install-reloc prog1 ... destprog # where destprog is either the destination program name (when only one program # is specified) or the destination directory for all programs. -# In the 'wrapper' mode, install-reloc renames destprog to destprog.bin and -# installs a relocating wrapper in the place of destprog. +# install-reloc renames destprog to destprog.bin and installs a relocating +# wrapper in the place of destprog. progname=$0 -func_usage () -{ - echo "Usage: $0 -- 'wrapper'" \ - "library_path_var library_path_value prefix destdir" \ - "compile_command srcdir builddir config_h_dir exeext" \ - "strip_command" \ - "install_command... destprog" - echo "Usage: $0 -- 'macosx'" \ - "prefix destdir" \ - "strip_command" \ - "install_command... destprog" -} - -if test "x$1" = "x--"; then +if test $# -ge 12 && test "x$1" = "x--"; then # Get fixed position arguments. - case "$2" in - wrapper) - if test $# -ge 13; then - mode=$2 - shift - shift - library_path_var=$1 - library_path_value=$2 - prefix=$3 - destdir=$4 - shift - shift - shift - shift - compile_command=$1 - srcdir=$2 - builddir=$3 - config_h_dir=$4 - exeext=$5 - shift - shift - shift - shift - shift - strip_prog=$1 - shift - install_prog=$1 # maybe not including the "-c" option - shift - else - func_usage 1>&2; exit 1 - fi - ;; - macosx) - if test $# -ge 6; then - mode=$2 - shift - shift - prefix=$1 - destdir=$2 - shift - shift - exeext= - strip_prog=$1 - shift - install_prog=$1 # maybe not including the "-c" option - shift - else - func_usage 1>&2; exit 1 - fi - ;; - *) - func_usage 1>&2; exit 1 - ;; - esac + shift + library_path_var=$1 + library_path_value=$2 + prefix=$3 + destdir=$4 + shift + shift + shift + shift + compile_command=$1 + srcdir=$2 + builddir=$3 + config_h_dir=$4 + exeext=$5 + shift + shift + shift + shift + shift + strip_prog=$1 + shift + install_prog=$1 # maybe not including the "-c" option + shift else if test $# -ge 2; then # Get arguments from environment variables. - mode=$RELOC_MODE - case "$mode" in - wrapper) - library_path_var=$RELOC_LIBRARY_PATH_VAR - library_path_value=$RELOC_LIBRARY_PATH_VALUE - prefix=$RELOC_PREFIX - destdir=$RELOC_DESTDIR - compile_command=$RELOC_COMPILE_COMMAND - srcdir=$RELOC_SRCDIR - builddir=$RELOC_BUILDDIR - config_h_dir=$RELOC_CONFIG_H_DIR - exeext=$RELOC_EXEEXT - strip_prog=$RELOC_STRIP_PROG - install_prog=$RELOC_INSTALL_PROG # including the "-c" option - ;; - macosx) - prefix=$RELOC_PREFIX - destdir=$RELOC_DESTDIR - exeext= - strip_prog=$RELOC_STRIP_PROG - install_prog=$RELOC_INSTALL_PROG # including the "-c" option - ;; - *) - func_usage 1>&2; exit 1 - ;; - esac + library_path_var=$RELOC_LIBRARY_PATH_VAR + library_path_value=$RELOC_LIBRARY_PATH_VALUE + prefix=$RELOC_PREFIX + destdir=$RELOC_DESTDIR + compile_command=$RELOC_COMPILE_COMMAND + srcdir=$RELOC_SRCDIR + builddir=$RELOC_BUILDDIR + config_h_dir=$RELOC_CONFIG_H_DIR + exeext=$RELOC_EXEEXT + strip_prog=$RELOC_STRIP_PROG + install_prog=$RELOC_INSTALL_PROG # including the "-c" option else - func_usage 1>&2; exit 1 + echo "Usage: $0 -- library_path_var library_path_value prefix destdir" \ + "compile_command srcdir builddir config_h_dir exeext" \ + "strip_command" \ + "install_command... destprog" 1>&2 + exit 1 fi fi @@ -251,13 +181,30 @@ func_iterate func_strip fi +# If the platform doesn't support LD_LIBRARY_PATH or similar, we cannot build +# a wrapper. +test -n "$library_path_var" || exit 0 + +libdirs= +save_IFS="$IFS"; IFS=":" +for dir in $library_path_value; do + IFS="$save_IFS" + if test -n "$dir"; then + case "$libdirs" in + *"\"$dir\""*) ;; # remove duplicate + *) libdirs="$libdirs\"$dir\"," ;; + esac + fi +done +IFS="$save_IFS" +# If there are no library directories to add at runtime, we don't need a +# wrapper. +test -n "$libdirs" || exit 0 + # Determine installdir from destprog, removing a leading destdir if present. if test -n "$destprog_directory"; then - # There's possibly multiple programs to install, but all go into the same - # directory. installdir="$destprog_directory" else - # There's only one program to install. installdir=`echo "$destprog" | sed -e 's,/[^/]*$,,'` fi if test -n "$destdir"; then @@ -266,160 +213,68 @@ installdir=`echo "$installdir" | sed -e "$sed_remove_destdir"` fi -# func_relativize DIR1 DIR2 -# computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2. -# Input: -# - DIR1 relative pathname, relative to the current directory -# - DIR2 relative pathname, relative to the current directory -# Output: -# - reldir relative pathname of DIR2, relative to DIR1 -func_relativize () +# Compile and install wrapper. +func_create_wrapper () { - dir0=`pwd` - dir1="$1" - dir2="$2" - sed_first='s,^\([^/]*\)/.*$,\1,' - sed_rest='s,^[^/]*/*,,' - sed_last='s,^.*/\([^/]*\)$,\1,' - sed_butlast='s,/*[^/]*$,,' - while test -n "$dir1"; do - first=`echo "$dir1" | sed -e "$sed_first"` - if test "$first" != "."; then - if test "$first" = ".."; then - dir2=`echo "$dir0" | sed -e "$sed_last"`/"$dir2" - dir0=`echo "$dir0" | sed -e "$sed_butlast"` - else - first2=`echo "$dir2" | sed -e "$sed_first"` - if test "$first2" = "$first"; then - dir2=`echo "$dir2" | sed -e "$sed_rest"` - else - dir2="../$dir2" - fi - dir0="$dir0"/"$first" - fi - fi - dir1=`echo "$dir1" | sed -e "$sed_rest"` - done - reldir="$dir2" -} - -case "$mode" in - - wrapper) - # If the platform doesn't support LD_LIBRARY_PATH or similar, we cannot - # build a wrapper. - test -n "$library_path_var" || exit 0 - - libdirs= - save_IFS="$IFS"; IFS=":" - for dir in $library_path_value; do - IFS="$save_IFS" - if test -n "$dir"; then - case "$libdirs" in - *"\"$dir\""*) ;; # remove duplicate - *) libdirs="$libdirs\"$dir\"," ;; - esac - fi - done - IFS="$save_IFS" - # If there are no library directories to add at runtime, we don't need a - # wrapper. - test -n "$libdirs" || exit 0 - - # Compile and install wrapper. - func_create_wrapper () - { - # Remove trailing $exeext, if present. - if test -n "$exeext"; then - destprog=`echo "$destprog" | sed -e "$sed_remove_exeext"` - fi + # Remove trailing $exeext, if present. + if test -n "$exeext"; then + destprog=`echo "$destprog" | sed -e "$sed_remove_exeext"` + fi - # Compile wrapper. - func_verbose $compile_command \ - -I"$builddir" -I"$srcdir" -I"$config_h_dir" \ - -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC \ - -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" \ - -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" \ - -D"EXEEXT=\"$exeext\"" \ - "$srcdir"/relocwrapper.c \ - "$srcdir"/progname.c \ - "$srcdir"/progreloc.c \ - "$srcdir"/areadlink.c \ - "$srcdir"/careadlinkat.c \ - "$srcdir"/allocator.c \ - "$srcdir"/readlink.c \ - "$srcdir"/stat.c \ - "$srcdir"/canonicalize-lgpl.c \ - "$srcdir"/malloca.c \ - "$srcdir"/lstat.c \ - "$srcdir"/relocatable.c \ - "$srcdir"/setenv.c \ - "$srcdir"/c-ctype.c \ - -o "$destprog.wrapper$exeext" - rc=$? - # Clean up object files left over in the current directory by the native C - # compilers on Solaris, HP-UX, OSF/1, IRIX. - rm -f relocwrapper.o \ - progname.o \ - progreloc.o \ - areadlink.o \ - careadlinkat.o \ - allocator.o \ - readlink.o \ - stat.o \ - canonicalize-lgpl.o \ - malloca.o \ - lstat.o \ - relocatable.o \ - setenv.o \ - c-ctype.o - test $rc = 0 || exit $? - # Clean up debugging information left over by the native C compiler on - # Mac OS X. - rm -rf "$destprog.wrapper$exeext.dSYM" - test $rc = 0 || exit $? + # Compile wrapper. + func_verbose $compile_command \ + -I"$builddir" -I"$srcdir" -I"$config_h_dir" \ + -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC \ + -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" \ + -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" \ + -D"EXEEXT=\"$exeext\"" \ + "$srcdir"/relocwrapper.c \ + "$srcdir"/progname.c \ + "$srcdir"/progreloc.c \ + "$srcdir"/areadlink.c \ + "$srcdir"/careadlinkat.c \ + "$srcdir"/allocator.c \ + "$srcdir"/readlink.c \ + "$srcdir"/stat.c \ + "$srcdir"/canonicalize-lgpl.c \ + "$srcdir"/malloca.c \ + "$srcdir"/lstat.c \ + "$srcdir"/relocatable.c \ + "$srcdir"/setenv.c \ + "$srcdir"/c-ctype.c \ + -o "$destprog.wrapper$exeext" + rc=$? + # Clean up object files left over in the current directory by the native C + # compilers on Solaris, HP-UX, OSF/1, IRIX. + rm -f relocwrapper.o \ + progname.o \ + progreloc.o \ + areadlink.o \ + careadlinkat.o \ + allocator.o \ + readlink.o \ + stat.o \ + canonicalize-lgpl.o \ + malloca.o \ + lstat.o \ + relocatable.o \ + setenv.o \ + c-ctype.o + test $rc = 0 || exit $? + # Clean up debugging information left over by the native C compiler on MacOS X. + rm -rf "$destprog.wrapper$exeext.dSYM" + test $rc = 0 || exit $? - # Strip wrapper. - test "$strip_prog" = ':' || func_verbose "$strip_prog" "$destprog.wrapper$exeext" || exit $? - - # Rename $destprog.wrapper -> $destprog -> $destprog.bin. - ln -f "$destprog$exeext" "$destprog.bin$exeext" \ - || { rm -f "$destprog.bin$exeext" \ - && cp -p "$destprog$exeext" "$destprog.bin$exeext"; } \ - || exit 1 - mv "$destprog.wrapper$exeext" "$destprog$exeext" || exit 1 - } - func_iterate func_create_wrapper - ;; + # Strip wrapper. + test "$strip_prog" = ':' || func_verbose "$strip_prog" "$destprog.wrapper$exeext" || exit $? - macosx) - # Insert a reference to @loader_path in selected shared library references. - # For executables, @executable_path is equivalent to @loader_path. - func_reference_loader_path () - { - # For using 'install_name_tool -change ...' we need to know the precise - # library version of each reference. The linker command line does not give - # us the information; only 'otool' provides it. - # Documentation: - # - # - # The install_name_tool exists in versions without and with rpath support: - # - # - otool -L "$destprog" | sed -e '/:$/d' -e 's/^[ ]*//' -e 's/ (.*$//' | \ - while read libfilename; do - case "$libfilename" in - "$prefix"/* ) - func_relativize "$installdir" "$libfilename" - new_libfilename="@loader_path/$reldir" - func_verbose install_name_tool -change "$libfilename" "$new_libfilename" "$destprog" - ;; - esac - done - } - func_iterate func_reference_loader_path - ;; - -esac + # Rename $destprog.wrapper -> $destprog -> $destprog.bin. + ln -f "$destprog$exeext" "$destprog.bin$exeext" \ + || { rm -f "$destprog.bin$exeext" \ + && cp -p "$destprog$exeext" "$destprog.bin$exeext"; } \ + || exit 1 + mv "$destprog.wrapper$exeext" "$destprog$exeext" || exit 1 +} +func_iterate func_create_wrapper exit 0 diff -r db8428454956 -r 9e8fb35d4032 m4/relocatable.m4 --- a/m4/relocatable.m4 Sun Mar 03 14:09:37 2019 -0800 +++ b/m4/relocatable.m4 Mon Mar 04 17:25:04 2019 +0100 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 22 +# relocatable.m4 serial 21 dnl Copyright (C) 2003, 2005-2007, 2009-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,6 @@ AC_REQUIRE([AC_CANONICAL_HOST]) is_noop=no use_elf_origin_trick=no - use_macos_tools=no use_wrapper=no if test $RELOCATABLE = yes; then # --enable-relocatable implies --disable-rpath @@ -75,10 +74,6 @@ solaris*) use_elf_origin_trick=yes ;; # Haiku: yes. haiku*) use_elf_origin_trick=yes ;; - # On Mac OS X 10.4 or newer, use Mac OS X tools. See - # . - darwin | darwin[1-7].*) ;; - darwin*) use_macos_tools=yes ;; changequote([,])dnl esac if test $is_noop = yes; then @@ -94,16 +89,12 @@ RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\"" AC_SUBST([RELOCATABLE_LDFLAGS]) else + use_wrapper=yes dnl Unfortunately we cannot define INSTALL_PROGRAM to a command dnl consisting of more than one word - libtool doesn't support this. dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the dnl 'install-strip' target. - if test $use_macos_tools = yes; then - INSTALL_PROGRAM_ENV="RELOC_MODE=macosx RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\"" - else - use_wrapper=yes - INSTALL_PROGRAM_ENV="RELOC_MODE=wrapper RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\"" - fi + INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\"" AC_SUBST([INSTALL_PROGRAM_ENV]) case "$ac_aux_dir" in /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;