diff options
| author | minskim <minskim> | 2007-11-21 23:33:13 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2007-11-21 23:33:13 +0000 |
| commit | 813859ad2d688e08b12a01ac21b56378c0ee31d3 (patch) | |
| tree | e5b5bcb8759646431be23937797581afc8ba9eb4 | |
| parent | 846c44f6bb37e860767b0f46e1feeb001a625a86 (diff) | |
| download | pkgsrc-813859ad2d688e08b12a01ac21b56378c0ee31d3.tar.gz | |
Honor LDFLAGS.
| -rw-r--r-- | devel/readline/distinfo | 4 | ||||
| -rw-r--r-- | devel/readline/patches/patch-ae | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/devel/readline/distinfo b/devel/readline/distinfo index 209ec32a39c..2257d932bf0 100644 --- a/devel/readline/distinfo +++ b/devel/readline/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.13 2006/10/22 10:55:31 wiz Exp $ +$NetBSD: distinfo,v 1.14 2007/11/21 23:33:13 minskim Exp $ SHA1 (readline-5.2.tar.gz) = 18f3412c73068509d5f491b7b4535aeaf9522834 RMD160 (readline-5.2.tar.gz) = 983cbb25192e0a376b80cb2428fe8ee254a041c7 Size (readline-5.2.tar.gz) = 2037705 bytes -SHA1 (patch-ae) = b5956a7722a26a7394083fd81b741065436b2f68 +SHA1 (patch-ae) = b68716ae29eeb101c34d69dd274dbd846689a794 diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae index d1abb898dcb..7a6600b5d82 100644 --- a/devel/readline/patches/patch-ae +++ b/devel/readline/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ +$NetBSD: patch-ae,v 1.13 2007/11/21 23:33:14 minskim Exp $ ---- Makefile.in.orig 2005-05-08 01:11:23.000000000 +0000 +--- Makefile.in.orig 2005-05-07 18:11:23.000000000 -0700 +++ Makefile.in @@ -18,6 +18,9 @@ RL_LIBRARY_VERSION = @LIBVERSION@ @@ -12,7 +12,15 @@ $NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ PACKAGE = @PACKAGE_NAME@ VERSION = @PACKAGE_VERSION@ -@@ -94,9 +97,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT +@@ -72,6 +75,7 @@ CTAGS = ctags -tw + CFLAGS = @CFLAGS@ + LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"' + CPPFLAGS = @CPPFLAGS@ ++LDFLAGS = @LDFLAGS@ + + DEFS = @DEFS@ @CROSS_COMPILE@ + LOCAL_DEFS = @LOCAL_DEFS@ +@@ -94,9 +98,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT ${RM} $@ $(CC) -c $(CCFLAGS) $< @@ -28,7 +36,7 @@ $NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ # The C code source files for this library. CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \ -@@ -145,6 +154,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET +@@ -145,6 +155,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET all: $(TARGETS) @@ -37,7 +45,7 @@ $NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ everything: all examples static: $(STATIC_LIBS) -@@ -154,17 +165,31 @@ libreadline.a: $(OBJECTS) +@@ -154,17 +166,33 @@ libreadline.a: $(OBJECTS) $(AR) $(ARFLAGS) $@ $(OBJECTS) -test -n "$(RANLIB)" && $(RANLIB) $@ @@ -45,6 +53,7 @@ $NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ + $(LIBTOOL) --mode=clean $(RM) $@ + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \ + -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \ ++ $(LDFLAGS) + libhistory.a: $(HISTOBJ) xmalloc.o $(RM) $@ @@ -54,7 +63,8 @@ $NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ +libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo + $(LIBTOOL) --mode=clean $(RM) $@ + $(LIBTOOL) --mode=link $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo \ -+ -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) ++ -rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \ ++ $(LDFLAGS) + # Since tilde.c is shared between readline and bash, make sure we compile # it with the right flags when it's built as part of readline @@ -69,7 +79,7 @@ $NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $ readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a $(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB} -@@ -243,6 +268,12 @@ install-shared: installdirs install-head +@@ -243,6 +271,12 @@ install-shared: installdirs install-head uninstall-shared: maybe-uninstall-headers -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) |