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 /meta-openembedded/meta-oe/recipes-support/bdwgc | |
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 'meta-openembedded/meta-oe/recipes-support/bdwgc')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch | 29 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.12.bb (renamed from meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb) | 8 |
3 files changed, 3 insertions, 61 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 8ef774f0f2..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,29 +0,0 @@ -configure.ac: add check for NO_GETCONTEXT definition - -Signed-off-by: Samuel Martin <s.martin49@gmail.com> -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> -Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - ---- -Upstream-Status: Pending - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- bdwgc-7.2f.orig/configure.ac 2014-06-01 19:00:47.000000000 +0200 -+++ bdwgc-7.2f/configure.ac 2014-12-23 14:13:11.585716713 +0100 -@@ -365,6 +365,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch deleted file mode 100644 index 4a18496650..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add missing header to avoid: - -| 1472659610.016355: ../git/pthread_stop_world.c: In function 'GC_brief_async_signal_safe_sleep': -| 1472659610.0540252: ../git/pthread_stop_world.c:397:22: error: storage size of 'tv' isn't known -| 1472659610.0540252: struct timeval tv; -| 1472659610.0540252: ^~ -| 1472659610.054099: ../git/pthread_stop_world.c:397:22: warning: unused variable 'tv' [-Wunused-variable] -| 1472659610.054099: struct timeval tv; -| 1472659610.054099: ^~ -| 1472659610.054099: Makefile:1530: recipe for target 'pthread_stop_world.lo' failed - -in musl builds. - -Upstream-Status: Pending - -Index: git/pthread_stop_world.c -=================================================================== ---- git.orig/pthread_stop_world.c -+++ git/pthread_stop_world.c -@@ -45,6 +45,7 @@ - #include <semaphore.h> - #include <errno.h> - #include <unistd.h> -+#include <sys/time.h> - #include "atomic_ops.h" - - /* It's safe to call original pthread_sigmask() here. */ diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.12.bb index dcb68f0282..b1c1099bb8 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.12.bb @@ -19,12 +19,10 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ HOMEPAGE = "http://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=728501f233050290314d33fb07d883eb" -SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa" -SRC_URI = "git://github.com/ivmai/bdwgc.git \ - file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ - file://musl_header_fix.patch \ +SRCREV = "a46546f40d18e60c31077c2e7c8bb4e44bf1bef1" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_6 \ " FILES_${PN}-doc = "${datadir}" |