[Midnightbsd-cvs] mports [18517] trunk/Mk/bsd.mport.mk: disable debug before ssp handling.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 31 21:17:06 EDT 2015


Revision: 18517
          http://svnweb.midnightbsd.org/mports/?rev=18517
Author:   laffer1
Date:     2015-03-31 21:17:05 -0400 (Tue, 31 Mar 2015)
Log Message:
-----------
disable debug before ssp handling.

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-04-01 01:10:05 UTC (rev 18516)
+++ trunk/Mk/bsd.mport.mk	2015-04-01 01:17:05 UTC (rev 18517)
@@ -531,7 +531,8 @@
 
 
 PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} \
-		DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
+		DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} \
+		RESETPREFIX=${TRUE_PREFIX}
 SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} \
 		DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
 		WWWDIR=${WWWDIR} ETCDIR=${ETCDIR} \
@@ -553,16 +554,26 @@
 .endif
 .endif
 
-.if defined(WITH_SSP) || defined(WITH_SSP_PORTS)
-.include "${PORTSDIR}/Mk/components/ssp.mk"
+.if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no"
+.if !defined(INSTALL_STRIPPED)
+STRIP=  #none
+MAKE_ENV+=      DONTSTRIP=yes
+STRIP_CMD=      ${TRUE}
 .endif
-
-.if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no"
-.undef STRIP
 DEBUG_FLAGS?=	-g
 CFLAGS:=	${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS}
+.if defined(INSTALL_TARGET)
+INSTALL_TARGET:=	${INSTALL_TARGET:S/^install-strip$/install/g}
 .endif
+.endif
 
+.if defined(WITH_SSP) || defined(WITH_SSP_PORTS)
+.include "${PORTSDIR}/Mk/components/ssp.mk"
+.endif
+
+# XXX PIE support to be added here
+MAKE_ENV+=	NO_PIE=yes
+
 .if defined(NOPORTDOCS)
 PLIST_SUB+=	PORTDOCS="@comment "
 .else



More information about the Midnightbsd-cvs mailing list