From 00c392d72c63398145b1c95e46ea0bb44535dd9b Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Sun, 28 Jun 2009 12:56:57 +0100
Subject: bootstrap: Ship git-version-gen with the tarball.

bootstrap.sh is already shipped and when rebootstrapping, it will call git-version-gen
internally when processing configure.ac.

In order to know when someone has rebootstrapped, we modify the tarball version to mark it
as rebootstrapped. Not 100% sure this later stage is desired or if we should remove
the .tarball-version file instead.
---
 bootstrap.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index d5025db6..aa9755fa 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -46,6 +46,11 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     chmod -c +x  .git/hooks/pre-commit
 fi
 
+if [ -f .tarball-version ]; then
+    echo "Marking tarball version as modified."
+    echo -n `cat .tarball-version | sed 's/-rebootstrapped$//'`-rebootstrapped >.tarball-version
+fi
+
 # We check for this here, because if pkg-config is not found in the
 # system, it's likely that the pkg.m4 macro file is also not present,
 # which will make PKG_PROG_PKG_CONFIG be undefined and the generated
-- 
cgit 


From 191c57effe385c797d8f226accd9afceee972888 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Fri, 17 Jul 2009 13:45:37 +0200
Subject: make bootstrap.sh aware of Darwin environment

Signed-off-by: Daniel Mack <daniel@caiaq.de>
---
 bootstrap.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index aa9755fa..a5bd9a78 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,10 +40,22 @@ run_versioned() {
 
 set -ex
 
+case $(uname) in
+	*Darwin*)
+		CP_OPTS="-R"
+		CHMOD_OPTS=""
+		LIBTOOLIZE="glibtoolize"
+		;;
+	*)
+		CP_OPTS="-av"
+		CHMOD_OPTS="-c"
+		;;
+esac
+
 if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activating pre-commit hook."
-    cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
-    chmod -c +x  .git/hooks/pre-commit
+    cp ${CP_OPTS}  .git/hooks/pre-commit.sample .git/hooks/pre-commit
+    chmod ${CHMOD_OPTS} +x  .git/hooks/pre-commit
 fi
 
 if [ -f .tarball-version ]; then
-- 
cgit 


From 8c85c9999661a57e1bd10e79ad398b812ff4ea87 Mon Sep 17 00:00:00 2001
From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 17 Jul 2009 20:48:44 +0200
Subject: Further simplify on Daniel's patch for bootstrap.sh.

Instead of having further indirections, stick to POSIX command options for
cp and chmod. This leaves just the LIBTOOL handling to be Darwin-specific.
---
 bootstrap.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index a5bd9a78..79e0a7dc 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -42,20 +42,14 @@ set -ex
 
 case $(uname) in
 	*Darwin*)
-		CP_OPTS="-R"
-		CHMOD_OPTS=""
 		LIBTOOLIZE="glibtoolize"
 		;;
-	*)
-		CP_OPTS="-av"
-		CHMOD_OPTS="-c"
-		;;
 esac
 
 if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activating pre-commit hook."
-    cp ${CP_OPTS}  .git/hooks/pre-commit.sample .git/hooks/pre-commit
-    chmod ${CHMOD_OPTS} +x  .git/hooks/pre-commit
+    cp -pv  .git/hooks/pre-commit.sample .git/hooks/pre-commit
+    chmod -v +x  .git/hooks/pre-commit
 fi
 
 if [ -f .tarball-version ]; then
-- 
cgit 


From a44cb642ebd2543e55314d4d8679a9b3d115e533 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 3 Aug 2009 23:07:39 +0200
Subject: build-sys: take preset CFLAGS into account

---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index 79e0a7dc..970e884e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -94,7 +94,7 @@ else
     run_versioned automake "$VERSION" --copy --foreign --add-missing
 
     if test "x$NOCONFIGURE" = "x"; then
-        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
+        CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
         make clean
     fi
 fi
-- 
cgit