diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2016-12-26 11:35:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-19 22:47:20 +0000 |
commit | cf670c4629632b7bc627cb55db9454beb8bdb532 (patch) | |
tree | 3ba3c679cbb776daed96fb4ba614fb9a52ab096c /meta/recipes-extended | |
parent | 72ee691056ee9c9488774350b15d2e7602ac4683 (diff) | |
download | poky-cf670c4629632b7bc627cb55db9454beb8bdb532.tar.gz |
byacc: upgrade to 20161202
0001-byacc-do-not-reorder-CC-and-CFLAGS.patch is added to fix the problem
of byacc dropping options from $CC.
(From OE-Core rev: e7a4eea6fe9ed9630eddf508a07af0e9dccd66da)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/byacc/byacc.inc | 3 | ||||
-rw-r--r-- | meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 161 | ||||
-rw-r--r-- | meta/recipes-extended/byacc/byacc_20161202.bb (renamed from meta/recipes-extended/byacc/byacc_20160606.bb) | 4 |
3 files changed, 165 insertions, 3 deletions
diff --git a/meta/recipes-extended/byacc/byacc.inc b/meta/recipes-extended/byacc/byacc.inc index f9f8d6b5f0..adb07193d7 100644 --- a/meta/recipes-extended/byacc/byacc.inc +++ b/meta/recipes-extended/byacc/byacc.inc | |||
@@ -6,7 +6,8 @@ SECTION = "devel" | |||
6 | LICENSE = "PD" | 6 | LICENSE = "PD" |
7 | 7 | ||
8 | SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz \ | 8 | SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz \ |
9 | file://byacc-open.patch" | 9 | file://byacc-open.patch \ |
10 | file://0001-byacc-do-not-reorder-CC-and-CFLAGS.patch" | ||
10 | 11 | ||
11 | EXTRA_OECONF += "--program-transform-name='s,^,b,'" | 12 | EXTRA_OECONF += "--program-transform-name='s,^,b,'" |
12 | 13 | ||
diff --git a/meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch new file mode 100644 index 0000000000..7cd2510c8e --- /dev/null +++ b/meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | |||
@@ -0,0 +1,161 @@ | |||
1 | Subject: byacc: do not reorder $CC and $CFLAGS | ||
2 | |||
3 | byacc tries to process $CC and decide which part should belong to CC and which | ||
4 | part should below to CFLAGS and then do reordering. It doesn't make much sense | ||
5 | for OE. And it doesn't do its work correctly. Some options are dropped. | ||
6 | |||
7 | Delete all these stuff so that we could have all options we need. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE Specific] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | aclocal.m4 | 1 - | ||
14 | configure | 119 ------------------------------------------------------------- | ||
15 | 2 files changed, 120 deletions(-) | ||
16 | |||
17 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
18 | index 917a848..62ef241 100644 | ||
19 | --- a/aclocal.m4 | ||
20 | +++ b/aclocal.m4 | ||
21 | @@ -1021,7 +1021,6 @@ CF_GCC_VERSION | ||
22 | CF_ACVERSION_CHECK(2.52, | ||
23 | [AC_PROG_CC_STDC], | ||
24 | [CF_ANSI_CC_REQD]) | ||
25 | -CF_CC_ENV_FLAGS | ||
26 | ])dnl | ||
27 | dnl --------------------------------------------------------------------------- | ||
28 | dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 | ||
29 | diff --git a/configure b/configure | ||
30 | index 9707e50..4f0497c 100755 | ||
31 | --- a/configure | ||
32 | +++ b/configure | ||
33 | @@ -1946,125 +1946,6 @@ esac | ||
34 | # This should have been defined by AC_PROG_CC | ||
35 | : ${CC:=cc} | ||
36 | |||
37 | -echo "$as_me:1949: checking \$CC variable" >&5 | ||
38 | -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 | ||
39 | -case "$CC" in | ||
40 | -(*[\ \ ]-*) | ||
41 | - echo "$as_me:1953: result: broken" >&5 | ||
42 | -echo "${ECHO_T}broken" >&6 | ||
43 | - { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 | ||
44 | -echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} | ||
45 | - # humor him... | ||
46 | - cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'` | ||
47 | - CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'` | ||
48 | - for cf_arg in $cf_flags | ||
49 | - do | ||
50 | - case "x$cf_arg" in | ||
51 | - (x-[IUDfgOW]*) | ||
52 | - | ||
53 | -cf_fix_cppflags=no | ||
54 | -cf_new_cflags= | ||
55 | -cf_new_cppflags= | ||
56 | -cf_new_extra_cppflags= | ||
57 | - | ||
58 | -for cf_add_cflags in $cf_flags | ||
59 | -do | ||
60 | -case $cf_fix_cppflags in | ||
61 | -(no) | ||
62 | - case $cf_add_cflags in | ||
63 | - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) | ||
64 | - case $cf_add_cflags in | ||
65 | - (-D*) | ||
66 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` | ||
67 | - | ||
68 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | ||
69 | - && test -z "${cf_tst_cflags}" \ | ||
70 | - && cf_fix_cppflags=yes | ||
71 | - | ||
72 | - if test $cf_fix_cppflags = yes ; then | ||
73 | - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" | ||
74 | - continue | ||
75 | - elif test "${cf_tst_cflags}" = "\"'" ; then | ||
76 | - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" | ||
77 | - continue | ||
78 | - fi | ||
79 | - ;; | ||
80 | - esac | ||
81 | - case "$CPPFLAGS" in | ||
82 | - (*$cf_add_cflags) | ||
83 | - ;; | ||
84 | - (*) | ||
85 | - case $cf_add_cflags in | ||
86 | - (-D*) | ||
87 | - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` | ||
88 | - | ||
89 | -CPPFLAGS=`echo "$CPPFLAGS" | \ | ||
90 | - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ | ||
91 | - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` | ||
92 | - | ||
93 | - ;; | ||
94 | - esac | ||
95 | - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" | ||
96 | - ;; | ||
97 | - esac | ||
98 | - ;; | ||
99 | - (*) | ||
100 | - cf_new_cflags="$cf_new_cflags $cf_add_cflags" | ||
101 | - ;; | ||
102 | - esac | ||
103 | - ;; | ||
104 | -(yes) | ||
105 | - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" | ||
106 | - | ||
107 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` | ||
108 | - | ||
109 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | ||
110 | - && test -z "${cf_tst_cflags}" \ | ||
111 | - && cf_fix_cppflags=no | ||
112 | - ;; | ||
113 | -esac | ||
114 | -done | ||
115 | - | ||
116 | -if test -n "$cf_new_cflags" ; then | ||
117 | - | ||
118 | - CFLAGS="$CFLAGS $cf_new_cflags" | ||
119 | -fi | ||
120 | - | ||
121 | -if test -n "$cf_new_cppflags" ; then | ||
122 | - | ||
123 | - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" | ||
124 | -fi | ||
125 | - | ||
126 | -if test -n "$cf_new_extra_cppflags" ; then | ||
127 | - | ||
128 | - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" | ||
129 | -fi | ||
130 | - | ||
131 | - ;; | ||
132 | - (*) | ||
133 | - CC="$CC $cf_arg" | ||
134 | - ;; | ||
135 | - esac | ||
136 | - done | ||
137 | - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 | ||
138 | - | ||
139 | -echo "${as_me:-configure}:2051: testing resulting CC: '$CC' ..." 1>&5 | ||
140 | - | ||
141 | - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 | ||
142 | - | ||
143 | -echo "${as_me:-configure}:2055: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 | ||
144 | - | ||
145 | - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 | ||
146 | - | ||
147 | -echo "${as_me:-configure}:2059: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 | ||
148 | - | ||
149 | - ;; | ||
150 | -(*) | ||
151 | - echo "$as_me:2063: result: ok" >&5 | ||
152 | -echo "${ECHO_T}ok" >&6 | ||
153 | - ;; | ||
154 | -esac | ||
155 | - | ||
156 | echo "$as_me:2068: checking whether ${MAKE-make} sets \${MAKE}" >&5 | ||
157 | echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 | ||
158 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | ||
159 | -- | ||
160 | 2.8.3 | ||
161 | |||
diff --git a/meta/recipes-extended/byacc/byacc_20160606.bb b/meta/recipes-extended/byacc/byacc_20161202.bb index 98129d0ec4..755f8ab515 100644 --- a/meta/recipes-extended/byacc/byacc_20160606.bb +++ b/meta/recipes-extended/byacc/byacc_20161202.bb | |||
@@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=74533d32ffd38bca4cbf1f13 | |||
8 | require byacc.inc | 8 | require byacc.inc |
9 | 9 | ||
10 | 10 | ||
11 | SRC_URI[md5sum] = "d527c811b360f04a8c5f5a0a90625966" | 11 | SRC_URI[md5sum] = "48ef38447f2cc864c70ef864b26cf817" |
12 | SRC_URI[sha256sum] = "cc8fdced486cb70cec7a7c9358de836bfd267d19d6456760bb4721ccfea5ac91" | 12 | SRC_URI[sha256sum] = "30dc58cfcdb708eea7ba022db29b41d2d392f20727491b956954366f2f2117f0" |