[gnome-continuous] patches: Update orc autogen patch
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] patches: Update orc autogen patch
- Date: Fri, 20 Sep 2013 11:25:18 +0000 (UTC)
commit a4ee3cc2ad837cade65d32dc97e5be3e9216b6ea
Author: Colin Walters <walters verbum org>
Date: Fri Sep 20 07:25:02 2013 -0400
patches: Update orc autogen patch
patches/orc-autogen.patch | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/patches/orc-autogen.patch b/patches/orc-autogen.patch
index 6f099fa..ec43699 100644
--- a/patches/orc-autogen.patch
+++ b/patches/orc-autogen.patch
@@ -1,35 +1,24 @@
-From 5366fd10c6834e4dbf5f10d6a52e7936bd768352 Mon Sep 17 00:00:00 2001
+From 9a696206bbac470ea2a227fa5dca21a6c0302e73 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
-Date: Wed, 15 May 2013 08:06:09 -0400
+Date: Fri, 20 Sep 2013 07:21:57 -0400
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt
-
-While we have the patient open, use "set -e" so we don't have to chain
-with &&, and use "exec" for the last process to avoid a pointless
-intermediate shell process.
---
- autogen.sh | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ autogen.sh | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index e43e0df..451f915 100755
+index 5611736..864aae6 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -1,9 +1,13 @@
- #!/bin/sh
+@@ -16,5 +16,7 @@ autoreconf -i -f
-+set -e
-+
- if [ `whoami` = ds ] ; then
- confargs="$confargs --enable-gtk-doc"
- fi
+ cd "$olddir"
--autoreconf -i -f &&
--./configure --disable-static $confargs $@
-+autoreconf -i -f
+-$srcdir/configure --disable-static $confargs $@
+if test -z "$NOCONFIGURE"; then
-+ exec ./configure --disable-static $confargs $@
++ exec $srcdir/configure --disable-static $confargs $@
+fi
--
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]