Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (b348e5dd8508f653f4413eaf933eb775c0b7f90b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Peng Chang (Charles)" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (b348e5dd8508f653f4413eaf933eb775c0b7f90b)
  • Date: Fri, 7 Aug 2009 01:08:46 -0500

GIT changes to master grimoire by Peng Chang (Charles) <chp AT sourcemage.org>:

x11-toolkits/fltk/HISTORY | 4 ++++
x11-toolkits/fltk/PRE_BUILD | 7 +++++--
x11-toolkits/fltk2/HISTORY | 4 ++++
x11-toolkits/fltk2/PRE_BUILD | 5 ++++-
4 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit b348e5dd8508f653f4413eaf933eb775c0b7f90b
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

fltk, fltk2: check glibc version before applying glibc-2.10.1 specific
patch

diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index 6ab51c5..f6e4abd 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,7 @@
+2009-08-07 Peng Chang (Charles) <chp AT sourcemage.org>
+ * PRE_BUILD: check the version of glibc before applying the
+ patch since the patch doesn't build with glibc 2.9 at least
+
2009-06-07 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, fltk-1.1.9-gcc44.patch: added patch due to glibc 2.10.1
from
http://cvs.fedoraproject.org/viewvc/devel/fltk/
diff --git a/x11-toolkits/fltk/PRE_BUILD b/x11-toolkits/fltk/PRE_BUILD
index a23a0c8..02fa51c 100755
--- a/x11-toolkits/fltk/PRE_BUILD
+++ b/x11-toolkits/fltk/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/fltk-1.1.9-gcc44.patch
+
+if [ $(installed_version glibc | cut -d. -f2) -gt 9 ]; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 < $SPELL_DIRECTORY/fltk-1.1.9-gcc44.patch
+fi
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index f65d6e4..455b99f 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,7 @@
+2009-08-07 Peng Chang (Charles) <chp AT sourcemage.org>
+ * PRE_BUILD: check the version of glibc before applying the
+ patch since the patch doesn't build with glibc 2.9 at least
+
2009-07-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.x-r6793

diff --git a/x11-toolkits/fltk2/PRE_BUILD b/x11-toolkits/fltk2/PRE_BUILD
index 62951a9..c229fda 100755
--- a/x11-toolkits/fltk2/PRE_BUILD
+++ b/x11-toolkits/fltk2/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
# disable tests, as the makefile is bad
sed -i "s/glut test/glut/" Makefile &&
-patch -p0 < $SPELL_DIRECTORY/fltk2-gcc44.patch
+
+if [ $(installed_version glibc | cut -d. -f2) -gt 9 ]; then
+ patch -p0 < $SPELL_DIRECTORY/fltk2-gcc44.patch
+fi



  • [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (b348e5dd8508f653f4413eaf933eb775c0b7f90b), Peng Chang (Charles), 08/07/2009

Archive powered by MHonArc 2.6.24.

Top of Page