svn commit: r502438 - branches/2019Q2/mail/exim
Kubilay Kocak
koobs at FreeBSD.org
Fri May 24 09:41:21 UTC 2019
Author: koobs
Date: Fri May 24 09:41:19 2019
New Revision: 502438
URL: https://svnweb.freebsd.org/changeset/ports/502438
Log:
MFH: mail/exim: r499265 r499536
mail/exim: Rename LMDB_LIBS to _LMDB_LIBS
It otherwise looks like an options helper that appears after
bsd.port.options.mk which will be flagged as a DEV_ERROR after
D19553. Rename LMDB_INCLUDES too for consistency.
mail/exim: Fix build (linker) flags
"-export-dynamic" in EXIM_DYNAMIC_LDFLAGS is a linker option, currently
producing a warning during build:
/usr/bin/ld: warning: cannot find entry symbol xport-dynamic; defaulting to 00000000004019c0
The only reason that plugin modules work is that the option is redundant
with -rdynamic.
This change makes the minimum necessary change not relying on linker
argument compatibility (- vs --).
PR: 236426
Submitted by: <andrew tao11 riddles org uk>
Approved by: portmgr (maintainer timeout: ~6 weeks, "just fix it")
Approved by: ports-secteam (blanket: port bug(s))
Modified:
branches/2019Q2/mail/exim/Makefile
Directory Properties:
branches/2019Q2/ (props changed)
Modified: branches/2019Q2/mail/exim/Makefile
==============================================================================
--- branches/2019Q2/mail/exim/Makefile Fri May 24 09:23:09 2019 (r502437)
+++ branches/2019Q2/mail/exim/Makefile Fri May 24 09:41:19 2019 (r502438)
@@ -3,7 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= mail ipv6
MASTER_SITES= EXIM:exim
MASTER_SITE_SUBDIR= /exim4/:exim \
@@ -150,7 +150,7 @@ LOG_FILE_PATH?= ${LOGDIR}/%slog
CONFIG_FILE_PATH?= ${PREFIX}/etc/exim/configure
ALT_CONFIG_PREFIX?= ${PREFIX}/etc/exim/
-EXIM_DYNAMIC_LDFLAGS= -fPIC -rdynamic -export-dynamic
+EXIM_DYNAMIC_LDFLAGS= -fPIC -rdynamic -Wl,--export-dynamic
SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \
-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
@@ -324,15 +324,15 @@ SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
.if ${PORT_OPTIONS:MLMDB}
-LMDB_LIBS= -L${LOCALBASE}/lib -llmdb
-LMDB_INCLUDES= -I${LOCALBASE}/include
+_LMDB_LIBS= -L${LOCALBASE}/lib -llmdb
+_LMDB_INCLUDES= -I${LOCALBASE}/include
SEDLIST+= -e 's,^\# (EXPERIMENTAL_LMDB=),\1,'
.else
-LMDB_LIBS=
-LMDB_INCLUDES=
+_LMDB_LIBS=
+_LMDB_INCLUDES=
.endif
-SEDLIST+= -e 's,XX_LMDB_LIBS_XX,${LMDB_LIBS:S/,/\\,/g},' \
- -e 's,XX_LMDB_INCLUDES_XX,${LMDB_INCLUDES:S/,/\\,/g},'
+SEDLIST+= -e 's,XX_LMDB_LIBS_XX,${_LMDB_LIBS:S/,/\\,/g},' \
+ -e 's,XX_LMDB_INCLUDES_XX,${_LMDB_INCLUDES:S/,/\\,/g},'
.if ${PORT_OPTIONS:MMYSQL}
SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -l${_MYSQL_SHLIB:S/lib//},' \
More information about the svn-ports-branches
mailing list