mirror of
https://git.freebsd.org/ports.git
synced 2025-06-02 11:26:29 -04:00
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)
45 lines
1 KiB
Text
45 lines
1 KiB
Text
--- configure.orig
|
|
+++ configure
|
|
@@ -4436,42 +4436,6 @@
|
|
|
|
|
|
LINKER="$CXX"
|
|
-if test x$GCC = xyes && test x$GXX = xyes; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5
|
|
-$as_echo_n "checking for working libsupc++... " >&6; }
|
|
- save_CXX="$CXX"
|
|
- save_LIBS="$LIBS"
|
|
- CXX="$CC"
|
|
- LIBS="$LIBS -lsupc++"
|
|
-
|
|
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-struct test { }; void f() try { throw new test; } catch (...) { throw; }
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_cxx_try_link "$LINENO"; then :
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
-$as_echo "ok" >&6; }
|
|
- LINKER="$CC"
|
|
-else
|
|
-
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5
|
|
-$as_echo "no, making everything bigger and slower" >&6; }
|
|
- LIBS="$save_LIBS"
|
|
-
|
|
-
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
- CXX="$save_CXX"
|
|
-fi
|
|
-LINKER=$LINKER
|
|
|
|
|
|
if test -z "$orig_CXXFLAGS"; then
|