From ff51c82567075b2c2b88891bad072faa38add69f Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 10 Mar 2022 10:24:56 +0100 Subject: extra/flac: patch for cmake and -mstackrealing in nasm --- extra/flac/PKGBUILD | 13 +++++++++++++ extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch | 12 ++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 extra/flac/PKGBUILD create mode 100644 extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD new file mode 100644 index 00000000..9b7db12f --- /dev/null +++ b/extra/flac/PKGBUILD @@ -0,0 +1,13 @@ +# -mstackrealign gets also added to nasm compilation, which results in 'no such option' +source+=('flac-1.3.4-no-mstackrealign-for-nasm.patch') +sha512sums+=('88c8f12321f1a16d5fa742ce66f84c31a1fec5a5095355bece314fe3aca8e35bccbf112762e719148af58c65a968d6c0060d93d6371b84d1b853a2d6eadc15c0') +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "$srcdir/$pkgname-$pkgver" \ + patch -Np1 -i "$srcdir/flac-1.3.4-no-mstackrealign-for-nasm.patch" + ' +)" diff --git a/extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch b/extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch new file mode 100644 index 00000000..fc651c77 --- /dev/null +++ b/extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch @@ -0,0 +1,12 @@ +diff -rauN flac-1.3.4/CMakeLists.txt flac-1.3.4-no-mstackrealign-for-nasm-patch/CMakeLists.txt +--- flac-1.3.4/CMakeLists.txt 2022-02-14 06:21:14.011609811 +0100 ++++ flac-1.3.4-no-mstackrealign-for-nasm-patch/CMakeLists.txt 2022-03-10 09:54:48.719704370 +0100 +@@ -97,7 +97,7 @@ + endif() + + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND HAVE_STACKREALIGN_FLAG) +- add_compile_options(-mstackrealign) ++ add_compile_options($<$:-mstackrealign>) + endif() + + include_directories("include") -- cgit v1.2.3-70-g09d2