Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ff79026bd3993a1f9df96a28a1778dba42ae5846)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ff79026bd3993a1f9df96a28a1778dba42ae5846)
  • Date: Mon, 22 Mar 2010 17:42:29 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/cvs/HISTORY | 4 ++++
devel/cvs/PRE_BUILD | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 81d033e51eae0baf60c02bd53d51fca0b65b38e7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/cvs: don't apply glibc patch when building feature branch

diff --git a/devel/cvs/HISTORY b/devel/cvs/HISTORY
index db8face..4052a3e 100644
--- a/devel/cvs/HISTORY
+++ b/devel/cvs/HISTORY
@@ -1,3 +1,7 @@
+2010-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: don't apply glibc patch when building the
+ feature branch
+
2009-07-21 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply glibc-2.10.1.patch
* glibc-2.10.1.patch: Fix conflicting definition of getline
diff --git a/devel/cvs/PRE_BUILD b/devel/cvs/PRE_BUILD
index d8d53d3..03e31c8 100755
--- a/devel/cvs/PRE_BUILD
+++ b/devel/cvs/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
if [[ $CVS_FEATURES == y ]] && grep -q "# Generated by GNU Autoconf 2.59"
configure; then
- patch -Np1 < $SCRIPT_DIRECTORY/cvs_autoconf.patch
+ patch -Np1 < $SCRIPT_DIRECTORY/cvs_autoconf.patch || return 1
fi &&
patch -p1 < ${SCRIPT_DIRECTORY}/cvs-insecuretemp_file.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
+if [[ $CVS_FEATURES == n ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch || return 1
+fi



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ff79026bd3993a1f9df96a28a1778dba42ae5846), Florian Franzmann, 03/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page