CVS commit: [pkgsrc-2022Q1] pkgsrc/devel/SDL

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Apr  1 19:05:15 UTC 2022

Modified Files:
        pkgsrc/devel/SDL [pkgsrc-2022Q1]: distinfo
Added Files:
        pkgsrc/devel/SDL/patches [pkgsrc-2022Q1]:
            patch-build-scripts_strip__fPIC.sh

Log Message:
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?


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.85.4.1 pkgsrc/devel/SDL/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL/distinfo
diff -u pkgsrc/devel/SDL/distinfo:1.85 pkgsrc/devel/SDL/distinfo:1.85.4.1
--- pkgsrc/devel/SDL/distinfo:1.85      Tue Oct 26 10:14:10 2021
+++ pkgsrc/devel/SDL/distinfo   Fri Apr  1 19:05:14 2022
@@ -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

Added files:

Index: pkgsrc/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh
diff -u /dev/null pkgsrc/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh:1.1.2.2
--- /dev/null   Fri Apr  1 19:05:15 2022
+++ pkgsrc/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh Fri Apr  1 19:05:15 2022
@@ -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
+             ;;