summaryrefslogtreecommitdiff
path: root/sysutils/dar/files/patch-src-dar-Makefile.in
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 /sysutils/dar/files/patch-src-dar-Makefile.in
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)
Diffstat (limited to 'sysutils/dar/files/patch-src-dar-Makefile.in')
-rw-r--r--sysutils/dar/files/patch-src-dar-Makefile.in22
1 files changed, 20 insertions, 2 deletions
diff --git a/sysutils/dar/files/patch-src-dar-Makefile.in b/sysutils/dar/files/patch-src-dar-Makefile.in
index 9688c36e658c..983b530a0884 100644
--- a/sysutils/dar/files/patch-src-dar-Makefile.in
+++ b/sysutils/dar/files/patch-src-dar-Makefile.in
@@ -1,6 +1,6 @@
--- src/dar_suite/Makefile.in.orig 2007-08-06 15:55:23.000000000 +0200
+++ src/dar_suite/Makefile.in 2007-08-06 15:55:32.000000000 +0200
-@@ -282,7 +282,7 @@
+@@ -330,7 +330,7 @@
@USE_UPX_TRUE@UPX = @UPX_PROG@
@BUILD_DAR_STATIC_FALSE@@USE_UPX_TRUE@ALSO_BUILD_INST =
@BUILD_DAR_STATIC_TRUE@@USE_UPX_TRUE@ALSO_BUILD_INST = $(ALSO_BUILD)$(EXEEXT)
@@ -8,4 +8,22 @@
+LDADD=../libdar/lib$(MYLIB).la
@DEBUG_STATIC_FALSE@AM_LDFLAGS = @LTLIBINTL@ $(LD_PROF)
@DEBUG_STATIC_TRUE@AM_LDFLAGS = -all-static @LTLIBINTL@ $(LD_PROF)
- dar_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage getopt_decision.h my_getopt_long.h
+ dar_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage getopt_decision.h my_getopt_long.h line_tools.hpp line_tools.cpp crit_action_cmd_line.cpp crit_action_cmd_line.hpp
+@@ -349,7 +349,7 @@
+ #
+ dar_static_SOURCES = command_line.cpp command_line.hpp config_file.cpp config_file.hpp dar.cpp dar.hpp dar_suite.cpp dar_suite.hpp hide_file.cpp hide_file.hpp no_comment.cpp no_comment.hpp shell_interaction.cpp shell_interaction.hpp dar.usage line_tools.hpp line_tools.cpp crit_action_cmd_line.cpp
+ dar_static_DEPENDENCIES = ../libdar/lib$(MYLIB).la
+-dar_static_LDFLAGS = -all-static @LTLIBINTL@
++dar_static_LDFLAGS = -all-static @LTLIBINTL@ @LTLIBICONV@
+ all: all-am
+
+ .SUFFIXES:
+@@ -456,7 +456,7 @@
+ $(CXXLINK) $(dar_slave_OBJECTS) $(dar_slave_LDADD) $(LIBS)
+ dar_static$(EXEEXT): $(dar_static_OBJECTS) $(dar_static_DEPENDENCIES) $(EXTRA_dar_static_DEPENDENCIES)
+ @rm -f dar_static$(EXEEXT)
+- $(dar_static_LINK) $(dar_static_OBJECTS) $(dar_static_LDADD) $(LIBS)
++ $(dar_static_LINK) $(dar_static_OBJECTS) $(dar_static_LDADD) $(LIBS) -lelf
+ dar_xform$(EXEEXT): $(dar_xform_OBJECTS) $(dar_xform_DEPENDENCIES) $(EXTRA_dar_xform_DEPENDENCIES)
+ @rm -f dar_xform$(EXEEXT)
+ $(CXXLINK) $(dar_xform_OBJECTS) $(dar_xform_LDADD) $(LIBS)