diff options
author | Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2019-10-23 17:31:07 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-24 01:01:44 -0700 |
commit | 3ddad8697e89a0cc7d31dadfe3da512523b584a6 (patch) | |
tree | fe71dace520d16de525f234d204df18c5dfa525b /meta-oe | |
parent | c1812d8cec20346b863e32b6a1a6e95dc0a6c2fd (diff) | |
download | meta-openembedded-3ddad8697e89a0cc7d31dadfe3da512523b584a6.tar.gz |
byacc: upgrade 20180510 -> 20190617
1) Update 0001-byacc-do-not-reorder-CC-and-CFLAGS.patch for new version.
2) Update LIC_FILES_CHKSUM for date has been changed from '2004-2017,2018' to '2004-2018,2019'.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 151 | ||||
-rw-r--r-- | meta-oe/recipes-extended/byacc/byacc_20190617.bb (renamed from meta-oe/recipes-extended/byacc/byacc_20180510.bb) | 6 |
2 files changed, 139 insertions, 18 deletions
diff --git a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 3bc0db96e..24864ea60 100644 --- a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | |||
@@ -10,16 +10,18 @@ Upstream-Status: Inappropriate [OE Specific] | |||
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | 12 | ||
13 | Update for 20190617. | ||
14 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
13 | --- | 15 | --- |
14 | aclocal.m4 | 1 - | 16 | aclocal.m4 | 1 - |
15 | configure | 140 ------------------------------------------------------------- | 17 | configure | 259 ------------------------------------------------------------- |
16 | 2 files changed, 141 deletions(-) | 18 | 2 files changed, 260 deletions(-) |
17 | 19 | ||
18 | diff --git a/aclocal.m4 b/aclocal.m4 | 20 | diff --git a/aclocal.m4 b/aclocal.m4 |
19 | index 0d14f26..0cefa08 100644 | 21 | index 338465f..3311057 100644 |
20 | --- a/aclocal.m4 | 22 | --- a/aclocal.m4 |
21 | +++ b/aclocal.m4 | 23 | +++ b/aclocal.m4 |
22 | @@ -1038,7 +1038,6 @@ CF_GCC_VERSION | 24 | @@ -1231,7 +1231,6 @@ CF_GCC_VERSION |
23 | CF_ACVERSION_CHECK(2.52, | 25 | CF_ACVERSION_CHECK(2.52, |
24 | [AC_PROG_CC_STDC], | 26 | [AC_PROG_CC_STDC], |
25 | [CF_ANSI_CC_REQD]) | 27 | [CF_ANSI_CC_REQD]) |
@@ -28,21 +30,140 @@ index 0d14f26..0cefa08 100644 | |||
28 | dnl --------------------------------------------------------------------------- | 30 | dnl --------------------------------------------------------------------------- |
29 | dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 | 31 | dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 |
30 | diff --git a/configure b/configure | 32 | diff --git a/configure b/configure |
31 | index d27ae31..077c648 100755 | 33 | index ebb1f0f..a56cb17 100755 |
32 | --- a/configure | 34 | --- a/configure |
33 | +++ b/configure | 35 | +++ b/configure |
34 | @@ -1946,146 +1946,6 @@ esac | 36 | @@ -1957,265 +1957,6 @@ esac |
35 | # This should have been defined by AC_PROG_CC | 37 | # This should have been defined by AC_PROG_CC |
36 | : ${CC:=cc} | 38 | : ${CC:=cc} |
37 | 39 | ||
38 | -echo "$as_me:1949: checking \$CC variable" >&5 | 40 | -echo "$as_me:1960: checking \$CFLAGS variable" >&5 |
41 | -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 | ||
42 | -case "x$CFLAGS" in | ||
43 | -(*-[IUD]*) | ||
44 | - echo "$as_me:1964: result: broken" >&5 | ||
45 | -echo "${ECHO_T}broken" >&6 | ||
46 | - { echo "$as_me:1966: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 | ||
47 | -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} | ||
48 | - cf_flags="$CFLAGS" | ||
49 | - CFLAGS= | ||
50 | - for cf_arg in $cf_flags | ||
51 | - do | ||
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_arg | ||
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 | - | ||
74 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | ||
75 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" | ||
76 | - | ||
77 | - continue | ||
78 | - elif test "${cf_tst_cflags}" = "\"'" ; then | ||
79 | - | ||
80 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | ||
81 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" | ||
82 | - | ||
83 | - continue | ||
84 | - fi | ||
85 | - ;; | ||
86 | - esac | ||
87 | - case "$CPPFLAGS" in | ||
88 | - (*$cf_add_cflags) | ||
89 | - ;; | ||
90 | - (*) | ||
91 | - case $cf_add_cflags in | ||
92 | - (-D*) | ||
93 | - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` | ||
94 | - | ||
95 | -CPPFLAGS=`echo "$CPPFLAGS" | \ | ||
96 | - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ | ||
97 | - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` | ||
98 | - | ||
99 | - ;; | ||
100 | - esac | ||
101 | - | ||
102 | - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " | ||
103 | - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" | ||
104 | - | ||
105 | - ;; | ||
106 | - esac | ||
107 | - ;; | ||
108 | - (*) | ||
109 | - | ||
110 | - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " | ||
111 | - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" | ||
112 | - | ||
113 | - ;; | ||
114 | - esac | ||
115 | - ;; | ||
116 | -(yes) | ||
117 | - | ||
118 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | ||
119 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" | ||
120 | - | ||
121 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` | ||
122 | - | ||
123 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | ||
124 | - && test -z "${cf_tst_cflags}" \ | ||
125 | - && cf_fix_cppflags=no | ||
126 | - ;; | ||
127 | -esac | ||
128 | -done | ||
129 | - | ||
130 | -if test -n "$cf_new_cflags" ; then | ||
131 | - | ||
132 | - test -n "$CFLAGS" && CFLAGS="$CFLAGS " | ||
133 | - CFLAGS="${CFLAGS}$cf_new_cflags" | ||
134 | - | ||
135 | -fi | ||
136 | - | ||
137 | -if test -n "$cf_new_cppflags" ; then | ||
138 | - | ||
139 | - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " | ||
140 | - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" | ||
141 | - | ||
142 | -fi | ||
143 | - | ||
144 | -if test -n "$cf_new_extra_cppflags" ; then | ||
145 | - | ||
146 | - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " | ||
147 | - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" | ||
148 | - | ||
149 | -fi | ||
150 | - | ||
151 | - done | ||
152 | - ;; | ||
153 | -(*) | ||
154 | - echo "$as_me:2074: result: ok" >&5 | ||
155 | -echo "${ECHO_T}ok" >&6 | ||
156 | - ;; | ||
157 | -esac | ||
158 | - | ||
159 | -echo "$as_me:2079: checking \$CC variable" >&5 | ||
39 | -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 | 160 | -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 |
40 | -case "$CC" in | 161 | -case "$CC" in |
41 | -(*[\ \ ]-*) | 162 | -(*[\ \ ]-*) |
42 | - echo "$as_me:1953: result: broken" >&5 | 163 | - echo "$as_me:2083: result: broken" >&5 |
43 | -echo "${ECHO_T}broken" >&6 | 164 | -echo "${ECHO_T}broken" >&6 |
44 | - { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 | 165 | - { echo "$as_me:2085: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 |
45 | -echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} | 166 | -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} |
46 | - # humor him... | 167 | - # humor him... |
47 | - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` | 168 | - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` |
48 | - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` | 169 | - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` |
@@ -158,24 +279,24 @@ index d27ae31..077c648 100755 | |||
158 | - done | 279 | - done |
159 | - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 | 280 | - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 |
160 | - | 281 | - |
161 | -echo "${as_me:-configure}:2072: testing resulting CC: '$CC' ..." 1>&5 | 282 | -echo "${as_me:-configure}:2202: testing resulting CC: '$CC' ..." 1>&5 |
162 | - | 283 | - |
163 | - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 | 284 | - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 |
164 | - | 285 | - |
165 | -echo "${as_me:-configure}:2076: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 | 286 | -echo "${as_me:-configure}:2206: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 |
166 | - | 287 | - |
167 | - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 | 288 | - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 |
168 | - | 289 | - |
169 | -echo "${as_me:-configure}:2080: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 | 290 | -echo "${as_me:-configure}:2210: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 |
170 | - | 291 | - |
171 | - ;; | 292 | - ;; |
172 | -(*) | 293 | -(*) |
173 | - echo "$as_me:2084: result: ok" >&5 | 294 | - echo "$as_me:2214: result: ok" >&5 |
174 | -echo "${ECHO_T}ok" >&6 | 295 | -echo "${ECHO_T}ok" >&6 |
175 | - ;; | 296 | - ;; |
176 | -esac | 297 | -esac |
177 | - | 298 | - |
178 | echo "$as_me:2089: checking whether ${MAKE-make} sets \${MAKE}" >&5 | 299 | echo "$as_me:2219: checking whether ${MAKE-make} sets \${MAKE}" >&5 |
179 | echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 | 300 | echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 |
180 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | 301 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` |
181 | -- | 302 | -- |
diff --git a/meta-oe/recipes-extended/byacc/byacc_20180510.bb b/meta-oe/recipes-extended/byacc/byacc_20190617.bb index f30c42640..2834b7c5e 100644 --- a/meta-oe/recipes-extended/byacc/byacc_20180510.bb +++ b/meta-oe/recipes-extended/byacc/byacc_20190617.bb | |||
@@ -4,9 +4,9 @@ | |||
4 | # Setting to PD as this is what the upstream has it as. | 4 | # Setting to PD as this is what the upstream has it as. |
5 | 5 | ||
6 | LICENSE = "PD" | 6 | LICENSE = "PD" |
7 | LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=8b2933503c0443e041d3168dc0c65640" | 7 | LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=3eb7c635434fafe23ef30fc263e63b2f" |
8 | require byacc.inc | 8 | require byacc.inc |
9 | 9 | ||
10 | SRC_URI[md5sum] = "97fdc0745e0ff0cef5c09d57d0c6752d" | 10 | SRC_URI[md5sum] = "17b3f7e7ed570d785b145064d99df615" |
11 | SRC_URI[sha256sum] = "d0940dbffbc7e9c9dd4985c25349c390beede84ae1d9fe86b71c0aa659a6d693" | 11 | SRC_URI[sha256sum] = "f87868167b920bf2cb30fc32b62f63ae15671181ef329226d1063100be02518d" |
12 | 12 | ||