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:48:38 +0100 |
| commit | 81d15085e35a7db93be68fb3b53ed443566a17c5 (patch) | |
| tree | 38ecbd831d39dc914044c86287eea65d54e82621 | |
| parent | 7e4cc9892dc72bfd360855940e715f8d43186053 (diff) | |
| download | poky-81d15085e35a7db93be68fb3b53ed443566a17c5.tar.gz | |
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
(From OE-Core rev: 3140a731d36adbf5be9f988f25653304ac86676e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ | |||
| 1 | From 829a89e7f5785239a9384e3afd46c900f9d76ada Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 31 Aug 2015 19:55:32 +0000 | ||
| 4 | Subject: [PATCH] fix build with musl | ||
| 5 | |||
| 6 | signal.h already includes bits/sigcontext.h | ||
| 7 | Documentation seems to indicate that if you need the definitions in | ||
| 8 | sigcontext.h, you are supposed to include signal.h and not sigcontext.h. | ||
| 9 | |||
| 10 | a good fix should be to remove glibc | ||
| 11 | specific understanding, in those ifdef's | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | Upstream-Status: Pending | ||
| 16 | |||
| 17 | os_dep.c | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/os_dep.c b/os_dep.c | ||
| 21 | index 08c501d..5cb7873 100644 | ||
| 22 | --- a/os_dep.c | ||
| 23 | +++ b/os_dep.c | ||
| 24 | @@ -41,7 +41,7 @@ | ||
| 25 | # else /* __GLIBC__ < 2 */ | ||
| 26 | /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ | ||
| 27 | /* one. Check LINUX_VERSION_CODE to see which we should reference. */ | ||
| 28 | -# include <asm/sigcontext.h> | ||
| 29 | +# include <signal.h> | ||
| 30 | # endif /* __GLIBC__ < 2 */ | ||
| 31 | # endif | ||
| 32 | #endif /* LINUX && !POWERPC */ | ||
| 33 | -- | ||
| 34 | 2.5.1 | ||
| 35 | |||
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" | |||
| 21 | LICENSE = "MIT" | 21 | LICENSE = "MIT" |
| 22 | LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7" | 22 | LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7" |
| 23 | 23 | ||
| 24 | SRC_URI = "http://www.hboehm.info/gc/gc_source/gc-${PV}.tar.gz" | 24 | SRC_URI = "http://www.hboehm.info/gc/gc_source/gc-${PV}.tar.gz \ |
| 25 | file://0001-fix-build-with-musl.patch \ | ||
| 26 | " | ||
| 25 | 27 | ||
| 26 | SRC_URI[md5sum] = "12c05fd2811d989341d8c6d81f66af87" | 28 | SRC_URI[md5sum] = "12c05fd2811d989341d8c6d81f66af87" |
| 27 | SRC_URI[sha256sum] = "63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2" | 29 | SRC_URI[sha256sum] = "63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2" |
