Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (86d4e766a36018b399cfc358601f1883eccd3264)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (86d4e766a36018b399cfc358601f1883eccd3264)
  • Date: Thu, 22 Aug 2013 03:03:53 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

utils/gnuplot/HISTORY | 3 +++
utils/gnuplot/PRE_BUILD | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 86d4e766a36018b399cfc358601f1883eccd3264
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gnuplot: fix CVS build

diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 235543c..a79dd19 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,6 @@
+2013-08-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fix for CVS branch
+
2013-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.6.1, fix SOURCE_URL[0]
* PRE_BUILD, automake-1.12.patch: removed patch
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index b399529..6bbc086 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -3,10 +3,12 @@ cd "$SOURCE_DIRECTORY" &&
# Fix build that thinks we are cross-compiling.
# Hopefully fixed in gnuplot 4.7 .
patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gnuplot-4.6.2-texinfo-5.patch" &&
+if [[ ! $GNUPLOT_BRANCH == scm ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/gnuplot-4.6.2-texinfo-5.patch"
+fi &&

if [[ $GNUPLOT_BRANCH == scm ]]; then
cd "$SOURCE_DIRECTORY" &&
- autoreconf -iv
+ ./prepare
fi




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (86d4e766a36018b399cfc358601f1883eccd3264), Thomas Orgis, 08/22/2013

Archive powered by MHonArc 2.6.24.

Top of Page