diff options
| author | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
| commit | 64c83961643743b2423afc56e568e2cb05963660 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /mail/postfix-current | |
| parent | b1d52ddb282f29c948118e6048aa57331cc442c0 (diff) | |
| download | pkgsrc-64c83961643743b2423afc56e568e2cb05963660.tar.gz | |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'mail/postfix-current')
| -rw-r--r-- | mail/postfix-current/options.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index b75d656f186..0227d25fa5b 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:52 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2004/08/27 06:29:08 jlam Exp $ # Global and legacy options # @@ -67,7 +67,7 @@ PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl # . endif # CCARGS+= -DHAS_SSL # AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \ -# -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ +# ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ # -lssl -lcrypto # PLIST_SRC+= ${PKGDIR}/PLIST.tls # MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls @@ -80,7 +80,7 @@ PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl . include "../../devel/pcre/buildlink3.mk" CCARGS+= -DHAS_PCRE AUXLIBS+= -L${BUILDLINK_PREFIX.pcre}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib \ -lpcre .else CCARGS+= -DNO_PCRE @@ -93,13 +93,13 @@ CCARGS+= -DNO_PCRE . include "../../databases/openldap/buildlink3.mk" CCARGS+= -DHAS_LDAP AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ -lldap -llber . if ${OPSYS} != "Linux" . include "../../databases/db4/buildlink3.mk" CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ -ldb4 . endif .endif @@ -116,7 +116,7 @@ AUXLIBS+= `${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs` . include "../../databases/mysql-client/buildlink3.mk" CCARGS+= -DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ -lmysqlclient -lz -lm .endif @@ -143,7 +143,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl2 PWCHECK_METHOD= auxprop CCARGS+= -DUSE_SASL_AUTH AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 . elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) . include "../../security/cyrus-sasl2/buildlink3.mk" @@ -152,7 +152,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl2 PWCHECK_METHOD= auxprop CCARGS+= -DUSE_SASL_AUTH AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 . elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) . include "../../security/cyrus-sasl/buildlink3.mk" @@ -160,7 +160,7 @@ SASLLIBDIR= ${PREFIX}/lib/sasl PWCHECK_METHOD= sasldb CCARGS+= -DUSE_SASL_AUTH AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl . endif PLIST_SRC+= ${PKGDIR}/PLIST.sasl @@ -173,6 +173,6 @@ MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} . include "../../databases/db/buildlink3.mk" CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2 AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \ - -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ -ldb2 .endif |