Date: Mon, 28 Nov 2011 00:53:48 -1000 From: Jan Beich <jbeich@tormail.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/162920: [patch] respect STRIP/LDFLAGS consistently across untroubled.org ports Message-ID: <1RUyu9-0001hc-5f@internal.tormail.net> Resent-Message-ID: <201111281100.pASB0V7Z024319@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162920
>Category: ports
>Synopsis: [patch] respect STRIP/LDFLAGS consistently across untroubled.org ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 28 11:00:29 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Jan Beich
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
Leverage a common bsd.port.mk facility for debugging. To avoid stripping
one can either define empty STRIP= or use WITH_DEBUG=.
Changes are:
mail/relay-ctrl +LDFLAGS
everything else +STRIP
>How-To-Repeat:
>Fix:
--- strip.diff begins here ---
Index: security/cvm/Makefile
===================================================================
RCS file: /a/.csup/ports/security/cvm/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- security/cvm/Makefile 29 Jan 2011 14:28:38 -0000 1.18
+++ security/cvm/Makefile 28 Nov 2011 10:22:16 -0000
@@ -21,7 +21,6 @@ CONFLICTS= bglibs-1.00*
USE_AUTOTOOLS= libtool
LIBTOOLFILES= #none
USE_LDCONFIG= yes
-LDFLAGS?= -s
BGLIBS_INC= ${LOCALBASE}/include/bglibs
BGLIBS_LIB= ${LOCALBASE}/lib/bglibs
@@ -50,7 +49,7 @@ do-configure:
${ECHO_CMD} "${PREFIX}/include" > ${WRKSRC}/conf-include
${ECHO_CMD} "${PREFIX}/lib" > ${WRKSRC}/conf-lib
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INC}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
Index: ftp/twoftpd/Makefile
===================================================================
RCS file: /a/.csup/ports/ftp/twoftpd/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- ftp/twoftpd/Makefile 11 Mar 2009 17:04:03 -0000 1.19
+++ ftp/twoftpd/Makefile 28 Nov 2011 10:23:03 -0000
@@ -19,7 +19,7 @@ LIB_DEPENDS= cvm-v2client.2:${PORTSDIR}/
CFLAGS+= -I${LOCALBASE}/include
#-I${LOCALBASE}/include/bglibs
-LDFLAGS+= -s -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
BGLIBS_LIB= ${LOCALBASE}/lib/bglibs
BGLIBS_INCLUDE= ${LOCALBASE}/include/bglibs
@@ -33,7 +33,7 @@ do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INCLUDE}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
Index: devel/bglibs/Makefile
===================================================================
RCS file: /a/.csup/ports/devel/bglibs/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- devel/bglibs/Makefile 30 May 2011 12:28:18 -0000 1.41
+++ devel/bglibs/Makefile 28 Nov 2011 09:46:12 -0000
@@ -21,7 +21,6 @@ NOT_FOR_ARCHS= alpha
USE_PERL5= yes
USE_AUTOTOOLS= libtool:env
-LDFLAGS?= -s
BGLIBS_INC= ${PREFIX}/include/${PORTNAME}
BGLIBS_LIB= ${PREFIX}/lib/${PORTNAME}
USE_LDCONFIG= ${BGLIBS_LIB}
@@ -31,7 +30,7 @@ MAN1= cli-generate.1
do-configure:
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${PREFIX}/man" > ${WRKSRC}/conf-man
Index: mail/qmail-qfilter/Makefile
===================================================================
RCS file: /a/.csup/ports/mail/qmail-qfilter/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- mail/qmail-qfilter/Makefile 28 Apr 2010 22:20:23 -0000 1.9
+++ mail/qmail-qfilter/Makefile 28 Nov 2011 10:23:26 -0000
@@ -16,7 +16,6 @@ COMMENT= Front-end for qmail-queue to ru
LIB_DEPENDS= bg-sysdeps.2:${PORTSDIR}/devel/bglibs
-LDFLAGS?= -s
BGLIBS_INC= ${LOCALBASE}/include/bglibs
BGLIBS_LIB= ${LOCALBASE}/lib/bglibs
@@ -27,7 +26,7 @@ do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INC}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
Index: mail/qmail-autoresponder/Makefile
===================================================================
RCS file: /a/.csup/ports/mail/qmail-autoresponder/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- mail/qmail-autoresponder/Makefile 19 Mar 2011 13:15:25 -0000 1.15
+++ mail/qmail-autoresponder/Makefile 28 Nov 2011 10:23:49 -0000
@@ -19,7 +19,7 @@ LIB_DEPENDS= bg-sysdeps.2:${PORTSDIR}/de
USE_MYSQL= yes
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/bglibs
-LDFLAGS+= -L${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/bglibs -s
+LDFLAGS+= -L${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/bglibs
PROGS= qmail-autoresponder qmail-autoresponder-mysql
MAN1= qmail-autoresponder.1
@@ -31,7 +31,7 @@ do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
do-install:
cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin
Index: mail/mailfront/Makefile
===================================================================
RCS file: /a/.csup/ports/mail/mailfront/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- mail/mailfront/Makefile 8 Feb 2011 01:42:25 -0000 1.27
+++ mail/mailfront/Makefile 28 Nov 2011 10:24:11 -0000
@@ -37,7 +37,7 @@ do-configure:
${ECHO_CMD} "${MODULES_DIR}" > ${WRKSRC}/conf-modules
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
${ECHO_CMD} "${CC} ${CFLAGS_SO}"> ${WRKSRC}/conf-ccso
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INC}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
Index: mail/relay-ctrl/Makefile
===================================================================
RCS file: /a/.csup/ports/mail/relay-ctrl/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- mail/relay-ctrl/Makefile 31 Jan 2010 03:50:15 -0000 1.4
+++ mail/relay-ctrl/Makefile 28 Nov 2011 10:29:47 -0000
@@ -31,7 +31,7 @@ SUB_LIST= EXPIRY=${RELAY_CTRL_EXPIRY} FI
do-configure:
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
Index: mail/qmail-notify/Makefile
===================================================================
RCS file: /a/.csup/ports/mail/qmail-notify/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- mail/qmail-notify/Makefile 28 Apr 2010 22:20:23 -0000 1.10
+++ mail/qmail-notify/Makefile 28 Nov 2011 10:30:15 -0000
@@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Delayed delivery notification for qmail
CFLAGS+= -DHAVE_SRANDOM
-LDFLAGS?= -s
DOCS= NEWS README TODO
EXAMPLES= cron.hourly message.txt
@@ -23,7 +22,7 @@ EXAMPLES= cron.hourly message.txt
do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
do-install:
cd ${WRKSRC} && ./installer
Index: sysutils/ucspi-unix/Makefile
===================================================================
RCS file: /a/.csup/ports/sysutils/ucspi-unix/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- sysutils/ucspi-unix/Makefile 10 Aug 2008 21:19:18 -0000 1.10
+++ sysutils/ucspi-unix/Makefile 28 Nov 2011 10:30:33 -0000
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${BGLIBS_LIB}/libbg.a:${P
BGLIBS_INC= ${LOCALBASE}/include/bglibs
BGLIBS_LIB= ${LOCALBASE}/lib/bglibs
CFLAGS+= -I${BGLIBS_INC}
-LDFLAGS+= -s -L${BGLIBS_LIB}
+LDFLAGS+= -L${BGLIBS_LIB}
PLIST_FILES= bin/unixcat bin/unixclient bin/unixserver
MAN1= unixclient.1 unixserver.1
@@ -30,7 +30,7 @@ post-patch:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INC}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
Index: sysutils/qlogtools/Makefile
===================================================================
RCS file: /a/.csup/ports/sysutils/qlogtools/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- sysutils/qlogtools/Makefile 27 Jul 2008 04:30:52 -0000 1.7
+++ sysutils/qlogtools/Makefile 28 Nov 2011 10:30:54 -0000
@@ -14,8 +14,6 @@ MASTER_SITES= http://untroubled.org/${PO
MAINTAINER= ports@FreeBSD.org
COMMENT= Tools for processing logs from qmail and other packages
-LDFLAGS?= -s
-
MAN1= multipipe.1 multitail.1 qfilelog.1 \
spipe.1 tai2tai64n.1 tai64n2tai.1 teepipe.1
DOCS= NEWS README
@@ -24,7 +22,7 @@ do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
do-install:
cd ${WRKSRC} && ./installer
Index: sysutils/ucspi-proxy/Makefile
===================================================================
RCS file: /a/.csup/ports/sysutils/ucspi-proxy/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- sysutils/ucspi-proxy/Makefile 22 Oct 2011 11:54:23 -0000 1.5
+++ sysutils/ucspi-proxy/Makefile 28 Nov 2011 10:31:16 -0000
@@ -16,7 +16,7 @@ COMMENT= A proxy program for UCSPI serve
BUILD_DEPENDS= ${BGLIBS_LIB}/libbg-unix.a:${PORTSDIR}/devel/bglibs
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -s -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
BGLIBS_LIB= ${LOCALBASE}/lib/bglibs
BGLIBS_INCLUDE= ${LOCALBASE}/include/bglibs
@@ -29,7 +29,7 @@ do-configure:
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INCLUDE}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
--- strip.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RUyu9-0001hc-5f>