9f8b4bcde3
- 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)
27 lines
803 B
Text
27 lines
803 B
Text
--- configure.orig Thu Feb 13 11:01:47 2003
|
|
+++ configure Tue Apr 13 20:58:41 2004
|
|
@@ -6204,9 +6204,9 @@
|
|
SUBDIR_POPT=""
|
|
else
|
|
SUBDIR_POPT="lib_popt"
|
|
- CPPFLAGS="$CPPFLAGS -Ilib_popt"
|
|
- CFLAGS="$CFLAGS -Ilib_popt"
|
|
- LDFLAGS="$LDFLAGS -Llib_popt/.libs"
|
|
+ CPPFLAGS="-Ilib_popt $CPPFLAGS"
|
|
+ CFLAGS="-Ilib_popt $CFLAGS"
|
|
+ LDFLAGS="-Llib_popt/.libs $LDFLAGS"
|
|
LIBS_EXTRA="$LIBS_EXTRA -lpopt"
|
|
fi
|
|
echo "$as_me:$LINENO: result: $with_popt" >&5
|
|
@@ -6904,8 +6904,9 @@
|
|
echo "$as_me:$LINENO: result: $with_dmalloc" >&5
|
|
echo "${ECHO_T}$with_dmalloc" >&6
|
|
|
|
-
|
|
-LIBS="$LIBS_EXTRA $LIBS"
|
|
+LIBS_EXTRA="$LIBS_EXTRA $LIBS"
|
|
+unset LIBS
|
|
+LIBS="$LIBS_EXTRA"
|
|
|
|
enable_shared=no
|
|
export enable_shared
|