diff options
| -rw-r--r-- | meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 65 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/byacc/byacc_20210808.bb (renamed from meta-oe/recipes-extended/byacc/byacc_20200910.bb) | 5 |
2 files changed, 36 insertions, 34 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 5dcc6afdfe..8365da0f90 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 | |||
| @@ -18,16 +18,19 @@ Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | |||
| 18 | 18 | ||
| 19 | Update for 20200910. | 19 | Update for 20200910. |
| 20 | Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 20 | Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> |
| 21 | |||
| 22 | Update for 20210808. | ||
| 23 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 21 | --- | 24 | --- |
| 22 | aclocal.m4 | 1 - | 25 | aclocal.m4 | 1 - |
| 23 | configure | 259 ----------------------------------------------------- | 26 | configure | 259 ----------------------------------------------------- |
| 24 | 2 files changed, 260 deletions(-) | 27 | 2 files changed, 260 deletions(-) |
| 25 | 28 | ||
| 26 | diff --git a/aclocal.m4 b/aclocal.m4 | 29 | diff --git a/aclocal.m4 b/aclocal.m4 |
| 27 | index 1c6a3ee..2f7e9b5 100644 | 30 | index 7a9a8fb..108b6cc 100644 |
| 28 | --- a/aclocal.m4 | 31 | --- a/aclocal.m4 |
| 29 | +++ b/aclocal.m4 | 32 | +++ b/aclocal.m4 |
| 30 | @@ -1317,7 +1317,6 @@ CF_GCC_VERSION | 33 | @@ -1401,7 +1401,6 @@ CF_GCC_VERSION |
| 31 | CF_ACVERSION_CHECK(2.52, | 34 | CF_ACVERSION_CHECK(2.52, |
| 32 | [AC_PROG_CC_STDC], | 35 | [AC_PROG_CC_STDC], |
| 33 | [CF_ANSI_CC_REQD]) | 36 | [CF_ANSI_CC_REQD]) |
| @@ -36,20 +39,20 @@ index 1c6a3ee..2f7e9b5 100644 | |||
| 36 | dnl --------------------------------------------------------------------------- | 39 | dnl --------------------------------------------------------------------------- |
| 37 | dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 | 40 | dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 |
| 38 | diff --git a/configure b/configure | 41 | diff --git a/configure b/configure |
| 39 | index 378f27d..8f40229 100755 | 42 | index 5b98a03..e3a4237 100755 |
| 40 | --- a/configure | 43 | --- a/configure |
| 41 | +++ b/configure | 44 | +++ b/configure |
| 42 | @@ -2066,265 +2066,6 @@ esac | 45 | @@ -2146,265 +2146,6 @@ esac |
| 43 | # This should have been defined by AC_PROG_CC | 46 | # This should have been defined by AC_PROG_CC |
| 44 | : ${CC:=cc} | 47 | : "${CC:=cc}" |
| 45 | 48 | ||
| 46 | -echo "$as_me:2069: checking \$CFLAGS variable" >&5 | 49 | -echo "$as_me:2149: checking \$CFLAGS variable" >&5 |
| 47 | -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 | 50 | -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 |
| 48 | -case "x$CFLAGS" in | 51 | -case "x$CFLAGS" in |
| 49 | -(*-[IUD]*) | 52 | -(*-[IUD]*) |
| 50 | - echo "$as_me:2073: result: broken" >&5 | 53 | - echo "$as_me:2153: result: broken" >&5 |
| 51 | -echo "${ECHO_T}broken" >&6 | 54 | -echo "${ECHO_T}broken" >&6 |
| 52 | - { echo "$as_me:2075: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 | 55 | - { echo "$as_me:2155: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 |
| 53 | -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} | 56 | -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} |
| 54 | - cf_flags="$CFLAGS" | 57 | - cf_flags="$CFLAGS" |
| 55 | - CFLAGS= | 58 | - CFLAGS= |
| @@ -63,19 +66,19 @@ index 378f27d..8f40229 100755 | |||
| 63 | - | 66 | - |
| 64 | -for cf_add_cflags in $cf_arg | 67 | -for cf_add_cflags in $cf_arg |
| 65 | -do | 68 | -do |
| 66 | -case $cf_fix_cppflags in | 69 | -case "$cf_fix_cppflags" in |
| 67 | -(no) | 70 | -(no) |
| 68 | - case $cf_add_cflags in | 71 | - case "$cf_add_cflags" in |
| 69 | - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) | 72 | - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) |
| 70 | - case $cf_add_cflags in | 73 | - case "$cf_add_cflags" in |
| 71 | - (-D*) | 74 | - (-D*) |
| 72 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` | 75 | - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` |
| 73 | - | 76 | - |
| 74 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | 77 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ |
| 75 | - && test -z "${cf_tst_cflags}" \ | 78 | - && test -z "${cf_tst_cflags}" \ |
| 76 | - && cf_fix_cppflags=yes | 79 | - && cf_fix_cppflags=yes |
| 77 | - | 80 | - |
| 78 | - if test $cf_fix_cppflags = yes ; then | 81 | - if test "$cf_fix_cppflags" = yes ; then |
| 79 | - | 82 | - |
| 80 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | 83 | - 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" | 84 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" |
| @@ -94,7 +97,7 @@ index 378f27d..8f40229 100755 | |||
| 94 | - (*$cf_add_cflags) | 97 | - (*$cf_add_cflags) |
| 95 | - ;; | 98 | - ;; |
| 96 | - (*) | 99 | - (*) |
| 97 | - case $cf_add_cflags in | 100 | - case "$cf_add_cflags" in |
| 98 | - (-D*) | 101 | - (-D*) |
| 99 | - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` | 102 | - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` |
| 100 | - | 103 | - |
| @@ -124,7 +127,7 @@ index 378f27d..8f40229 100755 | |||
| 124 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | 127 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " |
| 125 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" | 128 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" |
| 126 | - | 129 | - |
| 127 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` | 130 | - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` |
| 128 | - | 131 | - |
| 129 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | 132 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ |
| 130 | - && test -z "${cf_tst_cflags}" \ | 133 | - && test -z "${cf_tst_cflags}" \ |
| @@ -157,18 +160,18 @@ index 378f27d..8f40229 100755 | |||
| 157 | - done | 160 | - done |
| 158 | - ;; | 161 | - ;; |
| 159 | -(*) | 162 | -(*) |
| 160 | - echo "$as_me:2183: result: ok" >&5 | 163 | - echo "$as_me:2263: result: ok" >&5 |
| 161 | -echo "${ECHO_T}ok" >&6 | 164 | -echo "${ECHO_T}ok" >&6 |
| 162 | - ;; | 165 | - ;; |
| 163 | -esac | 166 | -esac |
| 164 | - | 167 | - |
| 165 | -echo "$as_me:2188: checking \$CC variable" >&5 | 168 | -echo "$as_me:2268: checking \$CC variable" >&5 |
| 166 | -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 | 169 | -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 |
| 167 | -case "$CC" in | 170 | -case "$CC" in |
| 168 | -(*[\ \ ]-*) | 171 | -(*[\ \ ]-*) |
| 169 | - echo "$as_me:2192: result: broken" >&5 | 172 | - echo "$as_me:2272: result: broken" >&5 |
| 170 | -echo "${ECHO_T}broken" >&6 | 173 | -echo "${ECHO_T}broken" >&6 |
| 171 | - { echo "$as_me:2194: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 | 174 | - { echo "$as_me:2274: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 |
| 172 | -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} | 175 | -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} |
| 173 | - # humor him... | 176 | - # humor him... |
| 174 | - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` | 177 | - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` |
| @@ -186,19 +189,19 @@ index 378f27d..8f40229 100755 | |||
| 186 | - | 189 | - |
| 187 | -for cf_add_cflags in $cf_arg | 190 | -for cf_add_cflags in $cf_arg |
| 188 | -do | 191 | -do |
| 189 | -case $cf_fix_cppflags in | 192 | -case "$cf_fix_cppflags" in |
| 190 | -(no) | 193 | -(no) |
| 191 | - case $cf_add_cflags in | 194 | - case "$cf_add_cflags" in |
| 192 | - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) | 195 | - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) |
| 193 | - case $cf_add_cflags in | 196 | - case "$cf_add_cflags" in |
| 194 | - (-D*) | 197 | - (-D*) |
| 195 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` | 198 | - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` |
| 196 | - | 199 | - |
| 197 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | 200 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ |
| 198 | - && test -z "${cf_tst_cflags}" \ | 201 | - && test -z "${cf_tst_cflags}" \ |
| 199 | - && cf_fix_cppflags=yes | 202 | - && cf_fix_cppflags=yes |
| 200 | - | 203 | - |
| 201 | - if test $cf_fix_cppflags = yes ; then | 204 | - if test "$cf_fix_cppflags" = yes ; then |
| 202 | - | 205 | - |
| 203 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | 206 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " |
| 204 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" | 207 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" |
| @@ -217,7 +220,7 @@ index 378f27d..8f40229 100755 | |||
| 217 | - (*$cf_add_cflags) | 220 | - (*$cf_add_cflags) |
| 218 | - ;; | 221 | - ;; |
| 219 | - (*) | 222 | - (*) |
| 220 | - case $cf_add_cflags in | 223 | - case "$cf_add_cflags" in |
| 221 | - (-D*) | 224 | - (-D*) |
| 222 | - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` | 225 | - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` |
| 223 | - | 226 | - |
| @@ -247,7 +250,7 @@ index 378f27d..8f40229 100755 | |||
| 247 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " | 250 | - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " |
| 248 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" | 251 | - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" |
| 249 | - | 252 | - |
| 250 | - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` | 253 | - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` |
| 251 | - | 254 | - |
| 252 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ | 255 | - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ |
| 253 | - && test -z "${cf_tst_cflags}" \ | 256 | - && test -z "${cf_tst_cflags}" \ |
| @@ -285,24 +288,24 @@ index 378f27d..8f40229 100755 | |||
| 285 | - done | 288 | - done |
| 286 | - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 | 289 | - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 |
| 287 | - | 290 | - |
| 288 | -echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5 | 291 | -echo "${as_me:-configure}:2391: testing resulting CC: '$CC' ..." 1>&5 |
| 289 | - | 292 | - |
| 290 | - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 | 293 | - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 |
| 291 | - | 294 | - |
| 292 | -echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 | 295 | -echo "${as_me:-configure}:2395: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 |
| 293 | - | 296 | - |
| 294 | - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 | 297 | - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 |
| 295 | - | 298 | - |
| 296 | -echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 | 299 | -echo "${as_me:-configure}:2399: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 |
| 297 | - | 300 | - |
| 298 | - ;; | 301 | - ;; |
| 299 | -(*) | 302 | -(*) |
| 300 | - echo "$as_me:2323: result: ok" >&5 | 303 | - echo "$as_me:2403: result: ok" >&5 |
| 301 | -echo "${ECHO_T}ok" >&6 | 304 | -echo "${ECHO_T}ok" >&6 |
| 302 | - ;; | 305 | - ;; |
| 303 | -esac | 306 | -esac |
| 304 | - | 307 | - |
| 305 | echo "$as_me:2328: checking whether ${MAKE-make} sets \${MAKE}" >&5 | 308 | echo "$as_me:2408: checking whether ${MAKE-make} sets \${MAKE}" >&5 |
| 306 | echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 | 309 | echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 |
| 307 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | 310 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` |
| 308 | -- | 311 | -- |
diff --git a/meta-oe/recipes-extended/byacc/byacc_20200910.bb b/meta-oe/recipes-extended/byacc/byacc_20210808.bb index b7640ffca6..eeed39f633 100644 --- a/meta-oe/recipes-extended/byacc/byacc_20200910.bb +++ b/meta-oe/recipes-extended/byacc/byacc_20210808.bb | |||
| @@ -4,8 +4,7 @@ | |||
| 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=262857ec5923f073fa06a1f1812225ea" | 7 | LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=80ce98c6ab91cc4a93a9d2cfb7c14463" |
| 8 | require byacc.inc | 8 | require byacc.inc |
| 9 | 9 | ||
| 10 | SRC_URI[md5sum] = "5726a5a655c6fd4e8f950552cceeae29" | 10 | SRC_URI[sha256sum] = "f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83" |
| 11 | SRC_URI[sha256sum] = "0a5906073aeaf23ddc20aaac0ea61cb5ccc18572870b113375dec4ffe85ecf30" | ||
