remove libintl's shared lib inter-library dependency on libiconv.

Thanks to naddy@, alek@ and other porters for doing the prep work
which allows this to be commited.
This commit is contained in:
brad 2004-10-24 19:54:46 +00:00
parent 1ae09c843d
commit bae67aa20a
3 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-intl_Makefile_in,v 1.3 2004/10/24 19:54:46 brad Exp $
--- intl/Makefile.in.orig Fri Sep 14 21:15:49 2001
+++ intl/Makefile.in Sat Aug 7 19:36:22 2004
@@ -83,8 +83,8 @@ DISTFILES.obsolete = xopen-msg.sed linux
# according to the libtool documentation, section "Library interface versions".
# Maintainers of other packages that include the intl directory must *not*
# change these values.
-LTV_CURRENT=1
-LTV_REVISION=1
+LTV_CURRENT=2
+LTV_REVISION=0
LTV_AGE=0
.SUFFIXES:
@@ -118,7 +118,7 @@ libintl.a libgnuintl.a: $(OBJECTS)
libintl.la libgnuintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link \
$(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
- $(OBJECTS) @LIBICONV@ \
+ $(OBJECTS) \
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-rpath $(libdir) \
-no-undefined

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1 2004/10/24 19:54:46 brad Exp $
--- tests/Makefile.in.orig 2004-02-03 00:41:28.000000000 -0500
+++ tests/Makefile.in 2004-02-03 00:42:31.000000000 -0500
@@ -118,7 +118,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_src
# Two auxiliary programs used by the tests.
INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
+LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @LIBICONV@
LDADD_yes = ../intl/libintl.la
LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
EXTRA_PROGRAMS = tstgettext tstngettext cake

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/07 23:41:27 brad Exp $
@lib lib/libintl.so.1.1
@comment $OpenBSD: PFRAG.shared,v 1.5 2004/10/24 19:54:46 brad Exp $
@lib lib/libintl.so.2.0