ALL: Make libvorbis build on clang for all platforms

scummvm · Sep 15, 2024 · ec57fd3 · ec57fd3
1 parent af3266c
commit ec57fd3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
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
diff --git 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
@@ -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)