diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 11:22:27 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 11:22:27 +0200 |
| commit | 0b1d79c3738a0a922982ab1d0529611605558ddf (patch) | |
| tree | 8082b61b96e4baa631824e681755e207387527df /rules | |
| parent | 04778c4f78d62cdd63f8aa87de52f317b2c0fd03 (diff) | |
| download | ptxdist-0b1d79c3738a0a922982ab1d0529611605558ddf.tar.gz ptxdist-0b1d79c3738a0a922982ab1d0529611605558ddf.tar.xz | |
glib: use 'real' libpcre
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/glib.in | 2 | ||||
| -rw-r--r-- | rules/glib.make | 2 | ||||
| -rw-r--r-- | rules/host-glib.in | 1 | ||||
| -rw-r--r-- | rules/host-glib.make | 2 | ||||
| -rw-r--r-- | rules/host-libpcre.make | 3 | ||||
| -rw-r--r-- | rules/libpcre.make | 3 |
6 files changed, 9 insertions, 4 deletions
diff --git a/rules/glib.in b/rules/glib.in index 6f4253ae0..a6571681c 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -8,6 +8,8 @@ menuconfig GLIB select LIBC_RESOLV select LIBC_PTHREAD select LIBFFI + select LIBPCRE + select LIBPCRE_ENABLE_UTF8 select GCCLIBS_GCC_S select HOST_GTK_DOC select ICONV diff --git a/rules/glib.make b/rules/glib.make index 84aa4cec1..2e1ecd715 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -79,7 +79,7 @@ GLIB_CONF_OPT := \ --disable-coverage \ --with-libiconv=no \ --with-threads=posix \ - --with-pcre=internal + --with-pcre=system # workaround for broken libtool GLIB_CFLAGS:= -Wl,-rpath-link,$(GLIB_DIR)/gmodule/.libs diff --git a/rules/host-glib.in b/rules/host-glib.in index 570d5eb61..18b583db5 100644 --- a/rules/host-glib.in +++ b/rules/host-glib.in @@ -4,3 +4,4 @@ config HOST_GLIB tristate select HOST_ZLIB select HOST_LIBFFI + select HOST_LIBPCRE diff --git a/rules/host-glib.make b/rules/host-glib.make index c5bd4386c..eed5a6b34 100644 --- a/rules/host-glib.make +++ b/rules/host-glib.make @@ -53,7 +53,7 @@ HOST_GLIB_CONF_OPT := \ --disable-coverage \ --with-libiconv=no \ --with-threads=posix \ - --with-pcre=internal + --with-pcre=system $(STATEDIR)/host-glib.install.post: @$(call targetinfo) diff --git a/rules/host-libpcre.make b/rules/host-libpcre.make index 886d2fa96..b9048f295 100644 --- a/rules/host-libpcre.make +++ b/rules/host-libpcre.make @@ -25,6 +25,7 @@ HOST_LIBPCRE_CONF_OPT :=\ $(HOST_AUTOCONF) \ --disable-pcregrep-libz \ --disable-pcregrep-libbz2 \ - --enable-utf8 + --enable-utf8 \ + --enable-unicode-properties # vim: syntax=make diff --git a/rules/libpcre.make b/rules/libpcre.make index 455c879c7..a628f543b 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -38,7 +38,8 @@ LIBPCRE_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBZ)-pcregrep-libz \ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBBZ2)-pcregrep-libbz2 \ - --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-utf8 + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-utf8 \ + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-unicode-properties \ ifdef PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF LIBPCRE_AUTOCONF += --enable-newline-is-anycrlf |