diff options
author | erh <erh> | 2003-12-05 18:15:49 +0000 |
---|---|---|
committer | erh <erh> | 2003-12-05 18:15:49 +0000 |
commit | efa6f4086fe7cea9860f5c9c6882b7ee9fc18c6f (patch) | |
tree | 1737d343e6ca333764386297af406ca6e4d90438 /devel/gettext/patches | |
parent | 945477a5a676e2ab118eeab969d2cd0f4850fbfb (diff) | |
download | pkgsrc-efa6f4086fe7cea9860f5c9c6882b7ee9fc18c6f.tar.gz |
If we're on AIX, don't remove the .a library: it's the shared library.
Combine patch-ai into patch-ah to make future updates easier.
Diffstat (limited to 'devel/gettext/patches')
-rw-r--r-- | devel/gettext/patches/patch-ag | 21 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ah | 43 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ai | 26 |
3 files changed, 56 insertions, 34 deletions
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag index dd728e3667f..1c1204847bd 100644 --- a/devel/gettext/patches/patch-ag +++ b/devel/gettext/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.4 2002/12/11 22:27:26 jlam Exp $ +$NetBSD: patch-ag,v 1.5 2003/12/05 18:15:49 erh Exp $ ---- lib/Makefile.in.orig Tue Aug 6 06:58:14 2002 -+++ lib/Makefile.in -@@ -227,7 +227,7 @@ libgettextlib_la_LIBADD = @LTALLOCA@ @LT +--- lib/Makefile.in.orig 2002-08-06 08:58:14.000000000 -0500 ++++ lib/Makefile.in 2003-12-04 17:16:55.000000000 -0600 +@@ -227,7 +227,7 @@ # Need @LTLIBICONV@ because linebreak.c uses iconv(). libgettextlib_la_LDFLAGS = \ -release @VERSION@ \ @@ -11,3 +11,16 @@ $NetBSD: patch-ag,v 1.4 2002/12/11 22:27:26 jlam Exp $ +@@ -517,9 +517,12 @@ + + + # No need to install libgettextlib.a. ++# Unless we're on AIX, where .a's are shared libraries. + install-exec-am: install-exec-clean + install-exec-clean: ++.if ${OPSYS} != "AIX" + $(RM) $(DESTDIR)$(libdir)/libgettextlib.a ++.endif + + all-local c-ctype.lo execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo tmpdir.lo wait-process.lo xerror.lo: @STDBOOL_H@ + stdbool.h: stdbool.h.in diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah index c66114de52b..2982d8bd7fc 100644 --- a/devel/gettext/patches/patch-ah +++ b/devel/gettext/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2002/12/11 22:27:26 jlam Exp $ +$NetBSD: patch-ah,v 1.4 2003/12/05 18:15:49 erh Exp $ ---- src/Makefile.in.orig Tue Aug 6 06:59:06 2002 -+++ src/Makefile.in -@@ -248,7 +248,7 @@ urlget_SOURCES = urlget.c +--- src/Makefile.in.orig 2002-08-06 08:59:06.000000000 -0500 ++++ src/Makefile.in 2003-12-04 17:34:23.000000000 -0600 +@@ -248,7 +248,7 @@ # use iconv(). libgettextsrc_la_LDFLAGS = \ -release @VERSION@ \ @@ -11,3 +11,38 @@ $NetBSD: patch-ah,v 1.3 2002/12/11 22:27:26 jlam Exp $ # Link dependencies. +@@ -267,9 +267,7 @@ + msgexec_LDADD = libgettextsrc.la + msgfilter_LDADD = libgettextsrc.la + msggrep_LDADD = libgettextsrc.la +-msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_LDADD = libgettextsrc.la + + msguniq_LDADD = libgettextsrc.la + +@@ -367,9 +365,7 @@ + msggrep_LDFLAGS = + am_msginit_OBJECTS = msginit.$(OBJEXT) + msginit_OBJECTS = $(am_msginit_OBJECTS) +-msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_DEPENDENCIES = libgettextsrc.la + msginit_LDFLAGS = + am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) + msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) +@@ -731,9 +727,12 @@ + + + # No need to install libgettextsrc.a. ++# Unless we're on AIX, where .a's are shared libraries. + install-exec-am: install-exec-clean + install-exec-clean: ++.if ${OPSYS} != "AIX" + $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ++.endif + + po-lex.o po-lex.lo: po-gram-gen2.h + po-gram-gen2.h: po-gram-gen.h diff --git a/devel/gettext/patches/patch-ai b/devel/gettext/patches/patch-ai deleted file mode 100644 index 6771c00f6c4..00000000000 --- a/devel/gettext/patches/patch-ai +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2002/11/27 17:41:07 drochner Exp $ - ---- src/Makefile.in.orig Tue Aug 6 15:59:06 2002 -+++ src/Makefile.in Sun Sep 1 16:27:46 2002 -@@ -267,9 +267,7 @@ - msgexec_LDADD = libgettextsrc.la - msgfilter_LDADD = libgettextsrc.la - msggrep_LDADD = libgettextsrc.la --msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- libgettextsrc.la -+msginit_LDADD = libgettextsrc.la - - msguniq_LDADD = libgettextsrc.la - -@@ -367,9 +365,7 @@ - msggrep_LDFLAGS = - am_msginit_OBJECTS = msginit.$(OBJEXT) - msginit_OBJECTS = $(am_msginit_OBJECTS) --msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- libgettextsrc.la -+msginit_DEPENDENCIES = libgettextsrc.la - msginit_LDFLAGS = - am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) - msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) |