Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Nov 2013 06:43:15 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334645 - in head/ports-mgmt: pkg pkg-devel
Message-ID:  <201311230643.rAN6hFYH071526@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Sat Nov 23 06:43:14 2013
New Revision: 334645
URL: http://svnweb.freebsd.org/changeset/ports/334645

Log:
  Move WITH_DEBUG check below b.p.m so it works with WITH_DEBUG_PORTS
  
  Approved by:	portmgr (bapt, maintainer)

Modified:
  head/ports-mgmt/pkg-devel/Makefile
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- head/ports-mgmt/pkg-devel/Makefile	Sat Nov 23 06:04:35 2013	(r334644)
+++ head/ports-mgmt/pkg-devel/Makefile	Sat Nov 23 06:43:14 2013	(r334645)
@@ -23,9 +23,6 @@ USES=		uidfix
 
 MAKE_ENV+=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \
 		PORTREVISION=${PORTREVISION}
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
-MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
-.endif
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
 # so that pkg-static is used from the wrkdir
@@ -33,6 +30,10 @@ USE_SUBMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
+.endif
+
 .if defined(WITH_PKGNG)
 .if ${WITH_PKGNG} != devel
 NO_LATEST_LINK=	yes

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Sat Nov 23 06:04:35 2013	(r334644)
+++ head/ports-mgmt/pkg/Makefile	Sat Nov 23 06:43:14 2013	(r334645)
@@ -24,9 +24,6 @@ SHEBANG_FILES=	scripts/completion/_pkg.b
 
 MAKE_ENV+=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \
 		PORTREVISION=${PORTREVISION}
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
-MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
-.endif
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
 # so that pkg-static is used from the wrkdir
@@ -34,6 +31,10 @@ USE_SUBMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}"
+.endif
+
 .if defined(WITH_PKGNG)
 .if ${WITH_PKGNG} == devel
 NO_LATEST_LINK=	yes



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311230643.rAN6hFYH071526>