diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-07-27 14:41:12 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-07-30 19:15:24 -0700 |
| commit | 2d99031071fda966734c9a203710f4a1c7e88506 (patch) | |
| tree | 7c9fa192724618897c2a25da42c1d3eee96e5d44 /meta-oe/recipes-devtools/openocd | |
| parent | 09faeabebc84c3ec26170d6465e3e039cc8e9640 (diff) | |
| download | meta-openembedded-contrib-2d99031071fda966734c9a203710f4a1c7e88506.tar.gz | |
openocd: Fix build with glibc 2.30
sys/syctl.h is deprecated starting 2.30
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/openocd')
| -rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd_git.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch new file mode 100644 index 0000000000..618ce26890 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Do-not-include-syscrtl.h-with-glibc.patch @@ -0,0 +1,33 @@ +From a763610719e7d7f6cdc45569b6fbfdb91bb7c87b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Jul 2019 14:30:08 -0700 +Subject: [PATCH] Do not include syscrtl.h with glibc + +glibc 2.30 has deprecated it see [1] +Fixes +sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings] + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/helper/options.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/helper/options.c b/src/helper/options.c +index 12755e010..4007e37f6 100644 +--- a/src/helper/options.c ++++ b/src/helper/options.c +@@ -34,7 +34,7 @@ + #if IS_DARWIN + #include <libproc.h> + #endif +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + #if IS_WIN32 && !IS_CYGWIN +-- +2.22.0 + diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index b50c3acf4c..df10177ae9 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -10,6 +10,7 @@ SRC_URI = " \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \ + file://0001-Do-not-include-syscrtl.h-with-glibc.patch \ " SRCREV_FORMAT = "openocd" |