Browse Source

[pcre] also package 16bit variant

Mirko Vogt 10 years ago
parent
commit
d6b7702640
1 changed files with 15 additions and 2 deletions
  1. 15
    2
      libs/pcre/Makefile

+ 15
- 2
libs/pcre/Makefile View File

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2006-2014 OpenWrt.org
2
+# Copyright (C) 2006-2015 OpenWrt.org
3 3
 #
4 4
 # This is free software, licensed under the GNU General Public License v2.
5 5
 # See /LICENSE for more information.
@@ -36,6 +36,11 @@ define Package/libpcre
36 36
   TITLE:=A Perl Compatible Regular Expression library
37 37
 endef
38 38
 
39
+define Package/libpcre16
40
+  $(call Package/libpcre/default)
41
+  TITLE:=A Perl Compatible Regular Expression library (16bit support)
42
+endef
43
+
39 44
 define Package/libpcrecpp
40 45
   $(call Package/libpcre/default)
41 46
   TITLE:=C++ wrapper for Perl Compatible Regular Expression library
@@ -47,6 +52,7 @@ TARGET_CFLAGS += $(FPIC)
47 52
 CONFIGURE_ARGS += \
48 53
 	--enable-utf8 \
49 54
 	--enable-unicode-properties \
55
+	--enable-pcre16 \
50 56
 
51 57
 ifneq ($(CONFIG_PACKAGE_libpcrecpp),)
52 58
   CONFIGURE_ARGS+= --enable-cpp
@@ -68,7 +74,7 @@ define Build/InstallDev
68 74
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/pcre*.h $(1)/usr/include/
69 75
 
70 76
 	$(INSTALL_DIR) $(1)/usr/lib
71
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib//
77
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib/
72 78
 
73 79
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
74 80
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
@@ -77,6 +83,12 @@ endef
77 83
 define Package/libpcre/install
78 84
 	$(INSTALL_DIR) $(1)/usr/lib
79 85
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/
86
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/
87
+endef
88
+
89
+define Package/libpcre16/install
90
+	$(INSTALL_DIR) $(1)/usr/lib
91
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre16.so* $(1)/usr/lib/
80 92
 endef
81 93
 
82 94
 define Package/libpcrecpp/install
@@ -85,4 +97,5 @@ define Package/libpcrecpp/install
85 97
 endef
86 98
 
87 99
 $(eval $(call BuildPackage,libpcre))
100
+$(eval $(call BuildPackage,libpcre16))
88 101
 $(eval $(call BuildPackage,libpcrecpp))