New commits:
commit 83dfc369a5cdcf5f72de34031cbd962844f908c0
Merge: 563c6f0764dbd3a9563905743bc2d769f5de587e
d084623f6a116b63eb1d2ed0a29353f4c3a01162
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
Merge branch 'master' of ssh://thorgis AT scm.sourcemage.org/smgl/grimoire
commit 563c6f0764dbd3a9563905743bc2d769f5de587e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
added alpha as always-PIC arch to disable_pic and removed this if from
BUILD
diff --git a/FUNCTIONS b/FUNCTIONS
index 08b49a1..37ef827 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -421,14 +421,15 @@ ## has one optional parameter: force whi
#---
-# fails to compile with -DPIC and -fPIC except on AMD64
-# ...and Alpha; where mjpegtools configure sets PIC anyway - disabling
-# here doesn't hurt but doesn't make sense, either.
-if [[ ${SMGL_COMPAT_ARCHS[1]} != alpha ]]; then
- disable_pic
-fi &&
+# fails to compile with -DPIC and -fPIC (except on all-PIC archs)
+disable_pic &&
OPTS="--without-libquicktime $OPTS" &&
make_single &&
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index cdd9eaa..b765fc8 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,4 +1,8 @@
2006-06-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: moved the PICy alpha arch check into disable_pic in
+ grimoire FUNCTIONS and made the no-PIC comment generic
+
+2006-06-24 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: disabled disable_pic for alpha, where is is actually
a no-op (configure enables PIC) - just to make clear that
PIC is no prob there
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (83dfc369a5cdcf5f72de34031cbd962844f908c0),
Thomas Orgis, 06/24/2006