From ec57fd3d2d04d9dc2c5861ebddc4bc12ef2a0018 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 15 Sep 2024 14:30:23 +0000 Subject: [PATCH] ALL: Make libvorbis build on clang for all platforms --- .../patches/remove-mno-ieee-fp-for-clang.patch | 15 --------------- toolchains/common/packages/libvorbis/build.sh | 5 ++++- toolchains/m4/android/packages_list.m4 | 3 --- 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 toolchains/android-common/packages/libvorbis/patches/remove-mno-ieee-fp-for-clang.patch diff --git a/toolchains/android-common/packages/libvorbis/patches/remove-mno-ieee-fp-for-clang.patch b/toolchains/android-common/packages/libvorbis/patches/remove-mno-ieee-fp-for-clang.patch deleted file mode 100644 index 6ed2c2f..0000000 --- a/toolchains/android-common/packages/libvorbis/patches/remove-mno-ieee-fp-for-clang.patch +++ /dev/null @@ -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 diff --git a/toolchains/common/packages/libvorbis/build.sh b/toolchains/common/packages/libvorbis/build.sh index 2de4bca..8b692cf 100755 --- a/toolchains/common/packages/libvorbis/build.sh +++ b/toolchains/common/packages/libvorbis/build.sh @@ -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 diff --git a/toolchains/m4/android/packages_list.m4 b/toolchains/m4/android/packages_list.m4 index 94aaabb..157f83a 100644 --- a/toolchains/m4/android/packages_list.m4 +++ b/toolchains/m4/android/packages_list.m4 @@ -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)