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 /editors | |
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 'editors')
-rw-r--r-- | editors/joe/Makefile | 2 | ||||
-rw-r--r-- | editors/joe2/Makefile | 2 | ||||
-rw-r--r-- | editors/mlview/Makefile | 2 | ||||
-rw-r--r-- | editors/xcoral/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/editors/joe/Makefile b/editors/joe/Makefile index beb6a10a850e..55bae1db15f6 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -22,8 +22,8 @@ CONFLICTS= joe-2.* USES= gmake iconv ncurses GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} ALL_TARGET= ${PORTNAME} diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile index b0625754a786..b6e2a8e01ce3 100644 --- a/editors/joe2/Makefile +++ b/editors/joe2/Makefile @@ -19,8 +19,8 @@ CONFLICTS= joe-3* GNU_CONFIGURE= yes USES= iconv gmake -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} ALL_TARGET= ${PORTNAME} diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index 3462deaa824f..c50f503d1d7f 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -15,8 +15,8 @@ USE_AUTOTOOLS= autoconf libtool USES= pathfix gmake iconv pkgconfig tar:bzip2 USE_GNOME= eel2 gnomeprefix gtksourceview libgnomeui USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0` +LIBS+= -L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0` ${ICONV_LIB} GCONF_SCHEMAS= mlview.schemas diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index 6952ac2f8fac..b1a3bd306a98 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -11,8 +11,8 @@ COMMENT= Multiwindow mouse-based text editor for X USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lgnuregex" CONFIGURE_ARGS= --libdir=${PREFIX}/share +LIBS+= -lgnuregex MAKE_JOBS_UNSAFE= yes PLIST_SUB= VERSION="${PORTVERSION}" |