summaryrefslogtreecommitdiffstats
path: root/ffmpeg
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2012-05-05 15:34:05 +0000
committer Eric Hameleers <alien@slackware.com>2012-05-05 15:34:05 +0000
commitce814cd4ff92de965d3461305c6a1026ff40cd89 (patch)
tree0197e74fae873644ddcb68fcc2edc6132a6cc443 /ffmpeg
parenta4f3a1c1ba4eb4fa47347e89e0bf8c0163413dc6 (diff)
downloadasb-ce814cd4ff92de965d3461305c6a1026ff40cd89.tar.gz
asb-ce814cd4ff92de965d3461305c6a1026ff40cd89.tar.xz
In schroedinger lib, prevent errors in compiling the testsuite if a static build is enabled. Errors like "multiple definition of orc_add2_rshift_add_s16_22"
Diffstat (limited to 'ffmpeg')
-rwxr-xr-xffmpeg/build/ffmpeg.SlackBuild5
1 files changed, 5 insertions, 0 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 29b103e8..0834bb0c 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -998,6 +998,11 @@ else
ARCHOPTS=""
fi
cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER
+
+# Do not try to build the testsuite, it gives errors about multiple definitions:
+cat $SRCDIR/schroedinger_notests.patch | patch -p1 --verbose \
+ 2>&1 | tee $OUTPUT/patch-${PRGNAM}_schroedinger.log
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \