34 lines
1.6 KiB
Plaintext
34 lines
1.6 KiB
Plaintext
$NetBSD: patch-af,v 1.6 2014/05/14 04:35:20 rodent Exp $
|
|
|
|
Make sure we link with AM_LDFLAGS, which arranges the link and rpath for
|
|
libintl.so.
|
|
|
|
--- src/libdar/Makefile.in.orig 2014-04-21 11:24:25.000000000 +0000
|
|
+++ src/libdar/Makefile.in
|
|
@@ -118,7 +118,7 @@ am_libdar_la_OBJECTS = $(am__objects_1)
|
|
libdar_la_OBJECTS = $(am_libdar_la_OBJECTS)
|
|
libdar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
|
- $(CXXFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
+ $(CXXFLAGS) $(AM_LDFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
@BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@am_libdar_la_rpath = -rpath \
|
|
@BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@ $(libdir)
|
|
libdar32_la_LIBADD =
|
|
@@ -126,14 +126,14 @@ am_libdar32_la_OBJECTS = $(am__objects_1
|
|
libdar32_la_OBJECTS = $(am_libdar32_la_OBJECTS)
|
|
libdar32_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
|
- $(CXXFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
+ $(CXXFLAGS) $(AM_LDFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
@BUILD_MODE32_TRUE@am_libdar32_la_rpath = -rpath $(libdir)
|
|
libdar64_la_LIBADD =
|
|
am_libdar64_la_OBJECTS = $(am__objects_1) limitint.lo
|
|
libdar64_la_OBJECTS = $(am_libdar64_la_OBJECTS)
|
|
libdar64_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
|
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
|
- $(CXXFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
+ $(CXXFLAGS) $(AM_LDFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
@BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@am_libdar64_la_rpath = -rpath \
|
|
@BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@ $(libdir)
|
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|