summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2022-04-01 19:05:14 +0000
committerbsiegert <bsiegert@pkgsrc.org>2022-04-01 19:05:14 +0000
commit00690b5640e9d09c466b86bd66e1c7b8883b7623 (patch)
treec5ea152b342b50eb17369cea602c571d16be56ab
parentd841f0734570f531a6fa60fa4717096aebf06ca1 (diff)
downloadpkgsrc-00690b5640e9d09c466b86bd66e1c7b8883b7623.tar.gz
Pullup ticket #6608 - requested by tnn
devel/SDL: NetBSD/i386 build fix Revisions pulled up: - devel/SDL/distinfo 1.86 - devel/SDL/patches/patch-build-scripts_strip__fPIC.sh 1.1 --- Module Name: pkgsrc Committed By: tnn Date: Mon Mar 28 14:34:13 UTC 2022 Modified Files: pkgsrc/devel/SDL: distinfo Added Files: pkgsrc/devel/SDL/patches: patch-build-scripts_strip__fPIC.sh Log Message: SDL: fix build on NetBSD/i386 XXX maybe pullup 2022Q1?
-rw-r--r--devel/SDL/distinfo3
-rw-r--r--devel/SDL/patches/patch-build-scripts_strip__fPIC.sh19
2 files changed, 21 insertions, 1 deletions
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 84a4977bb41..1b3f6f42ca3 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.85 2021/10/26 10:14:10 nia Exp $
+$NetBSD: distinfo,v 1.85.4.1 2022/04/01 19:05:14 bsiegert Exp $
BLAKE2s (SDL-1.2.15.tar.gz) = 4c189e4973635d37bbc9a4d87512bbbeb950d49c4862bc59f1bf2c37b9c54cc7
SHA512 (SDL-1.2.15.tar.gz) = ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
Size (SDL-1.2.15.tar.gz) = 3920622 bytes
SHA1 (patch-aa) = 00fb7a85caf8fc9f08298d0a07a4587757fdffb0
SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563
+SHA1 (patch-build-scripts_strip__fPIC.sh) = 51a6271cadac350a76b6e556727e27955067afb5
SHA1 (patch-src_audio_SDL__wave.c) = ff42d973c9c5a7643ffa5acb248e15e821d2145f
SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 7f5fbf4d839e52fce028810dc807b404fcd51442
SHA1 (patch-src_audio_dma_SDL__dmaaudio.c) = cede64d04e8872b11851bfcacbc99059df973881
diff --git a/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh b/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh
new file mode 100644
index 00000000000..8f40561ad6b
--- /dev/null
+++ b/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh
@@ -0,0 +1,19 @@
+$NetBSD: patch-build-scripts_strip__fPIC.sh,v 1.1.2.2 2022/04/01 19:05:15 bsiegert Exp $
+
+strip -pie for nasm
+
+--- build-scripts/strip_fPIC.sh.orig 2012-01-19 06:30:05.000000000 +0000
++++ build-scripts/strip_fPIC.sh
+@@ -8,6 +8,12 @@ while [ $# -gt 0 ]; do
+ -fPIC)
+ # Ignore -fPIC option
+ ;;
++ -pie)
++ # Ignore -pie option for nasm
++ if echo "${command}" | grep -v "^ [^ ]*nasm " > /dev/null; then
++ command="$command $1"
++ fi
++ ;;
+ -fno-common)
+ # Ignore -fPIC and -DPIC options
+ ;;