summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2012-04-11 03:34:16 +0000
committerMartin Wilke <miwi@FreeBSD.org>2012-04-11 03:34:16 +0000
commitb3630c6d8f436cc57f04e593ace53f766e62b8c7 (patch)
tree77a9ba40ab99167f0d0cadfd8dcbf44ae195b571
parent- Update to 0.3.4 (diff)
- Respect STRIP/LDFLAGS
PR: 162920 Submitted by: Jan Beich (jbeich@tormail.net)
Notes
Notes: svn path=/head/; revision=294592
Diffstat
-rw-r--r--devel/bglibs/Makefile3
-rw-r--r--ftp/twoftpd/Makefile4
-rw-r--r--mail/mailfront/Makefile2
-rw-r--r--mail/qmail-autoresponder/Makefile4
-rw-r--r--mail/qmail-notify/Makefile3
-rw-r--r--mail/qmail-qfilter/Makefile3
-rw-r--r--mail/relay-ctrl/Makefile2
-rw-r--r--security/cvm/Makefile3
-rw-r--r--sysutils/qlogtools/Makefile4
-rw-r--r--sysutils/ucspi-proxy/Makefile4
-rw-r--r--sysutils/ucspi-unix/Makefile4
11 files changed, 15 insertions, 21 deletions
diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index e20248394ff2..b7a6963efb0c 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -22,7 +22,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}
@@ -35,7 +34,7 @@ post-patch:
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
diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index fd3f161d19b9..5d89f9d7ff11 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= cvm-v2client.2:${PORTSDIR}/security/cvm
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
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index aaa59e71d80f..7e8c9fc6c5e8 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -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
diff --git a/mail/qmail-autoresponder/Makefile b/mail/qmail-autoresponder/Makefile
index 9bc64e90bee0..01a6d478db17 100644
--- a/mail/qmail-autoresponder/Makefile
+++ b/mail/qmail-autoresponder/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= bg-sysdeps.2:${PORTSDIR}/devel/bglibs
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
diff --git a/mail/qmail-notify/Makefile b/mail/qmail-notify/Makefile
index f5175cd99941..e77ca4b0a8d1 100644
--- a/mail/qmail-notify/Makefile
+++ b/mail/qmail-notify/Makefile
@@ -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
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index 484d431ed742..1029d65c8c93 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -16,7 +16,6 @@ COMMENT= Front-end for qmail-queue to run messages through filters
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
diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
index 60c727f356fd..a75883b091fe 100644
--- a/mail/relay-ctrl/Makefile
+++ b/mail/relay-ctrl/Makefile
@@ -31,7 +31,7 @@ SUB_LIST= EXPIRY=${RELAY_CTRL_EXPIRY} FIXUP=${RELAY_CTRL_RELAYCLIENT}
do-configure:
${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
+ ${ECHO_CMD} "${CC} ${STRIP} ${LDGFLAGS} " > ${WRKSRC}/conf-ld
${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index 8cc0e45f7922..fef206b00d5d 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -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
diff --git a/sysutils/qlogtools/Makefile b/sysutils/qlogtools/Makefile
index 3e14ee3dc8b6..910702443fd5 100644
--- a/sysutils/qlogtools/Makefile
+++ b/sysutils/qlogtools/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES= http://untroubled.org/${PORTNAME}/
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
@@ -23,7 +21,7 @@ DOCS= NEWS README
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} ${STRIP} ${CFLAGS}" > ${WRKSRC}/conf-cc
${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/conf-ld
do-install:
diff --git a/sysutils/ucspi-proxy/Makefile b/sysutils/ucspi-proxy/Makefile
index d6ac4eadcead..223ca6537679 100644
--- a/sysutils/ucspi-proxy/Makefile
+++ b/sysutils/ucspi-proxy/Makefile
@@ -16,7 +16,7 @@ COMMENT= A proxy program for UCSPI servers and clients
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
diff --git a/sysutils/ucspi-unix/Makefile b/sysutils/ucspi-unix/Makefile
index 5e4cd71f03a7..be2ebf4bee3a 100644
--- a/sysutils/ucspi-unix/Makefile
+++ b/sysutils/ucspi-unix/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${BGLIBS_LIB}/libbg.a:${PORTSDIR}/devel/bglibs
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} ${LDFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld
${ECHO_CMD} "${BGLIBS_INC}" > ${WRKSRC}/conf-bgincs
${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 00:23:55 +0000