]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
build: port new bootstrap script to POSIX shells
authorPádraig Brady <P@draigBrady.com>
Fri, 18 Jul 2014 20:55:19 +0000 (21:55 +0100)
committerPádraig Brady <P@draigBrady.com>
Fri, 18 Jul 2014 20:55:19 +0000 (21:55 +0100)
* build-aux/gen-single-binary.sh: Avoid bash only constructs.
Reported by Assaf Gordon

build-aux/gen-single-binary.sh

index 463570656e5370ab993c1f221354a6dc1fdda5db..a2423e60d7173aa17dc4fb448e247d9398de243b 100755 (executable)
@@ -49,7 +49,8 @@ while read l; do
       if echo $l | grep -F '+=' >/dev/null; then
         eval "oldvalue=\${$var}"
       fi
-      eval "$var='$oldvalue "${value//\'/\'\"\'\"\'}"'"
+      value=$(echo "$value" | sed "s/'/'\"'\"'/g")
+      eval "$var='$oldvalue "$value"'"
     fi
   fi
 done < $LOCAL_MK
@@ -60,15 +61,15 @@ echo "## Automatically generated by $me.  DO NOT EDIT BY HAND!"
 # Override the sources for dir and vdir. We use a smaller version of dir and
 # vdir that relies on the ls main.
 src_dir_SOURCES="src/coreutils-dir.c"
-src_dir_LDADD+=" src/libsinglebin_ls.a"
+src_dir_LDADD="$src_dir_LDADD src/libsinglebin_ls.a"
 echo src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a
 src_vdir_SOURCES="src/coreutils-vdir.c"
-src_vdir_LDADD+=" src/libsinglebin_ls.a"
+src_vdir_LDADD="$src_vdir_LDADD src/libsinglebin_ls.a"
 echo src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a
 
 # Override the sources for arch likewise, using the main from uname.
 src_arch_SOURCES="src/coreutils-arch.c"
-src_arch_LDADD+=" src/libsinglebin_uname.a"
+src_arch_LDADD="$src_arch_LDADD src/libsinglebin_uname.a"
 echo src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a
 
 for cmd in $ALL_PROGRAMS; do