fix wrong md5sum

[openwrt.git] / package / pcre / Makefile

diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index c084f00..b24d7d8 100644 (file)
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=pcre
 PKG_VERSION:=5.0
 PKG_RELEASE:=3
 PKG_NAME:=pcre
 PKG_VERSION:=5.0
 PKG_RELEASE:=3

-PKG_MD5SUM:=53976b62032fd5c76678274e5fd196b4
+PKG_MD5SUM:=813850808894d99fb5b1c41ec6335d4f

 
 

-PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=@SF/pcre
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install


@@ -22,35 +22,37 @@ $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \

                ./configure \
                ./configure \

-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --datadir=/usr/share \
-               --includedir=/usr/include \
-               --infodir=/usr/share/info \
-               --libdir=/usr/lib \
-               --libexecdir=/usr/lib \
-               --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --sbindir=/usr/sbin \
-               --sysconfdir=/etc \
-               $(DISABLE_NLS) \
-               $(DISABLE_LARGEFILE) \
-               --enable-shared \
-               --enable-static \
-               --enable-utf8 \
+                       --target=$(GNU_TARGET_NAME) \
+                       --host=$(GNU_TARGET_NAME) \
+                       --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --enable-shared \
+                       --enable-static \
+                       --enable-utf8 \

        );
        );

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 $(PKG_BUILD_DIR)/.built:
 
 $(PKG_BUILD_DIR)/.built:

+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)

        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                CC_FOR_BUILD="$(HOSTCC)" \
                LINK_FOR_BUILD="$(HOSTCC)" \
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                CC_FOR_BUILD="$(HOSTCC)" \
                LINK_FOR_BUILD="$(HOSTCC)" \


@@ -59,30 +61,32 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \

-               all
-       touch $(PKG_BUILD_DIR)/.built
-
-$(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               DESTDIR="$(STAGING_DIR)" \
-               install
-       rm -f $(STAGING_DIR)/usr/lib/libpcre*.la
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+       touch $@

 
 $(IPKG_LIBPCRE):
 
 $(IPKG_LIBPCRE):

-       mkdir -p $(IDIR_LIBPCRE)/usr/lib
-       cp -fpR $(PKG_BUILD_DIR)/.libs/libpcre*.so.* $(IDIR_LIBPCRE)/usr/lib/
+       install -d -m0755 $(IDIR_LIBPCRE)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(IDIR_LIBPCRE)/usr/lib/

        $(RSTRIP) $(IDIR_LIBPCRE)
        $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_LIBPCRE)
        $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR)
 

+$(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/usr/bin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(STAGING_DIR)/usr/bin/
+       mkdir -p $(STAGING_DIR)/usr/include
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/
+       touch $@
+

 install-dev: $(STAGING_DIR)/usr/lib/libpcre.so
 
 uninstall-dev:
        rm -rf \
          $(STAGING_DIR)/usr/bin/pcre-config \
 install-dev: $(STAGING_DIR)/usr/lib/libpcre.so
 
 uninstall-dev:
        rm -rf \
          $(STAGING_DIR)/usr/bin/pcre-config \

-         $(STAGING_DIR)/usr/include/pcre* \
-         $(STAGING_DIR)/usr/lib/libpcre* \
-         $(STAGING_DIR)/usr/lib/pkgconfig/libpcre.pc \
-         $(STAGING_DIR)/usr/share/man/man*/pcre* \
+         $(STAGING_DIR)/usr/include/pcre{,posix}.h \
+         $(STAGING_DIR)/usr/lib/libpcre{,posix}.{a,so*} \

 
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev