From 3c64d6f4d545c46dee84e34c3f8a741515c97d62 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 16 Feb 2009 16:41:56 +0000 Subject: [PATCH] fix librx to use libtool modes --- librx.spec | 7 ++++++- rx-1.5-libtoolmode.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 rx-1.5-libtoolmode.patch diff --git a/librx.spec b/librx.spec index 7b33d15..5fe5f9b 100644 --- a/librx.spec +++ b/librx.spec @@ -1,7 +1,7 @@ Summary: POSIX regexp functions Name: librx Version: 1.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://www.gnu.org/software/rx/rx.html Group: Applications/Text @@ -9,6 +9,7 @@ Source0: ftp://ftp.gnu.org/gnu/rx/rx-%{version}.tar.bz2 Patch0: rx-1.5-shared.patch Patch1: rx-1.5-texinfo.patch Patch2: librx-1.5-libdir64.patch +Patch3: rx-1.5-libtoolmode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: texinfo, libtool @@ -38,6 +39,7 @@ This package contains files needed for development with librx. %ifarch x86_64 ppc64 sparc64 %patch2 -p1 -b .64bit %endif +%patch3 -p1 -b .libtoolmode %build %configure @@ -84,6 +86,9 @@ fi %{_libdir}/*.a %changelog +* Mon Feb 16 2009 Tom "spot" Callaway 1.5-11 +- pass modes to libtool + * Tue Feb 19 2008 Fedora Release Engineering - 1.5-10 - Autorebuild for GCC 4.3 diff --git a/rx-1.5-libtoolmode.patch b/rx-1.5-libtoolmode.patch new file mode 100644 index 0000000..7086e5d --- /dev/null +++ b/rx-1.5-libtoolmode.patch @@ -0,0 +1,28 @@ +diff -up rx-1.5/rx/Makefile.in.BAD rx-1.5/rx/Makefile.in +--- rx-1.5/rx/Makefile.in.BAD 2009-02-16 11:36:15.000000000 -0500 ++++ rx-1.5/rx/Makefile.in 2009-02-16 11:36:39.000000000 -0500 +@@ -67,13 +67,13 @@ gen_c_files=rgx.x + $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< + + .c.lo: +- $(LIBTOOL) $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< -o $@ ++ $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $(DEFS) -I$(srcdir) $< -o $@ + + all: librx.la + + install: all + $(INSTALL) $(srcdir)/inst-rxposix.h $(DESTDIR)$(includedir)/rxposix.h +- $(LIBTOOL) $(INSTALL) -c librx.la $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install $(INSTALL) -c librx.la $(DESTDIR)$(libdir) + + + uninstall: +@@ -127,7 +127,7 @@ librx.a: $(libobjs) $(opt_objs) + $(RANLIB) librx.a + + librx.la: $(liblobjs) $(opt_objs) +- $(LIBTOOL) $(CC) $(ALL_CFLAGS) $(DEFS) -I$(srcdir) -o $@ $(liblobjs) -rpath $(libdir) ++ $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(DEFS) -I$(srcdir) -o $@ $(liblobjs) -rpath $(libdir) + + + depends: