diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-05-11 22:05:25 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-11 22:05:25 +0000 |
| commit | 42b8ea3b1309ae2c8b87084bdac796e3fa8e7645 (patch) | |
| tree | 13c5d336a2fae8ff3aece9f41cb7c6a484ac9ea0 /vlc/build | |
| parent | 3891ceee69270571bc0b24774c67c12938476c4f (diff) | |
| download | asb-42b8ea3b1309ae2c8b87084bdac796e3fa8e7645.tar.gz asb-42b8ea3b1309ae2c8b87084bdac796e3fa8e7645.tar.xz | |
vlc: make libebml compile on Slackware 14.2
Diffstat (limited to 'vlc/build')
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index c3b18fbd..6a077a38 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -1830,8 +1830,13 @@ touch $OUTPUT/patch-${PRGNAM}_ebml.log # 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log #cat $SRCDIR/patches/ebml_infinite-start.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log -cat $SRCDIR/patches/ebml_gcc7.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log +if [ $(gcc -dumpversion |cut -d'.' -f1) -ge 7 ]; then + cat $SRCDIR/patches/ebml_gcc7.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log +else + cat $SRCDIR/patches/ebml_limits.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log +fi export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden" |