diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-08-09 12:16:43 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-08-11 20:16:52 -0700 |
| commit | 3c37bdcea6b6950662bade837f33ec674ea64b06 (patch) | |
| tree | 7c23a6517909afc1cedf781ce7297d1a211cd55c | |
| parent | 72220d60882fc0066e09849e7d58cd3838fba04a (diff) | |
| download | meta-openembedded-contrib-3c37bdcea6b6950662bade837f33ec674ea64b06.tar.gz | |
sg3-utils: fix build with glibc-2.28
Fixes:
http://errors.yoctoproject.org/Errors/Details/185896/
TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld:
sg_map26.o: in function `nd_match_scandir_select':
/usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:359:
undefined reference to `major'
TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld:
/usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:361:
undefined reference to `minor'
TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld:
sg_map26.o: in function `nt_typ_from_filename':
/usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:218:
undefined reference to `major'
TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld:
/usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:219:
undefined reference to `minor'
collect2: error: ld returned 1 exit status
Makefile:806: recipe for target 'sg_map26' failed
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch b/meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch new file mode 100644 index 0000000000..fbad4135df --- /dev/null +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils/glibc-2.28.patch @@ -0,0 +1,24 @@ +Fixes: +http://errors.yoctoproject.org/Errors/Details/185896/ + +TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: sg_map26.o: in function `nd_match_scandir_select': +/usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:359: undefined reference to `major' +TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: /usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:361: undefined reference to `minor' +TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: sg_map26.o: in function `nt_typ_from_filename': +/usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:218: undefined reference to `major' +TOPDIR/tmp-glibc/work/core2-64-oe-linux/sg3-utils/1.42-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.2.0/ld: /usr/src/debug/sg3-utils/1.42-r0/sg3_utils-1.42/src/sg_map26.c:219: undefined reference to `minor' +collect2: error: ld returned 1 exit status +Makefile:806: recipe for target 'sg_map26' failed + +Upstream-Status: Pending + +--- sg3_utils-1.42.orig/src/sg_map26.c 2018-08-09 11:53:26.907493996 +0000 ++++ sg3_utils-1.42/src/sg_map26.c 2018-08-09 11:51:56.713490763 +0000 +@@ -33,6 +33,7 @@ + #include <sys/ioctl.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <linux/major.h> + + #ifdef HAVE_CONFIG_H diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb index f14a5314a2..c37c5e952e 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb @@ -8,7 +8,9 @@ SECTION = "console/admin" LICENSE = "GPLv2+ & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" -SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" +SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ + file://glibc-2.28.patch \ +" MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" |