diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2018-04-15 22:28:48 -0400 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-05-01 18:12:50 -0700 |
| commit | 75a84a920a0770b8a0e6a7925433eb7830f97187 (patch) | |
| tree | 3bb95f9e1c34dea574c950ef950949ecd713946e /meta-oe/recipes-devtools | |
| parent | 5401466fba7d4b72ab8dea2ace8591eac011642f (diff) | |
| download | meta-openembedded-contrib-75a84a920a0770b8a0e6a7925433eb7830f97187.tar.gz | |
php 7.2.4: fix do_compile failure on qemumips
It caused by a new variable is declared after the label
There is a build failure on mips:
...
|sljitNativeMIPS_common.c: In function 'sljit_has_cpu_feature':
|sljitNativeMIPS_common.c:506:3: error: a label can only be part
of a statement and a declaration is not a statement
| sljit_sw fir;
| ^~~~~~~~
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch | 45 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_7.2.4.bb | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch b/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch new file mode 100644 index 0000000000..6ab101b410 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch @@ -0,0 +1,45 @@ +From 0d88d735887c6f2fa00a743c27124c7a52006a41 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 15 Apr 2018 19:17:27 -0700 +Subject: [PATCH] fix error caused by a new variable is declared after the + label + +There is a build failure on mips: +... +|sljitNativeMIPS_common.c: In function 'sljit_has_cpu_feature': +|sljitNativeMIPS_common.c:506:3: error: a label can only be part +of a statement and a declaration is not a statement +| sljit_sw fir; +| ^~~~~~~~ +... + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c +index ee207fe..adfd342 100644 +--- a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c ++++ b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c +@@ -498,12 +498,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil + + SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type) + { ++#if defined(__GNUC__) ++ sljit_sw fir; ++#endif + switch (feature_type) { + case SLJIT_HAS_FPU: + #ifdef SLJIT_IS_FPU_AVAILABLE + return SLJIT_IS_FPU_AVAILABLE; + #elif defined(__GNUC__) +- sljit_sw fir; + asm ("cfc1 %0, $0" : "=r"(fir)); + return (fir >> 22) & 0x1; + #else +-- +2.10.2 + diff --git a/meta-oe/recipes-devtools/php/php_7.2.4.bb b/meta-oe/recipes-devtools/php/php_7.2.4.bb index 04d9b167d5..2fd1e66c78 100644 --- a/meta-oe/recipes-devtools/php/php_7.2.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.2.4.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ file://0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch \ + file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ " SRC_URI_append_class-target = " \ file://pear-makefile.patch \ |