cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

separate the debuginfo property from its use to zap DEBUG_PACKAGES

Browse Source 
out of existence: arch-defines.mk MUST be included very early on, so that
modules can use it to decide on behavior, BUT modules are allowed to set
DEBUG_PACKAGES without worrying about it, and so bsd.port.arch.mk must be
the place that zaps!

Discovered by sthen@, because xfce4.port.mk would start churning out
DEBUG_PACKAGES on every architecture.

tested by naddy@  because I wasn't sure I didn't miss something non obvious.
This commit is contained in:
espie 2020-04-16 19:33:29 +00:00
parent 4c53620871
commit 95e3a02abb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infrastructure/mk/arch-defines.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: arch-defines.mk,v 1.73 2020/04/15 14:25:57 sthen Exp $
# $OpenBSD: arch-defines.mk,v 1.74 2020/04/16 19:33:29 espie Exp $
#
# ex:ts=4 sw=4 filetype=make:
#
@ -52,11 +52,6 @@ PROPERTIES += ${PROP:L}
. endfor
.endfor
.if !${PROPERTIES:Mdebuginfo}
DEBUG_PACKAGES =
DEBUG_FILES =
.endif
.if ${PROPERTIES:Mclang}
LIBCXX = c++ c++abi pthread
LIBECXX = c++ c++abi pthread

7
infrastructure/mk/bsd.port.arch.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.port.arch.mk,v 1.13 2016/03/15 21:45:16 naddy Exp $
# $OpenBSD: bsd.port.arch.mk,v 1.14 2020/04/16 19:33:29 espie Exp $
#
# ex:ts=4 sw=4 filetype=make:
#
@ -15,6 +15,11 @@ _ARCH_DEFINES_INCLUDED = Done
. include "${PORTSDIR}/infrastructure/mk/arch-defines.mk"
.endif
.if !${PROPERTIES:Mdebuginfo}
DEBUG_PACKAGES =
DEBUG_FILES =
.endif
# early include of Makefile.inc
.if !defined(_MAKEFILE_INC_DONE)
. if exists(${.CURDIR}/../Makefile.inc)