CVS commit: pkgsrc/www/firefox52

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue Mar 21 20:08:16 UTC 2023

Modified Files:
        pkgsrc/www/firefox52: Makefile

Log Message:
Fix MACHINE_PLATFORM:MNetBSD-*-sparc64 check

Put after include of bsd.prefs.mk (via options.mk)


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/firefox52/Makefile

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

Modified files:

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.83 pkgsrc/www/firefox52/Makefile:1.84
--- pkgsrc/www/firefox52/Makefile:1.83  Tue Mar 21 19:59:46 2023
+++ pkgsrc/www/firefox52/Makefile       Tue Mar 21 20:08:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2023/03/21 19:59:46 abs Exp $
+# $NetBSD: Makefile,v 1.84 2023/03/21 20:08:16 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -31,11 +31,6 @@ LDFLAGS.FreeBSD+=    -lplc4 -lnspr4
 LDFLAGS.Linux+=                -lnspr4
 LDFLAGS.SunOS+=                -lm
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
-# Without this NetBSD/sparc64 gets "Bus error (core dumped)"
-SSP_SUPPORTED=no
-.endif
-
 NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
 
 ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
@@ -54,6 +49,11 @@ SUBST_FILES.dfly_malloc_h+=  media/ffvpx/
 .include "mozilla-common.mk"
 .include "options.mk"
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
+# Without this NetBSD/sparc64 gets "Bus error (core dumped)"
+SSP_SUPPORTED=no
+.endif
+
 CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
 CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
 CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py