Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-03-10 10:24:56 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2022-03-10 10:24:56 +0100
commitff51c82567075b2c2b88891bad072faa38add69f (patch)
treee91e3baa3cb379906963fd7ddc9b74d7532b0251
parent654a2ddaa08d9c606e1a984a401aabdc710830fa (diff)
extra/flac: patch for cmake and -mstackrealing in nasm
-rw-r--r--extra/flac/PKGBUILD13
-rw-r--r--extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch12
2 files changed, 25 insertions, 0 deletions
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($<$<COMPILE_LANGUAGE:C>:-mstackrealign>)
+ endif()
+
+ include_directories("include")