CVS commit: pkgsrc/emulators/sameboy

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul 21 09:35:46 UTC 2023

Modified Files:
        pkgsrc/emulators/sameboy: Makefile Makefile.common options.mk

Log Message:
sameboy: Disable FORTIFY for Linux only. While here, delint.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/sameboy/Makefile \
    pkgsrc/emulators/sameboy/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/sameboy/options.mk

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

Modified files:

Index: pkgsrc/emulators/sameboy/Makefile
diff -u pkgsrc/emulators/sameboy/Makefile:1.19 pkgsrc/emulators/sameboy/Makefile:1.20
--- pkgsrc/emulators/sameboy/Makefile:1.19      Sat May  6 19:09:15 2023
+++ pkgsrc/emulators/sameboy/Makefile   Fri Jul 21 09:35:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/05/06 19:09:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2023/07/21 09:35:46 nia Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -14,7 +14,7 @@ MAKE_FLAGS+=  FREEDESKTOP=true
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .endif
Index: pkgsrc/emulators/sameboy/Makefile.common
diff -u pkgsrc/emulators/sameboy/Makefile.common:1.19 pkgsrc/emulators/sameboy/Makefile.common:1.20
--- pkgsrc/emulators/sameboy/Makefile.common:1.19       Thu Dec 15 08:38:28 2022
+++ pkgsrc/emulators/sameboy/Makefile.common    Fri Jul 21 09:35:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2022/12/15 08:38:28 nia Exp $
+# $NetBSD: Makefile.common,v 1.20 2023/07/21 09:35:46 nia Exp $
 # used by emulators/sameboy/Makefile
 # used by emulators/libretro-sameboy/Makefile
 
@@ -17,5 +17,11 @@ TOOL_DEPENDS+=       rgbds>=0.5.0:../../devel/
 DISTINFO_FILE= ${.CURDIR}/../../emulators/sameboy/distinfo
 PATCHDIR=      ${.CURDIR}/../../emulators/sameboy/patches
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "Linux"
+# Disable while building boot ROMs with -O0 (glibc limitation).
+FORTIFY_SUPPORTED=     no
+.endif
+
 # sh: /tmp/emulators/libretro-sameboy/work/SameBoy-0.13.2/build/pb12: text busy
 MAKE_JOBS_SAFE=        no

Index: pkgsrc/emulators/sameboy/options.mk
diff -u pkgsrc/emulators/sameboy/options.mk:1.1 pkgsrc/emulators/sameboy/options.mk:1.2
--- pkgsrc/emulators/sameboy/options.mk:1.1     Wed Aug  3 16:23:36 2022
+++ pkgsrc/emulators/sameboy/options.mk Fri Jul 21 09:35:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/08/03 16:23:36 nia Exp $
+# $NetBSD: options.mk,v 1.2 2023/07/21 09:35:46 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.sameboy
 PKG_SUPPORTED_OPTIONS=         openal
@@ -10,9 +10,9 @@ PKG_SUGGESTED_OPTIONS.Darwin= openal
 
 .if !empty(PKG_OPTIONS:Mopenal)
 MAKE_FLAGS+=           ENABLE_OPENAL=1
-.if ${OPSYS} != "Darwin"
-.  include "../../audio/openal-soft/buildlink3.mk"
-.endif
+.  if ${OPSYS} != "Darwin"
+.    include "../../audio/openal-soft/buildlink3.mk"
+.  endif
 .else
 MAKE_FLAGS+=           ENABLE_OPENAL=0
 .endif