[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bootstrap: Portability issue on FreeBSD.
From: |
Paul Eggert |
Subject: |
Re: bootstrap: Portability issue on FreeBSD. |
Date: |
Fri, 08 Mar 2013 08:42:19 -0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130221 Thunderbird/17.0.3 |
I keep meaning to try to switch to Gary's version but in the
meantime I pushed the following; hope it fixes things for you.
>From 3dc082ab56c560491c42c12c41755d099fe1cafe Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Fri, 8 Mar 2013 08:40:26 -0800
Subject: [PATCH] bootstrap: port to FreeBSD
* build-aux/bootstrap (bootstrap_sync): Port sh -c usage to shells
that treat '--' differently. Reported by Mats Erik Andersson in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00012.html>.
---
ChangeLog | 7 +++++++
build-aux/bootstrap | 8 ++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 59da1f8..537ae93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-08 Paul Eggert <address@hidden>
+
+ bootstrap: port to FreeBSD
+ * build-aux/bootstrap (bootstrap_sync): Port sh -c usage to shells
+ that treat '--' differently. Reported by Mats Erik Andersson in
+ <http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00012.html>.
+
2013-03-08 Gary V. Vaughan <address@hidden>
regex: rename remaining __attribute calls to __attribute__.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index bee7765..96f1e76 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2013-01-20.16; # UTC
+scriptversion=2013-03-08.16; # UTC
# Bootstrap this package from checked-out sources.
@@ -630,9 +630,13 @@ esac
if $bootstrap_sync; then
cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
echo "$0: updating bootstrap and restarting..."
+ case $(sh -c 'echo "$1"' -- a) in
+ a) ignored=--;;
+ *) ignored=ignored;;
+ esac
exec sh -c \
'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
- -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
"$0" "$@" --no-bootstrap-sync
}
fi
--
1.7.11.7