Fri Apr 1 19:05:15 2022 UTC ()
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?


(bsiegert)
diff -r1.85 -r1.85.4.1 pkgsrc/devel/SDL/distinfo
diff -r0 -r1.1.2.2 pkgsrc/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh
cvs diff -r1.85 -r1.85.4.1 pkgsrc/devel/SDL/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/SDL/distinfo 2021/10/26 10:14:10 1.85
+++ pkgsrc/devel/SDL/distinfo 2022/04/01 19:05:14 1.85.4.1
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.85 2021/10/26 10:14:10 nia Exp $ 1$NetBSD: distinfo,v 1.85.4.1 2022/04/01 19:05:14 bsiegert Exp $
2 2
3BLAKE2s (SDL-1.2.15.tar.gz) = 4c189e4973635d37bbc9a4d87512bbbeb950d49c4862bc59f1bf2c37b9c54cc7 3BLAKE2s (SDL-1.2.15.tar.gz) = 4c189e4973635d37bbc9a4d87512bbbeb950d49c4862bc59f1bf2c37b9c54cc7
4SHA512 (SDL-1.2.15.tar.gz) = ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc 4SHA512 (SDL-1.2.15.tar.gz) = ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
5Size (SDL-1.2.15.tar.gz) = 3920622 bytes 5Size (SDL-1.2.15.tar.gz) = 3920622 bytes
6SHA1 (patch-aa) = 00fb7a85caf8fc9f08298d0a07a4587757fdffb0 6SHA1 (patch-aa) = 00fb7a85caf8fc9f08298d0a07a4587757fdffb0
7SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563 7SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563
 8SHA1 (patch-build-scripts_strip__fPIC.sh) = 51a6271cadac350a76b6e556727e27955067afb5
8SHA1 (patch-src_audio_SDL__wave.c) = ff42d973c9c5a7643ffa5acb248e15e821d2145f 9SHA1 (patch-src_audio_SDL__wave.c) = ff42d973c9c5a7643ffa5acb248e15e821d2145f
9SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 7f5fbf4d839e52fce028810dc807b404fcd51442 10SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 7f5fbf4d839e52fce028810dc807b404fcd51442
10SHA1 (patch-src_audio_dma_SDL__dmaaudio.c) = cede64d04e8872b11851bfcacbc99059df973881 11SHA1 (patch-src_audio_dma_SDL__dmaaudio.c) = cede64d04e8872b11851bfcacbc99059df973881
11SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30 12SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
12SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = a20608d6a4cc8f2c8f5fb2d77a572f373178151b 13SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = a20608d6a4cc8f2c8f5fb2d77a572f373178151b
13SHA1 (patch-src_video_SDL__bmp.c) = 89252aa0de90a80cb7fa1c0bf6a7e0e73973ff83 14SHA1 (patch-src_video_SDL__bmp.c) = 89252aa0de90a80cb7fa1c0bf6a7e0e73973ff83
14SHA1 (patch-src_video_SDL__pixels.c) = e4c1feeda33cdd5e891ff203c573c5f578d17368 15SHA1 (patch-src_video_SDL__pixels.c) = e4c1feeda33cdd5e891ff203c573c5f578d17368
15SHA1 (patch-src_video_nanox_SDL__nxvideo.c) = 653ff4358d62f7093f646fba5ddae2921876144c 16SHA1 (patch-src_video_nanox_SDL__nxvideo.c) = 653ff4358d62f7093f646fba5ddae2921876144c
16SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8 17SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8
17SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21 18SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21
18SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92 19SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92
19SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 741ac9570c4e6e554a191660011b7e3bbe30ce7c 20SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 741ac9570c4e6e554a191660011b7e3bbe30ce7c
20SHA1 (patch-src_video_wscons_SDL__wsconsvideo.h) = efc75da910cfe370b7361a0b9d2b90837c6b9aa9 21SHA1 (patch-src_video_wscons_SDL__wsconsvideo.h) = efc75da910cfe370b7361a0b9d2b90837c6b9aa9
File Added: pkgsrc/devel/SDL/patches/patch-build-scripts_strip__fPIC.sh
$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
             ;;