mirror of
https://github.com/scummvm/dockerized-bb.git
synced 2026-11-18 21:35:23 +00:00
ALL: Make libvorbis build on clang for all platforms
This commit is contained in:
1 parent
af3266cd90
commit
ec57fd3d2d
3 files changed
+4
-19
No files matched your search
-15
@@ -1,15 +0,0 @@
|
||||
diff -burp libvorbis-1.3.6/configure.ac libvorbis-1.3.6-patched/configure.ac
|
||||
--- libvorbis-1.3.6/configure.ac 2018-03-16 12:19:52.000000000 -0400
|
||||
+++ libvorbis-1.3.6-patched/configure.ac 2020-01-18 03:50:19.449087695 -0500
|
||||
@@ -133,9 +133,9 @@ else
|
||||
case $host in
|
||||
*86-*-linux*)
|
||||
DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
|
||||
- CFLAGS="-O3 -Wall -Wextra -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
|
||||
+ CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
|
||||
# PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
|
||||
- PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
|
||||
+ PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline"
|
||||
|
||||
# glibc < 2.1.3 has a serious FP bug in the math inline header
|
||||
# that will cripple Vorbis. Look to see if the magic FP stack
|
||||
@@ -8,8 +8,11 @@ do_make_bdir
|
||||
|
||||
do_pkg_fetch libvorbis
|
||||
|
||||
# Fix clang compilation
|
||||
sed -i -e '/CFLAGS/s:-mno-ieee-fp::' configure.ac
|
||||
|
||||
# Avoid compiling and installing doc
|
||||
sed -ie 's/^\(SUBDIRS.*\) doc/\1/' Makefile.am
|
||||
sed -i -e 's/^\(SUBDIRS.*\) doc/\1/' Makefile.am
|
||||
|
||||
autoreconf -fi -I m4
|
||||
do_configure
|
||||
|
||||
@@ -17,9 +17,6 @@ helpers_package(libogg)
|
||||
|
||||
helpers_package(libtheora)
|
||||
|
||||
# Platform patch provided in android-common
|
||||
# Remove compilation flag not supported by clang
|
||||
COPY --from=android-helpers /lib-helpers/packages/libvorbis lib-helpers/packages/libvorbis
|
||||
helpers_package(libvorbis)
|
||||
|
||||
helpers_package(flac)
|
||||
|
||||
Reference in new issue
Block a user