New commits:
commit 44b23c9cc8dfb203bd4a956c5f08db56fce8dbed
Merge: a62e374015b12c8b2dd4383803b60e7c3a6deb77
22b3f59a85689dea1513ba73845f993ad4e654d4
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 a62e374015b12c8b2dd4383803b60e7c3a6deb77
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
no disable_pic for alpha (avoid confusion, alpha always wants PIC)
# fails to compile with -DPIC and -fPIC except on AMD64
-disable_pic &&
+# ...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 &&
OPTS="--without-libquicktime $OPTS" &&
make_single &&
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index 86c83d6..cdd9eaa 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,8 @@
+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
+
2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
* BUILD: replaced fPIC and DPIC removal code with disable_pic
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (44b23c9cc8dfb203bd4a956c5f08db56fce8dbed),
Thomas Orgis, 06/23/2006