Hi all,

this patch:
 * updates pcre to 8.20
 * updates PKG_SOURCE_URL
 * fixes building libpcrecpp when DEVELOPER=1

Thanks,

-Raphaël
--- a/Makefile
+++ b/Makefile
@@ -8,16 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcre
-PKG_VERSION:=8.11
-PKG_RELEASE:=2
+PKG_VERSION:=8.20
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/pcre
-PKG_MD5SUM:=ef907b8792ec7f90f0dcd773848f0b3b
-
-PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+PKG_MD5SUM:=a1931c70e1273e3450d5036fe273d25c
 
 PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,12 +42,12 @@ TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
 	--enable-utf8 \
-	--enable-unicode-properties \
+	--enable-unicode-properties
 
-ifneq ($(CONFIG_PACKAGE_libpcrecpp),)
-  CONFIGURE_ARGS+= --enable-cpp
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_libpcrecpp),)
+  CONFIGURE_ARGS += --enable-cpp
 else
-  CONFIGURE_ARGS+= --disable-cpp
+  CONFIGURE_ARGS += --disable-cpp
 endif
 
 MAKE_FLAGS += \
@@ -69,7 +68,6 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
-
 endef
 
 define Package/libpcre/install
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to