Skip to Content.
Sympa Menu

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

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 (3b9b88231f4179aa7ecfef147c70a04199718697)
  • Date: Wed, 16 Feb 2011 05:08:17 -0600

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

graphics-libs/mesalib/HISTORY | 4 ++++
graphics-libs/mesalib/Makefile-fix-sed-expression.patch | 11 +++++++++++
graphics-libs/mesalib/PRE_BUILD | 8 +++-----
3 files changed, 18 insertions(+), 5 deletions(-)

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

graphics-libs/mesalib: fixed error caused by malformed sed expression in
Makefile

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index cca0ce7..0a9b916 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, Makefile-fix-sed-expression.patch: added patch to fix
+ error caused by malformed sed expression
+
2011-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* REPAIR^all^EXPORTS: really export MESALIB_BUILD

diff --git a/graphics-libs/mesalib/Makefile-fix-sed-expression.patch
b/graphics-libs/mesalib/Makefile-fix-sed-expression.patch
new file mode 100644
index 0000000..bda163c
--- /dev/null
+++ b/graphics-libs/mesalib/Makefile-fix-sed-expression.patch
@@ -0,0 +1,11 @@
+--- src/mesa/Makefile.orig 2011-02-16 11:56:43.988419616 +0100
++++ src/mesa/Makefile 2011-02-16 11:57:05.599502708 +0100
+@@ -201,7 +201,7 @@
+ $(pcedit) \
+ -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
+ -e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
+- -e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
++ -e 's:@OSMESA_PC_LIB_PRIV@:$(OSMESA_PC_LIB_PRIV):'
+
+ osmesa.pc: osmesa.pc.in
+ $(osmesa_pcedit) $< > $@
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 92f6374..70685f5 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,10 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ "$MESALIB_VER" == "stable" ]]; then
- patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
-else
- patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
-
+patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch &&
+if [[ ! "$MESALIB_VER" == "stable" ]]; then
+ patch -p0 < ${SPELL_DIRECTORY}/Makefile-fix-sed-expression.patch || return
1
fi &&
cd ${SOURCE_DIRECTORY}/configs &&
sedit "s:/usr/local:/usr:g" default &&




Archive powered by MHonArc 2.6.24.

Top of Page