M7350v1_en_gpl

This commit is contained in:
T
2024-09-09 08:52:07 +00:00
commit f9cc65cfda
65988 changed files with 26357421 additions and 0 deletions

View File

@@ -0,0 +1,41 @@
Upstream-Status: Inappropriate [debian patch]
This patch address a namespace collision with libc.
Although there is no "#include <regex.h>" in the source file, at
runtime, it's unintentionally linked to the libc version, the regcomp of
libc is called instead the pcre one using pcre's data structure...
that looks like a disaster.
Can patch is from Debian (and Ubuntu 11.04alpha has it also).
[sgw: added patch comment]
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
--- a/pcreposix.h 2010-05-17 00:17:23.000000000 +0800
+++ b/pcreposix.h 2009-01-15 04:32:17.000000000 +0800
@@ -133,14 +130,19 @@
/* The functions */
-PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
-PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int);
+PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t,
regmatch_t *, int);
-PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
-PCREPOSIX_EXP_DECL void regfree(regex_t *);
+PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t);
+PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *);
#ifdef __cplusplus
} /* extern "C" */
#endif
+#define regcomp pcreposix_regcomp
+#define regexec pcreposix_regexec
+#define regerror pcreposix_regerror
+#define regfree pcreposix_regfree
+
#endif /* End of pcreposix.h */

View File

@@ -0,0 +1,27 @@
Upstream-Status: Inappropriate [configuration]
To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise
it needs to pass special variables.
It would be nice to implement per-target compiler specification to
automake, as it is done for linker.
Even better it would be nice to implement native build time targets in
automake.
Index: pcre-7.6/Makefile.am
===================================================================
--- pcre-7.6.orig/Makefile.am 2008-01-23 17:58:28.000000000 +0000
+++ pcre-7.6/Makefile.am 2008-04-03 22:32:00.000000000 +0000
@@ -147,6 +147,11 @@
noinst_PROGRAMS += dftables
dftables_SOURCES = dftables.c
+dftables_LINK = $(LINK_FOR_BUILD) -o $@
+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
+
+dftables.o: $(srcdir)/dftables.c
+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c
pcre_chartables.c: dftables$(EXEEXT)
./dftables$(EXEEXT) $@