Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (83dfc369a5cdcf5f72de34031cbd962844f908c0)
  • Date: Sat, 24 Jun 2006 06:57:05 -0500

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

FUNCTIONS | 17 +++++++++--------
video/mjpegtools/BUILD | 8 ++------
video/mjpegtools/HISTORY | 4 ++++
3 files changed, 15 insertions(+), 14 deletions(-)

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
#---

disable_pic() {
-if [[ "${SMGL_COMPAT_ARCHS[1]}" != "x86_64" ]] ||
- [[ "$1" == "force" ]]
-then
-CFLAGS=${CFLAGS/-fPIC} &&
-CFLAGS=${CFLAGS/-DPIC} &&
-CXXFLAGS=${CXXFLAGS/-fPIC} &&
-CXXFLAGS=${CXXFLAGS/-DPIC}
-fi
+ if [[ "${SMGL_COMPAT_ARCHS[1]}" != "x86_64" ]] &&
+ [[ "${SMGL_COMPAT_ARCHS[1]}" != "alpha" ]] ||
+ [[ "$1" == "force" ]]
+ then
+ CFLAGS=${CFLAGS/-fPIC} &&
+ CFLAGS=${CFLAGS/-DPIC} &&
+ CXXFLAGS=${CXXFLAGS/-fPIC} &&
+ CXXFLAGS=${CXXFLAGS/-DPIC}
+ fi
}

#
diff --git a/video/mjpegtools/BUILD b/video/mjpegtools/BUILD
index b6b6bb2..4daa69c 100755
--- a/video/mjpegtools/BUILD
+++ b/video/mjpegtools/BUILD
@@ -3,12 +3,8 @@ sedit 's/ARCHFLAGS="-mcpu=i786 -march=$
sedit 's/ARCHFLAGS="-mcpu=i686 -march=$arch"/ARCHFLAGS=""/' configure &&
sedit 's/ARCHFLAGS="-mcpu=i586 -march=$arch"/ARCHFLAGS=""/' configure &&

-# 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

Archive powered by MHonArc 2.6.24.

Top of Page