diff options
| author | joerg <joerg@pkgsrc.org> | 2009-09-09 17:03:11 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-09-09 17:03:11 +0000 |
| commit | b3089bc76d542b4efa1d81c77c3b59f1dbea457c (patch) | |
| tree | e625c9aaa249c31f4b30ec1c29a9049aa1d64c38 /devel/rx | |
| parent | d0fa3080e60d6573dd174d7f8216054d07d50992 (diff) | |
| download | pkgsrc-b3089bc76d542b4efa1d81c77c3b59f1dbea457c.tar.gz | |
Correctly pass down --mode=XXX for libtool.
Diffstat (limited to 'devel/rx')
| -rw-r--r-- | devel/rx/distinfo | 4 | ||||
| -rw-r--r-- | devel/rx/patches/patch-ab | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/devel/rx/distinfo b/devel/rx/distinfo index ace9b235ce8..3602f564ee9 100644 --- a/devel/rx/distinfo +++ b/devel/rx/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2009/05/18 05:44:13 dholland Exp $ +$NetBSD: distinfo,v 1.8 2009/09/09 17:03:11 joerg Exp $ SHA1 (rx-1.5.tar.bz2) = 6f58203315a1ae5e34b629f7413e21801964a48c RMD160 (rx-1.5.tar.bz2) = a68cb446492bd7abda70a7adb68849c600cb0be5 Size (rx-1.5.tar.bz2) = 415525 bytes SHA1 (patch-aa) = 6dd85891f4593c98b34835b56b0c32e89c7175a7 -SHA1 (patch-ab) = 5c38359f4826ae96cc3843b1e4fb90561c1d2c31 +SHA1 (patch-ab) = 0b2047e9ddbe200dbb3090d11db7a0d6e4f0a53a SHA1 (patch-ac) = cf6140497d7d45340a3ff424905d664eb73c2380 SHA1 (patch-ad) = 388417220ce21083c7293a163c7feb56c02082fb diff --git a/devel/rx/patches/patch-ab b/devel/rx/patches/patch-ab index 0d57d05103d..e12d2cdf4b5 100644 --- a/devel/rx/patches/patch-ab +++ b/devel/rx/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2008/04/04 15:24:56 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2009/09/09 17:03:11 joerg Exp $ --- rx/Makefile.in.orig Fri Nov 22 13:47:49 1996 +++ rx/Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2008/04/04 15:24:56 joerg Exp $ .c.o: - $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< -+ $(LIBTOOL) $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< ++ $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< -all: librx.a +all: librx.la @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2008/04/04 15:24:56 joerg Exp $ - $(INSTALL) librx.a $(libdir)/librx.a - $(RANLIB) $(libdir)/librx.a - $(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h -+ $(LIBTOOL) $(BSD_INSTALL_LIB) librx.la ${DESTDIR}$(libdir) ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) librx.la ${DESTDIR}$(libdir) + $(BSD_INSTALL_DATA) $(srcdir)/inst-rxposix.h ${DESTDIR}$(includedir)/rxposix.h @@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.3 2008/04/04 15:24:56 joerg Exp $ distclean: clean -rm Makefile config.status config.log rgx.x -@@ -111,10 +110,10 @@ +@@ -111,10 +110,9 @@ rm -rf `cat .fname` .fname @@ -44,8 +44,7 @@ $NetBSD: patch-ab,v 1.3 2008/04/04 15:24:56 joerg Exp $ - $(AR) $(AR_FLAGS) librx.a $(libobjs) $(opt_objs) - $(RANLIB) librx.a +librx.la: $(libobjs) $(opt_objs) -+ $(LIBTOOL) rm -f librx.la -+ $(LIBTOOL) $(CC) -o $@ $(libobjs:.o=.lo) $(opt_objs:.o=.lo) \ ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(libobjs:.o=.lo) $(opt_objs:.o=.lo) \ + -rpath $(libdir) -version-info $(RX_MAJOR):$(RX_MINOR) |