diff options
author | tijl <tijl@FreeBSD.org> | 2014-06-11 22:49:59 +0800 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2014-06-11 22:49:59 +0800 |
commit | 67f12d415fec83113a7ddfbc9655db98b4e70a28 (patch) | |
tree | c4f78cbaf45ab044db3e157be708afd711a4e841 /ftp/proftpd | |
parent | 2088f53b95d04c86b1aece3d66aaca36ec5aaec2 (diff) | |
download | freebsd-ports-gnome-67f12d415fec83113a7ddfbc9655db98b4e70a28.tar.gz freebsd-ports-gnome-67f12d415fec83113a7ddfbc9655db98b4e70a28.tar.zst freebsd-ports-gnome-67f12d415fec83113a7ddfbc9655db98b4e70a28.zip |
Support LIBS like LDFLAGS.
- Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV.
- Add an option helper for LIBS.
- Adjust all ports that already use LIBS. Also remove references to
PTHREAD_CFLAGS and PTHREAD_LIBS while here.
- Some ports did not support having a LIBS environment variable and
required additional patches.
Somewhat simplified a linker command line looks like:
${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS}
where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and
LIBS can be controlled by us. If possible -L and -l flags need to be
added to LIBS to make sure they appear after any -L and -l flags set by
upstream. Many ports currently add -L${LOCALBASE}/lib to LDFLAGS but this
may appear too early on the command line causing installed libraries to
be linked in instead of freshly built ones.
Additional changes:
benchmarks/netio: Replace WITH_IPV6 with an IPV6 option.
comms/gnokii: Replace some patches with USES=pathfix. Also remove -fPIC.
graphics/gimageview: USES=libtool and install desktop file in DESKTOPDIR.
graphics/visionworkbench: Remove FreeBSD 7 support.
multimedia/libmovtar: New LIB_DEPENDS syntax.
multimedia/opencinematools: Use standard do-build.
net/siproxd: USES=libtool:keepla (port actually needs .la files for plugins)
net-mgmt/nagios: Remove -fPIC.
net-mgmt/nagios4: Remove -fPIC.
print/cups-base: Only add -lssp_nonshared on i386 and OSVERSION < 1000036.
security/p11-kit: Replace PTHREAD_LIBS in CONFIGURE_ENV with
ac_cv_func_pthread_mutexattr_init=no in CONFIGURE_ARGS. This skips a test
in configure that falsely detects pthread_mutexattr_init in our libc.
sysutils/dar: Fix iconv detection.
x11/rxvt-unicode: Remove -lstdc++ and patch configure to remove a FreeBSD
hack and use $CXX as linker as on other platforms.
PR: 190592
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'ftp/proftpd')
-rw-r--r-- | ftp/proftpd/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 44f04b65e74b..a9b02f898f50 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -100,8 +100,8 @@ PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" .include <bsd.port.options.mk> .if !defined(_BUILDING_PROFTPD_MODULE) -CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} -PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} +CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} +LIBS+= -lssl -lcrypto -L${OPENSSLLIB} .endif .if !defined(_BUILDING_PROFTPD_MODULE) @@ -180,7 +180,7 @@ MODULES+= mod_memcache \ mod_tls_memcache LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached CONFIGURE_ARGS+= --enable-memcache -PROFTPD_LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil +LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil PLIST_SUB+= MEMCACHE="" .else CONFIGURE_ARGS+= --disable-memcache @@ -193,7 +193,6 @@ _MODULES:=${_MODULES}:${m} .endfor # Keep this here below, in case similar constructs need to be made -CONFIGURE_ENV+= LIBS="${PROFTPD_LIBS}" CONFIGURE_ARGS+= --with-shared=${_MODULES:C/^://g} .endif #!defined(_BUILDING_PROFTPD_MODULE) |