Prechádzať zdrojové kódy

fixed the install phase for build without C++ Compiler

Steve Weinreich 20 rokov pred
rodič
commit
dad6d954a6
2 zmenil súbory, kde vykonal 21 pridanie a 1 odobranie
  1. 18 0
      pcre/pcre.patch
  2. 3 1
      pcre/pcre.spec

+ 18 - 0
pcre/pcre.patch

@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2005-06-07 10:36:38.000000000 +0200
++++ Makefile.in	2005-06-09 14:11:36.152948488 +0200
+@@ -437,9 +437,12 @@
+ @NOT_ON_WINDOWS@	       $(LIBTOOL) --mode=install $(INSTALL) libpcre.la $(DESTDIR)$(LIBDIR)/libpcre.la
+ @NOT_ON_WINDOWS@	       echo "$(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la"
+ @NOT_ON_WINDOWS@	       $(LIBTOOL) --mode=install $(INSTALL) libpcreposix.la $(DESTDIR)$(LIBDIR)/libpcreposix.la
+-@NOT_ON_WINDOWS@	       echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la"
+-@NOT_ON_WINDOWS@	       $(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la
+-@NOT_ON_WINDOWS@	       $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR)
++@NOT_ON_WINDOWS@		( if [ -f libpcrecpp.la ] ; then \
++							echo "$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la" ;\
++							$(LIBTOOL) --mode=install $(INSTALL) libpcrecpp.la $(DESTDIR)$(LIBDIR)/libpcrecpp.la ;\
++				 		    $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR) ;\
++ 		  				  fi \
++        				)
+ 		$(mkinstalldirs) $(DESTDIR)$(INCDIR)
+ 		$(INSTALL_DATA) pcre.h $(DESTDIR)$(INCDIR)/pcre.h
+ 		$(INSTALL_DATA) $(top_srcdir)/pcreposix.h $(DESTDIR)$(INCDIR)/pcreposix.h

+ 3 - 1
pcre/pcre.spec

@@ -33,10 +33,11 @@ Class:        BASE
 Group:        Text
 License:      LGPL
 Version:      6.0
-Release:      20050608
+Release:      20050609
 
 #   list of sources
 Source0:      ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz
+Patch0:       pcre.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -58,6 +59,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
     %{l_shtool} subst \
         -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
         configure