c31486f079
In the Makefile.in, libcharset is copied with pax into lib/ along with its object files. This overwrites relocatable.lo from libiconv, which is then relinked against the wrong object. Use "libtool --mode=install cp" instead to only copy the library. Should hopefully fix PR pkg/45341.
25 lines
964 B
Text
25 lines
964 B
Text
$NetBSD: patch-ab,v 1.11 2011/09/08 16:29:49 bsiegert Exp $
|
|
|
|
--- Makefile.in.orig Sun Jun 21 11:17:09 2009
|
|
+++ Makefile.in
|
|
@@ -25,6 +25,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
mkinstalldirs = $(SHELL) @top_srcdir@/build-aux/mkinstalldirs
|
|
|
|
+top_builddir = @top_builddir@
|
|
+LIBTOOL = @LIBTOOL@
|
|
+
|
|
#### End of system configuration section. ####
|
|
|
|
SHELL = /bin/sh
|
|
@@ -39,7 +42,9 @@ all : lib/localcharset.h force
|
|
if test -d tests; then cd tests && $(MAKE) all; fi
|
|
|
|
lib/localcharset.h :
|
|
- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
|
|
+ builddir="`pwd`"; cd libcharset && $(MAKE) all && \
|
|
+ ${LIBTOOL} --mode=install cp lib/libcharset.la "$$builddir/lib/" && \
|
|
+ ${PAX} -rw include/*.h "$$builddir/"
|
|
|
|
# Installs the library and include files only. Typically called with only
|
|
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
|