diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 65 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb (renamed from meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb) | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb | 2 |
7 files changed, 41 insertions, 39 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 5dcc6afdfe..8365da0f90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/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> Update for 20200910. Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> + +Update for 20210808. +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- aclocal.m4 | 1 - configure | 259 ----------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 1c6a3ee..2f7e9b5 100644 +index 7a9a8fb..108b6cc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1317,7 +1317,6 @@ CF_GCC_VERSION +@@ -1401,7 +1401,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -36,20 +39,20 @@ index 1c6a3ee..2f7e9b5 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index 378f27d..8f40229 100755 +index 5b98a03..e3a4237 100755 --- a/configure +++ b/configure -@@ -2066,265 +2066,6 @@ esac +@@ -2146,265 +2146,6 @@ esac # This should have been defined by AC_PROG_CC - : ${CC:=cc} + : "${CC:=cc}" --echo "$as_me:2069: checking \$CFLAGS variable" >&5 +-echo "$as_me:2149: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:2073: result: broken" >&5 +- echo "$as_me:2153: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2075: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2155: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -63,19 +66,19 @@ index 378f27d..8f40229 100755 - -for cf_add_cflags in $cf_arg -do --case $cf_fix_cppflags in +-case "$cf_fix_cppflags" in -(no) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - -- if test $cf_fix_cppflags = yes ; then +- if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -94,7 +97,7 @@ index 378f27d..8f40229 100755 - (*$cf_add_cflags) - ;; - (*) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - @@ -124,7 +127,7 @@ index 378f27d..8f40229 100755 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ @@ -157,18 +160,18 @@ index 378f27d..8f40229 100755 - done - ;; -(*) -- echo "$as_me:2183: result: ok" >&5 +- echo "$as_me:2263: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2188: checking \$CC variable" >&5 +-echo "$as_me:2268: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2192: result: broken" >&5 +- echo "$as_me:2272: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2194: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2274: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -186,19 +189,19 @@ index 378f27d..8f40229 100755 - -for cf_add_cflags in $cf_arg -do --case $cf_fix_cppflags in +-case "$cf_fix_cppflags" in -(no) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - -- if test $cf_fix_cppflags = yes ; then +- if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -217,7 +220,7 @@ index 378f27d..8f40229 100755 - (*$cf_add_cflags) - ;; - (*) -- case $cf_add_cflags in +- case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - @@ -247,7 +250,7 @@ index 378f27d..8f40229 100755 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ @@ -285,24 +288,24 @@ index 378f27d..8f40229 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2391: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2395: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2399: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2323: result: ok" >&5 +- echo "$as_me:2403: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2328: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2408: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb index b7640ffca6..eeed39f633 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20210808.bb @@ -4,8 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=262857ec5923f073fa06a1f1812225ea" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=80ce98c6ab91cc4a93a9d2cfb7c14463" require byacc.inc -SRC_URI[md5sum] = "5726a5a655c6fd4e8f950552cceeae29" -SRC_URI[sha256sum] = "0a5906073aeaf23ddc20aaac0ea61cb5ccc18572870b113375dec4ffe85ecf30" +SRC_URI[sha256sum] = "f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index 94df015068..6b906a21c3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -43,7 +43,7 @@ PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt- PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" -inherit autotools gettext cmake systemd +inherit autotools gettext cmake pkgconfig systemd EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb index 14168e6bb1..7325b26e35 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.26.bb @@ -8,7 +8,7 @@ SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" -inherit autotools gobject-introspection +inherit autotools gobject-introspection pkgconfig SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" SRCREV = "47ff12242c89e36a33259d18b7068b26c3bb1c64" diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index a1919e7400..e96138ea83 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -15,7 +15,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" -inherit cpan autotools-brokensep gettext python3native python3-dir systemd +inherit cpan autotools-brokensep gettext pkgconfig python3native python3-dir systemd BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index bfecc7ebd8..ef1ae2c0b0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd SRCNAME = "volume_key" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools python3native gettext +inherit autotools python3native gettext pkgconfig DEPENDS += " \ util-linux \ diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index f1e87ba220..9d9fab2eae 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -10,7 +10,7 @@ LICENSE = "wxWidgets" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} -inherit features_check lib_package binconfig +inherit features_check lib_package binconfig pkgconfig # All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" |