kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix NetBSD/sparc64 SSP_SUPPORTED=no check

Browse source 
It was set after the include of bsd.prefs.mk to be able to use
MACHINE_PLATFORM, but needed to be before bsd.prefs.mk to take
effect. Switch to testing MACHINE_ARCH, and target all sparc64
This commit is contained in:
abs 2023-03-22 19:09:54 +00:00
parent 373abf3cea
commit d217b2d3fc
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mail/thunderbird52/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.27 2023/03/21 20:08:40 abs Exp $
# $NetBSD: Makefile,v 1.28 2023/03/22 19:10:30 abs Exp $
DISTNAME= thunderbird-${TB_VER}.source
PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER}
PKGREVISION= 24
PKGREVISION= 25
TB_VER= 52.9.1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
@ -34,13 +34,13 @@ ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
.include "../../mk/bsd.prefs.mk"
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
.if ${MACHINE_ARCH} == "sparc64"
# Without this NetBSD/sparc64 gets "Bus error (core dumped)"
SSP_SUPPORTED=no
.endif
.include "../../mk/bsd.prefs.mk"
#SUBST_CLASSES+= ext-compat
#SUBST_STAGE.ext-compat= pre-configure
#SUBST_MESSAGE.ext-compat= Fixing extension compatibility

12
www/firefox52/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.84 2023/03/21 20:08:16 abs Exp $
# $NetBSD: Makefile,v 1.85 2023/03/22 19:09:54 abs Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 52.9
@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR= .0esr
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
PKGREVISION= 53
PKGREVISION= 54
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@ -46,14 +46,14 @@ SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__Drago
SUBST_FILES.dfly_malloc_h= media/libav/libavutil/mem.c
SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
.include "mozilla-common.mk"
.include "options.mk"
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
.if ${MACHINE_ARCH} == "sparc64"
# Without this NetBSD/sparc64 gets "Bus error (core dumped)"
SSP_SUPPORTED=no
.endif
.include "mozilla-common.mk"
.include "options.mk"
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