Skip to contentSkip to conversation

libpcre2: add it for newer vte

PATCH New Robert Yang 1 participant 2 messages Feb 10, 2017

lore
Share & tools
lore
#0 lore raw

cover libpcre2: add it for newer vte

The following changes since commit d1109378d730c5cf50240c4d1a468e3aef5208ea:

nss: Fix nss-native so the checksum doesn't change with BUILD_ARCH (2017-02-09 10:50:54 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/pcre2
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/pcre2

Robert Yang (1):
libpcre2: add it for newer vte

 .../libpcre/libpcre2/pcre-cross.patch              | 65 ++++++++++++++++++++++
 meta/recipes-support/libpcre/libpcre2_10.22.bb     | 56 +++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
 create mode 100644 meta/recipes-support/libpcre/libpcre2_10.22.bb
Signature · 1 line
2.9.0
#1 lore raw

PATCH 1/1 libpcre2: add it for newer vte

There are two major versions of the PCRE library. The newest version, PCRE2, was released in 2015 and is at version 10.22.

The original, very widely deployed PCRE library, originally released in 1997, is at version 8.40, and the API and feature set are stable, future releases will be for bugfixes only. All new future features will be to PCRE2, not the original PCRE 8.x series.

The newer vte depends on libpcre2, so add it.

---
 .../libpcre/libpcre2/pcre-cross.patch              | 65 ++++++++++++++++++++++
 meta/recipes-support/libpcre/libpcre2_10.22.bb     | 56 +++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
 create mode 100644 meta/recipes-support/libpcre/libpcre2_10.22.bb
meta/recipes-support/libpcre/libpcre2/pcre-cross.patch new file +65 -0
new file mode 100644
index 0000000..9516caf
@@ -0,0 +1,65 @@
+Fix for cross compiling
+
+Fixed:
+| ./dftables src/pcre2_chartables.c
+| make: ./dftables: Command not found
+| make: *** [src/pcre2_chartables.c] Error 127
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+
+diff --git a/Makefile.am b/Makefile.am
+index 38f1d41..2bde083 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -298,9 +298,21 @@ bin_SCRIPTS = pcre2-config
+ ## to copy a distributed set of tables that are defined for ASCII code. In this
+ ## case, dftables is not needed.
+ 
++CC_FOR_BUILD = @CC_FOR_BUILD@
++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
++CCLD_FOR_BUILD = @CCLD_FOR_BUILD@
++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
++
+ if WITH_REBUILD_CHARTABLES
+ noinst_PROGRAMS += dftables
+ dftables_SOURCES = src/dftables.c
++
++dftables_LINK = $(CCLD_FOR_BUILD) -o $@
++dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
++
++src/dftables.o: $(srcdir)/src/dftables.c
++	$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/src/dftables.c
++
+ src/pcre2_chartables.c: dftables$(EXEEXT)
+ 	rm -f $@
+ 	./dftables$(EXEEXT) $@
+diff --git a/configure.ac b/configure.ac
+index d7c57aa..d6eb0aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,23 @@ then
+   fi
+ fi
+ 
++if test x"$cross_compiling" = xyes; then
++    CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
++    CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}"
++    CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
++    LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}"
++else
++    CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
++    CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}"
++    CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}"
++    LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}"
++fi
++AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
++AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend])
++AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments])
++AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments])
++
++
+ # Check for a 64-bit integer type
+ AC_TYPE_INT64_T
+ 
meta/recipes-support/libpcre/libpcre2_10.22.bb new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
2.9.0