diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-06-07 23:39:26 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-06-07 23:39:26 +0000 |
| commit | 0839dcb3bfac8f499d0a607f98ee3b209f3b894c (patch) | |
| tree | 8f3f5fd39dcd05e3538b2c7a6a0c7a23ed1d1a64 /pcre | |
| parent | 322d8d89956ec81de84ee658515d08cc1a3d0b3e (diff) | |
Remove unnecessary patches to pcre that were making libtool believe it was building convenience libraries.
BKrev: 40c4fcae6U4lEfjqkY1KmFTcN-9eDQ
Diffstat (limited to 'pcre')
| -rw-r--r-- | pcre/pcre-4.4/lai.patch | 18 | ||||
| -rw-r--r-- | pcre/pcre-4.4/rpath.patch | 22 | ||||
| -rw-r--r-- | pcre/pcre_4.4.oe | 4 |
3 files changed, 1 insertions, 43 deletions
diff --git a/pcre/pcre-4.4/lai.patch b/pcre/pcre-4.4/lai.patch deleted file mode 100644 index 6170a36771..0000000000 --- a/pcre/pcre-4.4/lai.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- pcre-4.4/Makefile.in~lai -+++ pcre-4.4/Makefile.in -@@ -208,8 +208,10 @@ - - install: all @ON_WINDOWS@ wininstall - @NOT_ON_WINDOWS@ $(mkinstalldirs) $(DESTDIR)$(LIBDIR) -+@NOT_ON_WINDOWS@ if [ ! -e .libs/libpcre.lai ]; then cp libpcre.la .libs/libpcre.lai; fi - @NOT_ON_WINDOWS@ echo "$(LIBTOOL) --mode=install $(INSTALL) libpcre.la $(DESTDIR)$(LIBDIR)/libpcre.la" - @NOT_ON_WINDOWS@ $(LIBTOOL) --mode=install $(INSTALL) libpcre.la $(DESTDIR)$(LIBDIR)/libpcre.la -+@NOT_ON_WINDOWS@ if [ ! -e .libs/libpcreposix.lai ]; then cp libpcreposix.la .libs/libpcreposix.lai; fi - @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@ $(LIBTOOL) --finish $(DESTDIR)$(LIBDIR) diff --git a/pcre/pcre-4.4/rpath.patch b/pcre/pcre-4.4/rpath.patch deleted file mode 100644 index 29a4413c4b..0000000000 --- a/pcre/pcre-4.4/rpath.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- pcre-4.4/Makefile.in~rpath -+++ pcre-4.4/Makefile.in -@@ -107,12 +107,12 @@ - - libpcre.la: $(OBJ) - -rm -f libpcre.la -- $(LINKLIB) -rpath $(LIBDIR) -version-info \ -+ $(LINKLIB) -version-info \ - '$(PCRELIBVERSION)' -o libpcre.la $(LOBJ) - - libpcreposix.la: pcreposix.@OBJEXT@ - -rm -f libpcreposix.la -- $(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \ -+ $(LINKLIB) libpcre.la -version-info \ - '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo - - pcre.@OBJEXT@: $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \ diff --git a/pcre/pcre_4.4.oe b/pcre/pcre_4.4.oe index ab0935fb68..29f524eee6 100644 --- a/pcre/pcre_4.4.oe +++ b/pcre/pcre_4.4.oe @@ -5,9 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." -SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2 \ - file://rpath.patch;patch=1 \ - file://lai.patch;patch=1" +SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" inherit autotools |