summaryrefslogtreecommitdiffstats
path: root/vlc/build/vlc-1.0.SlackBuild
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2010-01-11 14:40:04 +0000
committer Eric Hameleers <alien@slackware.com>2010-01-11 14:40:04 +0000
commitcaaddc27efdff2c517973bb2cd823c9c775f7ae1 (patch)
treeb1db3a5db2dc5f10ef2d2776bf2f39cb7b195951 /vlc/build/vlc-1.0.SlackBuild
parent011edbe73b50259e40b8e9c12630ba6c225c508f (diff)
downloadasb-caaddc27efdff2c517973bb2cd823c9c775f7ae1.tar.gz
asb-caaddc27efdff2c517973bb2cd823c9c775f7ae1.tar.xz
Apply a bugfix that allows compilation with gcc 4.4
Diffstat (limited to 'vlc/build/vlc-1.0.SlackBuild')
-rwxr-xr-xvlc/build/vlc-1.0.SlackBuild7
1 files changed, 5 insertions, 2 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 52f98101..ac387f29 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -1574,10 +1574,13 @@ make_twolame()
{
echo -e "**\n** twolame ...\n**"
cd $TMP/tmp-$PRGNAM/twolame-$TWOLAME
-# For gcc 4.3:
+# Fix a bug that gets uncovered by gcc 4.4:
+cat $SRCDIR/twolame-0.3.12_mem.diff | patch -p1 --verbose 2>&1 \
+ | tee $OUTPUT/patch-${PRGNAM}_twolame.log
+# For gcc 4.3 and onwards:
if [ $(gcc -dumpversion | tr -d '.' |cut -c 1-2) -ge 43 ]; then
cat $SRCDIR/twolame-0.3.12_gcc43.diff | patch -p1 --verbose 2>&1 \
- | tee $OUTPUT/patch-${PRGNAM}_twolame.log
+ | tee -a $OUTPUT/patch-${PRGNAM}_twolame.log
fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \