diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/gcc/gcc-runtime.inc | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/gcc/gcc-runtime.inc')
-rw-r--r-- | poky/meta/recipes-devtools/gcc/gcc-runtime.inc | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/poky/meta/recipes-devtools/gcc/gcc-runtime.inc b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc index 9e7e7c5b3..3d03d8e57 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -15,6 +15,7 @@ EXTRA_OECONF_PATHS = "\ " EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF_append = " --cache-file=${B}/config.cache" RUNTIMELIBITM = "libitm" RUNTIMELIBITM_arc = "" @@ -29,9 +30,6 @@ RUNTIMELIBSSP_mingw32 ?= "libssp" RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ " -RUNTIMETARGET_append_x86 = " libmpx" -RUNTIMETARGET_append_x86-64 = " libmpx" -RUNTIMETARGET_remove_libc-musl = "libmpx" # libiberty # libmudflap @@ -128,7 +126,7 @@ do_install_append_class-target () { } INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc" +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc virtual/${MLPREFIX}libc" PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" BBCLASSEXTEND = "nativesdk" @@ -160,18 +158,6 @@ PACKAGES = "\ libitm-dev \ libitm-staticdev \ " -PACKAGES_append_x86 = "\ - libmpx \ - libmpx-dev \ - libmpx-staticdev \ -" - -PACKAGES_append_x86-64 = "\ - libmpx \ - libmpx-dev \ - libmpx-staticdev \ -" - # The base package doesn't exist, so we clear the recommends. RRECOMMENDS_${PN}-dbg = "" @@ -274,21 +260,3 @@ FILES_libitm-dev = "\ SUMMARY_libitm-dev = "GNU transactional memory support library - development files" FILES_libitm-staticdev = "${libdir}/libitm.a" SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files" - - -FILES_libmpx = "${libdir}/libmpx.so.* ${libdir}/libmpxwrappers.so.*" -SUMMARY_libmpx = "Intel Memory Protection Extension library" -FILES_libmpx-dev = "\ - ${libdir}/libmpxwrappers.so \ - ${libdir}/libmpxwrappers.la \ - ${libdir}/libmpx.so \ - ${libdir}/libmpx.la \ - ${libdir}/libmpx.spec \ -" -SUMMARY_libmpx-dev = "Intel Memory Protection Extension library - development files" -FILES_libmpx-staticdev = "${libdir}/libmpx.a ${libdir}/libmpxwrappers.a" -SUMMARY_libmpx-staticdev = "Intel Memory Protection Extension library - static development files" - -do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" -do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" -do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" |