From 312e9fe3f047547df4c21c8e666cc9aa70e15347 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 29 Dec 2019 10:44:13 -0800 Subject: recipes: Use -fcommon explicitly This is needed with gcc 10 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb | 2 +- meta/recipes-connectivity/socat/socat_1.7.3.3.bb | 2 ++ meta/recipes-core/libxcrypt/libxcrypt.inc | 2 ++ meta/recipes-devtools/llvm/llvm_git.bb | 2 ++ meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb | 2 ++ meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb | 2 ++ meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb | 2 ++ meta/recipes-graphics/mesa/mesa_19.2.4.bb | 2 ++ meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb | 2 ++ meta/recipes-support/atk/at-spi2-atk_2.32.0.bb | 2 ++ meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 11 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb index 8a86cbf78c..75772d4696 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.3.0.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "cb1c1e45993a3bd2438543fd4332d70f1726a6e6ff97dc613a8258c993 # CFLAGS are computed in Makefile and reference CCOPTS # -EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" +EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS} -fcommon'" diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb index 1dbbe5cd55..ee01578c1a 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb @@ -44,6 +44,8 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" +CFLAGS += "-fcommon" + do_install_prepend () { mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1 diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 6d6990c3d5..accbdd6361 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -27,6 +27,8 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" CPPFLAGS_append_class-nativesdk = " -Wno-error" +CFLAGS += "-fcommon" + API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index d24ed761bf..a8607f5008 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -92,6 +92,8 @@ EXTRA_OECMAKE_append_class-nativesdk = "\ -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " +CFLAGS += "-fcommon" + do_configure_prepend() { # Fix paths in llvm-config sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb index a02e35d19a..53ed5e81f7 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb @@ -21,6 +21,8 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gssapi" +CFLAGS += "-fcommon" + do_install_append() { chown root:root ${D}${sysconfdir}/netconfig } diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb index b9961c398c..675ee40fa4 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb @@ -21,6 +21,8 @@ inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" +CFLAGS += "-fcommon" + FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ ${sysconfdir}/matchbox \ diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb b/meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb index ddbbd94066..7a11228ef0 100644 --- a/meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb +++ b/meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb @@ -16,3 +16,5 @@ SRC_URI[sha256sum] = "ed02eb459dcb398f69b9fa5bf4dd813020405afc84331115469cdf7be9 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.1/" inherit autotools gettext pkgconfig gtk-doc + +CFLAGS += "-fcommon" diff --git a/meta/recipes-graphics/mesa/mesa_19.2.4.bb b/meta/recipes-graphics/mesa/mesa_19.2.4.bb index 46ecee3a73..115663b066 100644 --- a/meta/recipes-graphics/mesa/mesa_19.2.4.bb +++ b/meta/recipes-graphics/mesa/mesa_19.2.4.bb @@ -13,6 +13,8 @@ SRC_URI[sha256sum] = "09000a0f7dbbd82e193b81a8f1bf0c118eab7ca975c0329181968596e5 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" +CFLAGS += "-fcommon" + #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb index 9218b4f69d..a1cd490394 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb @@ -8,6 +8,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" +CFLAGS += "-fcommon" + # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb index d3a9de1e41..b717a9c7f7 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb @@ -17,3 +17,5 @@ FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" BBCLASSEXTEND = "native nativesdk" + +CFLAGS += "-fcommon" diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 16ecc506ce..7e2efe3c9b 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -23,6 +23,8 @@ CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" BBCLASSEXTEND = "native nativesdk" +CFLAGS += "-fcommon" + do_install_append () { # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find # these headers -- cgit 1.2.3-korg