summaryrefslogtreecommitdiff
path: root/net/siproxd/files/patch-configure
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-06-11 14:49:59 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-06-11 14:49:59 +0000
commit9f8b4bcde30c0ca3bf6cead5f48aa102536e0e92 (patch)
treec4f78cbaf45ab044db3e157be708afd711a4e841 /net/siproxd/files/patch-configure
parentForgot libreoffice itself in previous commit (diff)
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)
Notes
Notes: svn path=/head/; revision=357486
Diffstat (limited to 'net/siproxd/files/patch-configure')
-rw-r--r--net/siproxd/files/patch-configure39
1 files changed, 7 insertions, 32 deletions
diff --git a/net/siproxd/files/patch-configure b/net/siproxd/files/patch-configure
index 5da8af5078ed..9e0453f6515b 100644
--- a/net/siproxd/files/patch-configure
+++ b/net/siproxd/files/patch-configure
@@ -1,38 +1,13 @@
--- configure.orig 2008-03-09 14:35:57.000000000 +0100
+++ configure 2008-09-23 11:25:19.000000000 +0200
-@@ -8063,7 +8063,7 @@
- ;;
+@@ -23988,7 +23988,9 @@
- freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ objformat=elf
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -11733,7 +11733,7 @@
- ;;
- freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ objformat=elf
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -14867,7 +14867,7 @@
- ;;
- freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ objformat=elf
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-@@ -17197,7 +17197,7 @@
- ;;
+-LIBS="$LIBS $FWLIBS"
++tmp_LIBS="${LIBS}"
++unset LIBS
++LIBS="${tmp_LIBS} $FWLIBS"
+
+
- freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ objformat=elf
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)