diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-02 03:23:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:47:15 +0100 |
commit | 3140a731d36adbf5be9f988f25653304ac86676e (patch) | |
tree | 2fb5ee6678a2083632f2e80db16331315ff3d65a | |
parent | 77789bdd0f55714590d95589558edc8151f9860d (diff) | |
download | openembedded-core-3140a731d36adbf5be9f988f25653304ac86676e.tar.gz openembedded-core-3140a731d36adbf5be9f988f25653304ac86676e.tar.bz2 openembedded-core-3140a731d36adbf5be9f988f25653304ac86676e.zip |
bdwgc: Include signal.h instead of hard asm/sigcontext.h
All cases are about glibc and for non-glibc systems it falls back to
last else choice which still is glibc's older version, ideally it
should have a case where libc != glibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch | 35 | ||||
-rw-r--r-- | meta/recipes-support/bdwgc/bdwgc_7.4.2.bb | 4 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch b/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch new file mode 100644 index 0000000000..ab907fca0c --- /dev/null +++ b/meta/recipes-support/bdwgc/bdwgc/0001-fix-build-with-musl.patch @@ -0,0 +1,35 @@ +From 829a89e7f5785239a9384e3afd46c900f9d76ada Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 31 Aug 2015 19:55:32 +0000 +Subject: [PATCH] fix build with musl + +signal.h already includes bits/sigcontext.h +Documentation seems to indicate that if you need the definitions in +sigcontext.h, you are supposed to include signal.h and not sigcontext.h. + +a good fix should be to remove glibc +specific understanding, in those ifdef's + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + os_dep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os_dep.c b/os_dep.c +index 08c501d..5cb7873 100644 +--- a/os_dep.c ++++ b/os_dep.c +@@ -41,7 +41,7 @@ + # else /* __GLIBC__ < 2 */ + /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ + /* one. Check LINUX_VERSION_CODE to see which we should reference. */ +-# include <asm/sigcontext.h> ++# include <signal.h> + # endif /* __GLIBC__ < 2 */ + # endif + #endif /* LINUX && !POWERPC */ +-- +2.5.1 + diff --git a/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb b/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb index 1ca8cf77eb..95e358f8e6 100644 --- a/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb +++ b/meta/recipes-support/bdwgc/bdwgc_7.4.2.bb @@ -21,7 +21,9 @@ SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7" -SRC_URI = "http://www.hboehm.info/gc/gc_source/gc-${PV}.tar.gz" +SRC_URI = "http://www.hboehm.info/gc/gc_source/gc-${PV}.tar.gz \ + file://0001-fix-build-with-musl.patch \ + " SRC_URI[md5sum] = "12c05fd2811d989341d8c6d81f66af87" SRC_URI[sha256sum] = "63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2" |