igmpproxy: Include missing sys/tupes.h and define _GNU_SOURCE
PATCH 1/17 igmpproxy: Include missing sys/tupes.h and define _GNU_SOURCE
--- ...xy.h-Include-sys-types.h-for-u_short-u_in.patch | 25 ++++++++++++++++++++++ .../recipes-daemons/igmpproxy/igmpproxy_0.1.bb | 5 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch
meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch new file +25 -0
@@ -0,0 +1,25 @@ +From a557651a08e21e3c7c7f5eca9f5405f86624903f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 14 Jul 2017 22:42:51 -0700 +Subject: [PATCH] src/igmpproxy.h: Include sys/types.h for u_short/u_init + +Signed-off-by: Khem Raj <[email protected]> +--- + src/igmpproxy.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/igmpproxy.h b/src/igmpproxy.h +index 4dabd1c..4454729 100644 +--- a/src/igmpproxy.h ++++ b/src/igmpproxy.h +@@ -46,6 +46,7 @@ + #include <stdbool.h> + + #include <sys/socket.h> ++#include <sys/types.h> + #include <sys/un.h> + #include <sys/time.h> + #include <sys/ioctl.h> +-- +2.13.3 +
meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb +4 -1
@@ -5,9 +5,12 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=1e995e2799bb0d27d63069b97f805420" SRC_URI = "http://sourceforge.net/projects/igmpproxy/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - " + file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ + " SRC_URI[md5sum] = "c56f41ec195bc1fe016369bf74efc5a1" SRC_URI[sha256sum] = "ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae" inherit autotools pkgconfig + +CFLAGS += "-D_GNU_SOURCE"
Signature · 1 line
2.13.3
PATCH 2/17 rdate: Define logwtmp if libc != glibc
--- .../0001-rdate-define-logwtmp-on-libc-glibc.patch | 40 ++++++++++++++++++++++ .../recipes-connectivity/rdate/rdate_1.5.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch
meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch new file +40 -0
@@ -0,0 +1,40 @@ +From e0c690acfcddd3c3421f6eb0182c54815fd70f8f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 14 Jul 2017 23:21:08 -0700 +Subject: [PATCH] rdate: define logwtmp on libc != glibc + +Signed-off-by: Khem Raj <[email protected]> +--- + src/rdate.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/rdate.c b/src/rdate.c +index 943d481..685b1b8 100644 +--- a/src/rdate.c ++++ b/src/rdate.c +@@ -41,7 +41,22 @@ static int print_mode = 0; // display the time + static int timeout = 10; // timeout for each connection attempt + static char *service = DEFAULT_SERVICE; + ++#ifndef __GLIBC__ ++static void logwtmp(const char * line, const char * name, const char * host) ++{ ++ struct utmp u; ++ memset(&u, 0, sizeof(u)); ++ ++ u.ut_pid = getpid(); ++ u.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; ++ strncpy(u.ut_line, line, sizeof(u.ut_line)); ++ strncpy(u.ut_name, name, sizeof(u.ut_name)); ++ strncpy(u.ut_host, host, sizeof(u.ut_host)); ++ gettimeofday(&(u.ut_tv), NULL); + ++ updwtmp(_PATH_WTMP, &u); ++} ++#endif /* __GLIBC__ */ + + // Returns string from address info pointer + static char* +-- +2.13.3 +
meta-networking/recipes-connectivity/rdate/rdate_1.5.bb +1 -0
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "https://www.aelius.com/njh/${BPN}/${BP}.tar.gz \ file://0001-src-rdate-Fix-printf-format-errors.patch \ + file://0001-rdate-define-logwtmp-on-libc-glibc.patch \ " SRC_URI[md5sum] = "0a4f612480777fdf25264ac03c57eae6" SRC_URI[sha256sum] = "6e800053eaac2b21ff4486ec42f0aca7214941c7e5fceedd593fa0be99b9227d"
Signature · 1 line
2.13.3
PATCH 3/17 multipath-tools: Include limits.h for PATH_MAX
In reply to Khem Raj--- ...0001-kpartx-include-limits.h-for-PATH_MAX.patch | 29 ++++++++++++++++++++++ .../multipath-tools/multipath-tools_0.7.1.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch
meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 330028a5a904a0da3788141030e614569dc5aaa7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 14 Jul 2017 23:28:12 -0700 +Subject: [PATCH] kpartx: include limits.h for PATH_MAX + +lopart.c:76:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'INT8_MAX'? + char path[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Khem Raj <[email protected]> +--- + kpartx/lopart.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kpartx/lopart.c b/kpartx/lopart.c +index 7005445..5efe5dc 100644 +--- a/kpartx/lopart.c ++++ b/kpartx/lopart.c +@@ -22,6 +22,7 @@ + #include <errno.h> + #include <stdlib.h> + #include <unistd.h> ++#include <limits.h> + #include <sys/ioctl.h> + #include <sys/stat.h> + #include <sys/mman.h> +-- +2.13.3 +
meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb +1 -0
@@ -45,6 +45,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ file://0013-Always-use-devmapper.patch \ file://0014-Always-use-devmapper-for-kpartx.patch \ + file://0001-kpartx-include-limits.h-for-PATH_MAX.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
Signature · 1 line
2.13.3
PATCH 4/17 a2jmidid: Link with libexecinfo on musl
In reply to Khem Raj--- meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +3 -0
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = " \ " DEPENDS = "alsa-lib jack dbus" +DEPENDS_append_libc-musl = " libexecinfo" SRC_URI = " \ http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \
@@ -18,6 +19,8 @@ SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d35826 inherit waf pkgconfig +LDFLAGS_append_libc-musl = " -lexecinfo" + export LINKFLAGS="${LDFLAGS}" FILES_${PN} += "${datadir}/dbus-1/services"
Signature · 1 line
2.13.3
PATCH 5/17 netkit-ftp: Include sys/types.h for u_long definition
In reply to Khem Raj--- .../0001-ftp-include-sys-types.h-for-u_long.patch | 30 ++++++++++++++++++++++ .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 7 ++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch
meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 2ee0c51d81a0a08d64b64ab624074e5f7cd9615a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 00:07:32 -0700 +Subject: [PATCH] ftp: include sys/types.h for u_long + +fixes +ftp.c:1091:2: error: unknown type name 'u_long'; did you mean 'long'? + u_long a1,a2,a3,a4,p1,p2; + ^~~~~~ + +Signed-off-by: Khem Raj <[email protected]> +--- + ftp/ftp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ftp/ftp.c b/ftp/ftp.c +index 7a56af6..5dcb513 100644 +--- a/ftp/ftp.c ++++ b/ftp/ftp.c +@@ -43,6 +43,7 @@ char ftp_rcsid[] = + #include <sys/socket.h> + #include <sys/time.h> + #include <sys/file.h> ++#include <sys/types.h> + + #include <netinet/in.h> + #include <netinet/ip.h> +-- +2.13.3 +
meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +4 -3
@@ -6,9 +6,10 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://ftp/ftp.c;beginline=2;endline=3;md5=2d40a75a50d83b8f6317b3f53db72bfa" SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \ - file://Add_ARG_MAX_define.patch \ -" + ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \ + file://Add_ARG_MAX_define.patch \ + file://0001-ftp-include-sys-types.h-for-u_long.patch \ + " SRC_URI[archive.md5sum] = "94441610c9b86ef45c4c6ec609444060" SRC_URI[archive.sha256sum] = "61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349"
Signature · 1 line
2.13.3
PATCH 6/17 postfix: Disable nis support on musl
In reply to Khem Raj--- ...libc-before-setting-CANT_USE_SEND_RECV_MS.patch | 26 ++++++++++++++++++++++ .../recipes-daemons/postfix/postfix.inc | 6 ++++- .../recipes-daemons/postfix/postfix_3.1.1.bb | 11 +++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch
meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 63619acf25151d4dade6d65732722ec4a710a5ac Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 09:54:25 -0700 +Subject: [PATCH] Check for glibc before setting CANT_USE_SEND_RECV_MSG + +Signed-off-by: Khem Raj <[email protected]> +--- + src/util/sys_defs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h +index f720e2a..7314c63 100644 +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -813,7 +813,7 @@ extern int initgroups(const char *, int); + #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1) + #endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0)) \ +- || (__GLIBC__ < 2) ++ || (defined(__GLIBC__) && (__GLIBC__ < 2)) + #define CANT_USE_SEND_RECV_MSG + #define DEF_SMTP_CACHE_DEMAND 0 + #else +-- +2.13.3 +
meta-networking/recipes-daemons/postfix/postfix.inc +5 -1
@@ -60,6 +60,9 @@ export AUXLIBS-ldap = "\ export CCARGS-ldap_class-native = "" export AUXLIBS-ldap_class-native = "" +export CCARGS-nonis_libc-musl = "-DNO_NIS" +export CCARGS-nonis = "" + # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH # current openldap didn't enable SASL export CCARGS-sasl = "\
@@ -70,10 +73,11 @@ export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = "" # PCRE, TLS support default -export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS ${CCARGS-ldap} ${CCARGS-sasl}" +export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" export AUXLIBS = "-lpcre -lssl -lcrypto ${AUXLIBS-sasl} ${AUXLIBS-ldap}" export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" +export CCARGS-nonis_libc-musl = "-DNO_NIS" # OPT,DEBUG is aready in CFLAGS # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS EXTRA_OEMAKE += "OPT= DEBUG= OPTS= "
meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb +11 -0
@@ -1,4 +1,15 @@ require postfix.inc +SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ + file://makedefs.patch \ + file://install.patch \ + file://main.cf_2.0 \ + file://postfix \ + file://internal_recipient \ + file://postfix.service \ + file://aliasesdb \ + file://check_hostname.sh \ + file://0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch \ + " SRC_URI[md5sum] = "40d72ea143af7ab0038c2cee1f483707" SRC_URI[sha256sum] = "3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982"
Signature · 1 line
2.13.3
PATCH 7/17 zlog: Fix build on 64bit targets and musl
In reply to Khem Raj--- ...t-pthread_t-to-unsigned-long-instead-of-u.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-extended/zlog/zlog_git.bb | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch
meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch new file +32 -0
@@ -0,0 +1,32 @@ +From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 09:29:33 -0700 +Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned + int + +On 64bit machines it ends up in errors + +event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); + +Signed-off-by: Khem Raj <[email protected]> +--- + src/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/event.c b/src/event.c +index 8f988b5..c632c33 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) + a_event->tid = pthread_self(); + + a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); +- a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); ++ a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); + + //zlog_event_profile(a_event, ZC_DEBUG); + return a_event; +-- +2.13.3 +
meta-oe/recipes-extended/zlog/zlog_git.bb +3 -1
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "1.2.12+git${SRCPV}" SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog \ + file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ + " S = "${WORKDIR}/git"
Signature · 1 line
2.13.3
PATCH 8/17 grubby: Link with libexecinfo on musl
In reply to Khem Raj--- ...-variable-LIBS-to-provides-libraries-from.patch | 26 ++++++++++++++++++++++ .../0002-include-paths.h-for-_PATH_MOUNTED.patch | 25 +++++++++++++++++++++ .../recipes-devtools/grubby/grubby_8.40.bb | 9 ++++++-- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch
meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 22afaa21b4b258082be591e54c99e1ba6fbd7748 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 10:19:22 -0700 +Subject: [PATCH 1/2] Add another variable LIBS to provides libraries from env + +Signed-off-by: Khem Raj <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ac14404..92a8e73 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ RPM_OPT_FLAGS ?= -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector + CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function -ggdb + LDFLAGS := + +-grubby_LIBS = -lblkid -lpopt ++grubby_LIBS = -lblkid -lpopt ${LIBS} + + all: grubby + +-- +2.13.3 +
meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 8f844ac7f44b8dc428d06cd6958c5f32d383d01c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 10:19:50 -0700 +Subject: [PATCH 2/2] include paths.h for _PATH_MOUNTED + +Signed-off-by: Khem Raj <[email protected]> +--- + grubby.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grubby.c b/grubby.c +index 47a1a15..59f74a9 100644 +--- a/grubby.c ++++ b/grubby.c +@@ -34,6 +34,7 @@ + #include <libgen.h> + #include <execinfo.h> + #include <signal.h> ++#include <paths.h> + #include <blkid/blkid.h> + + #include "log.h" +-- +2.13.3 +
meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +7 -2
@@ -9,11 +9,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "popt util-linux" +DEPENDS_append_libc-musl = " libexecinfo" SRC_URI = "https://github.com/rhinstaller/${BPN}/archive/${PV}-1.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \ file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ file://run-ptest \ -" + file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \ + file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ + " SRC_URI[md5sum] = "1005907b275d6d93368d045274537d86" SRC_URI[sha256sum] = "85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df"
@@ -24,8 +27,10 @@ RDEPENDS_${PN} += "dracut" inherit autotools-brokensep ptest -EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}'" +EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'" +LIBS_libc-musl = "-lexecinfo" +LIBS ?= "" do_install_ptest() { install -d ${D}${PTEST_PATH} cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH}
Signature · 1 line
2.13.3
PATCH 9/17 numactl: Update to latest from github
In reply to Khem RajThere are patches to compile it on musl upstream
therefore switch the SRC_URI to fetch from github
---
.../numactl/{numactl_2.0.11.bb => numactl_git.bb} | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/numactl/{numactl_2.0.11.bb => numactl_git.bb} (88%)meta-oe/recipes-support/numactl/numactl_git.bb renamed from meta-oe/recipes-support/numactl/numactl_2.0.11.bb +6 -3
@@ -10,15 +10,18 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" -SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \ +SRCREV = "ea3a70681c2f523fe58e1d44527f478ca76db74e" +PV = "2.0.11+git${SRCPV}" + +SRC_URI = "git://github.com/numactl/numactl \ file://fix-null-pointer.patch \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ file://0001-define-run-test-target.patch \ " -SRC_URI[md5sum] = "d3bc88b7ddb9f06d60898f4816ae9127" -SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861" + +S = "${WORKDIR}/git" # ARM does not currently support NUMA COMPATIBLE_HOST = "^((?!arm).*)$"
Signature · 1 line
2.13.3
PATCH 10/17 efivar: Upgrade to 0.31
In reply to Khem Raj---
...some-extra-const-that-gcc-complains-about.patch | 44 ---------------
...Do-not-use-__bswap_constant_-16-32-macros.patch | 37 ++++++++++++
...-version-new-way-symbol-versioning-breaks.patch | 66 ----------------------
.../efivar/efivar/0002-disable-static-build.patch | 33 -----------
.../fix-compile-failure-with-host-gcc-4.6.patch | 13 ++---
.../efivar/efivar/musl-strndupa.patch | 17 ++++++
.../efivar/{efivar_0.24.bb => efivar_0.31.bb} | 9 ++-
7 files changed, 63 insertions(+), 156 deletions(-)
delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch
create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch
delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch
delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch
create mode 100644 meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch
rename meta-oe/recipes-extended/efivar/{efivar_0.24.bb => efivar_0.31.bb} (83%)meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0 -44
@@ -1,44 +0,0 @@ -From 29a2dea16113b5a8e51de46437c6a9f7426c5867 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Mon, 6 Feb 2017 14:28:19 -0500 -Subject: [PATCH 1/2] Remove some extra "const" that gcc complains about. - -One of these days I'll get these right. - -Signed-off-by: Peter Jones <[email protected]> ---- - src/include/efivar/efiboot-loadopt.h | 4 ++-- - src/loadopt.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/include/efivar/efiboot-loadopt.h b/src/include/efivar/efiboot-loadopt.h -index 07db5c4..efc29c6 100644 ---- a/src/include/efivar/efiboot-loadopt.h -+++ b/src/include/efivar/efiboot-loadopt.h -@@ -32,8 +32,8 @@ extern ssize_t efi_loadopt_create(uint8_t *buf, ssize_t size, - - extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) - __attribute__((__nonnull__ (1))); --extern const unsigned char const * efi_loadopt_desc(efi_load_option *opt, -- ssize_t limit) -+extern const unsigned char * efi_loadopt_desc(efi_load_option *opt, -+ ssize_t limit) - __attribute__((__visibility__ ("default"))) - __attribute__((__nonnull__ (1))); - extern uint32_t efi_loadopt_attrs(efi_load_option *opt) -diff --git a/src/loadopt.c b/src/loadopt.c -index 64e333f..ec50722 100644 ---- a/src/loadopt.c -+++ b/src/loadopt.c -@@ -336,7 +336,7 @@ teardown(void) - - __attribute__((__nonnull__ (1))) - __attribute__((__visibility__ ("default"))) --const unsigned char const * -+const unsigned char * - efi_loadopt_desc(efi_load_option *opt, ssize_t limit) - { - if (last_desc) { --- -2.12.2 -
meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 98b33d4193998687aa3a78c097f7bd4c393e0c85 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 00:29:42 -0700 +Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros + +not available on musl + +Signed-off-by: Khem Raj <[email protected]> +--- + src/makeguids.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/makeguids.c b/src/makeguids.c +index da2f5f7..daf821a 100644 +--- a/src/makeguids.c ++++ b/src/makeguids.c +@@ -155,13 +155,13 @@ main(int argc, char *argv[]) + #if BYTE_ORDER == BIG_ENDIAN\n\ + #define cpu_to_be32(n) (n)\n\ + #define cpu_to_be16(n) (n)\n\ +-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ + #else\n\ + #define cpu_to_le32(n) (n)\n\ + #define cpu_to_le16(n) (n)\n\ +-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ + #endif\n\ + """); + +-- +2.13.3 +
meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0 -66
66 lines not on this page · raw message
meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 126e0d3c1ad74cf5b0abe9e98ec444bcc3c83159 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <[email protected]> -Date: Fri, 4 Mar 2016 14:53:55 +0100 -Subject: [PATCH 2/2] disable static build - -Signed-off-by: Koen Kooi <[email protected]> - -Upstream-Status: Inappropriate [meta-oe specific] -Signed-off-by: Hongxu Jia <[email protected]> - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 1829d22..c7a0ca3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,9 +8,9 @@ include $(TOPDIR)/Make.defaults - - LIBTARGETS=libefivar.so libefiboot.so - STATICLIBTARGETS=libefivar.a libefiboot.a --BINTARGETS=efivar efivar-static -+BINTARGETS=efivar - PCTARGETS=efivar.pc efiboot.pc --TARGETS=$(LIBTARGETS) $(STATICLIBTARGETS) $(BINTARGETS) $(PCTARGETS) -+TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) - - LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c linux.c loadopt.c - LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) --- -2.4.3 -
meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +5 -8
@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <[email protected]> gcc.specs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/gcc.specs b/gcc.specs -index 0d4bbda..3802ca6 100644 ---- a/gcc.specs -+++ b/gcc.specs +Index: git/gcc.specs +=================================================================== +--- git.orig/gcc.specs ++++ git/gcc.specs @@ -2,13 +2,13 @@ + -D_GNU_SOURCE
@@ -35,11 +35,8 @@ index 0d4bbda..3802ca6 100644 + %(efivar_cpp_options) *cc1_options: --+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -flto -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} +-+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} ++ %(efivar_cpp_options) -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} *self_spec: + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} --- -2.8.1 -
meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch new file +17 -0
@@ -0,0 +1,17 @@ +Taken from void linux + +Index: git/src/linux.c +=================================================================== +--- git.orig/src/linux.c ++++ git/src/linux.c +@@ -40,6 +40,10 @@ + #include <efivar.h> + #include <efiboot.h> + ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + #include "dp.h" + #include "linux.h" + #include "util.h"
meta-oe/recipes-extended/efivar/efivar_0.31.bb renamed from meta-oe/recipes-extended/efivar/efivar_0.24.bb +4 -5
@@ -12,13 +12,12 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "963cb2e5adc145fe00717f94e382f2973f80e753" +SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://0002-disable-static-build.patch \ file://allow-multi-definitions-for-native.patch \ - file://0001-Remove-some-extra-const-that-gcc-complains-about.patch \ - file://0002-New-gcc-version-new-way-symbol-versioning-breaks.patch \ -" + file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ + file://musl-strndupa.patch \ + " SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ file://0003-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \
Signature · 1 line
2.13.3
PATCH 11/17 linuxptp: Upgrade to 1.8
In reply to Khem RajFix build on musl along way
---
.../0003-include-missing-time.h-for-time_t.patch | 26 ++++++++++++++++
...ude-header-sequence-to-avoid-duplicate-de.patch | 36 ++++++++++++++++++++++
.../linuxptp/{linuxptp_1.6.bb => linuxptp_1.8.bb} | 9 ++++--
3 files changed, 68 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch
create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch
rename meta-oe/recipes-connectivity/linuxptp/{linuxptp_1.6.bb => linuxptp_1.8.bb} (66%)meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch new file +26 -0
@@ -0,0 +1,26 @@ +From b36cafdbcbe2193f5b669e703c608e19e23f80a3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 11:16:42 -0700 +Subject: [PATCH 3/4] include missing time.h for time_t + +Signed-off-by: Khem Raj <[email protected]> +--- + util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.h b/util.h +index e912f19..3c634c1 100644 +--- a/util.h ++++ b/util.h +@@ -22,7 +22,7 @@ + + #include "ddt.h" + #include "ether.h" +- ++#include <time.h> + /** + * Table of human readable strings, one for each port state. + */ +-- +2.13.3 +
meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 3cd28aa771934d9165ff0d7e19932cde65de3e52 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 11:16:57 -0700 +Subject: [PATCH 4/4] Adjust include header sequence to avoid duplicate + definitions on musl + +Signed-off-by: Khem Raj <[email protected]> +--- + raw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/raw.c b/raw.c +index f51c829..494ea7f 100644 +--- a/raw.c ++++ b/raw.c +@@ -18,8 +18,6 @@ + */ + #include <errno.h> + #include <fcntl.h> +-#include <linux/filter.h> +-#include <linux/if_ether.h> + #include <net/ethernet.h> + #include <net/if.h> + #include <netinet/in.h> +@@ -32,6 +30,8 @@ + #include <sys/types.h> + #include <unistd.h> + ++#include <linux/filter.h> ++#include <linux/if_ether.h> + #include <linux/errqueue.h> + #include <linux/net_tstamp.h> + #include <linux/sockios.h> +-- +2.13.3 +
meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb renamed from meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb +6 -3
@@ -4,10 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ - file://no-incdefs-using-host-headers.patch" + file://no-incdefs-using-host-headers.patch \ + file://0003-include-missing-time.h-for-time_t.patch \ + file://0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch \ + " -SRC_URI[md5sum] = "6aa15d83f5a35f1fd076ba9adc4e7285" -SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c" +SRC_URI[md5sum] = "5688cdfe57932273e1dbf35b3b97b9a0" +SRC_URI[sha256sum] = "fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
Signature · 1 line
2.13.3
PATCH 12/17 sessreg: Fix build on musl
In reply to Khem Rajmusl does not define _WTMPX_FILE or _UTMPX_FILE
use versions without 'X'
--- meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb +3 -0
@@ -6,3 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" SRC_URI[md5sum] = "e238c89dabc566e1835e1ecb61b605b9" SRC_URI[sha256sum] = "551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c" + +CFLAGS_append_libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " +
Signature · 1 line
2.13.3
PATCH 13/17 phonet-utils: Fix build with musl
In reply to Khem Raj--- .../0001-Include-limits.h-for-PATH_MAX.patch | 25 ++++++++++++++++++++++ .../phonet-utils/phonet-utils_git.bb | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch
meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch new file +25 -0
@@ -0,0 +1,25 @@ +From f7ad9a4471cee2324f216a0d82ba8097ec746c56 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 11:48:12 -0700 +Subject: [PATCH] Include limits.h for PATH_MAX + +Signed-off-by: Khem Raj <[email protected]> +--- + src/pnstat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pnstat.c b/src/pnstat.c +index 661a5bc..76068e6 100644 +--- a/src/pnstat.c ++++ b/src/pnstat.c +@@ -35,6 +35,7 @@ + #include <dirent.h> + #include <unistd.h> + #include <netinet/tcp.h> ++#include <limits.h> + + struct fd + { +-- +2.13.3 +
meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb +3 -1
@@ -2,7 +2,9 @@ SUMMARY = "This small package provides a few command line tools for Linux Phonet HOMEPAGE = "" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master" +SRC_URI = "git://gitorious.org/meego-cellular/phonet-utils.git;branch=master \ + file://0001-Include-limits.h-for-PATH_MAX.patch \ + " PR = "r2" S = "${WORKDIR}/git" SRCREV = "4acfa720fd37d178a048fc2be17180137d4a70ea"
Signature · 1 line
2.13.3
PATCH 14/17 nicstat: Fix build on musl/x86_64
In reply to Khem Raj--- ...tat.c-Do-not-define-uint64_t-and-uint32_t.patch | 37 ++++++++++++++++++++++ meta-oe/recipes-extended/nicstat/nicstat_1.95.bb | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch
meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 52590fbf735cef3fec85a042458aa89a02c52b57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 11:33:12 -0700 +Subject: [PATCH] nicstat.c: Do not define uint64_t and uint32_t + +Use the defines from platform + +Signed-off-by: Khem Raj <[email protected]> + +--- + nicstat.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/nicstat.c b/nicstat.c +index 83ad557..2a6e0c1 100644 +--- a/nicstat.c ++++ b/nicstat.c +@@ -32,6 +32,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <unistd.h> + #include <string.h> + #include <ctype.h> +@@ -88,8 +89,6 @@ + #define PROC_NET_BUFSIZ (128 * 1024) + #define PROC_UPTIME "/proc/uptime" + /* Needs to be fixed if not built under ILP32 */ +-typedef unsigned long long uint64_t; +-typedef unsigned int uint32_t; + extern char *optarg; + extern int optind, opterr, optopt; + #endif /* OS_LINUX */ +-- +2.13.3 +
meta-oe/recipes-extended/nicstat/nicstat_1.95.bb +3 -1
@@ -5,7 +5,9 @@ HOMEPAGE = "http://nicstat.sourceforge.net" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0" -SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz" +SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz \ + file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \ + " SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d" SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367"
Signature · 1 line
2.13.3
PATCH 15/17 open-vm-tools: Fix build with musl
In reply to Khem RajUse SPDX format for LICENSES
--- ...mptions-about-glibc-being-only-libc-imple.patch | 45 ++ ...ude-poll.h-instead-of-obsolete-sys-poll.h.patch | 24 + .../0003-Rename-poll.h-to-vm_poll.h.patch | 756 +++++++++++++++++++++ ...ompatible-pointer-types-and-Wno-error-add.patch | 31 + ...05-Use-configure-test-for-struct-timespec.patch | 45 ++ ...ix-definition-of-ALLPERMS-and-ACCESSPERMS.patch | 58 ++ ...re-to-test-for-feature-instead-of-platfor.patch | 144 ++++ .../0008-use-posix-strerror_r-unless-gnu.patch | 30 + ...support-for-building-with-system-libtirpc.patch | 342 ++++++++++ .../open-vm-tools/0010-gnu-ucontext.patch | 65 ++ ...Use-configure-test-for-sys-stat.h-include.patch | 25 + .../open-vm-tools/open-vm-tools_10.1.5.bb | 25 +- 12 files changed, 1584 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch new file +45 -0
@@ -0,0 +1,45 @@ +From a0983d84185f04c4e40778fe951fde4439894882 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 07:37:03 -0700 +Subject: [PATCH 01/11] Remove assumptions about glibc being only libc + implementation on linux + +Signed-off-by: Khem Raj <[email protected]> +--- + open-vm-tools/lib/file/fileIOPosix.c | 2 +- + open-vm-tools/lib/include/vm_basic_defs.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +Index: open-vm-tools/lib/file/fileIOPosix.c +=================================================================== +--- open-vm-tools.orig/lib/file/fileIOPosix.c ++++ open-vm-tools/lib/file/fileIOPosix.c +@@ -205,7 +205,7 @@ static AlignedPool alignedPool; + * are not available in any header file. + */ + +-#if defined(__linux__) && !defined(__ANDROID__) ++#if defined(__linux__) && defined(__GLIBC__) + #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) + /* + * We want preadv/pwritev. But due to FOB=64, the symbols are -64. +Index: open-vm-tools/lib/include/vm_basic_defs.h +=================================================================== +--- open-vm-tools.orig/lib/include/vm_basic_defs.h ++++ open-vm-tools/lib/include/vm_basic_defs.h +@@ -571,6 +571,7 @@ typedef int pid_t; + #if defined __linux__ && !defined __KERNEL__ && !defined MODULE && \ + !defined VMM && !defined FROBOS && !defined __ANDROID__ + #include <features.h> ++#if __GLIBC__ + #if __GLIBC_PREREQ(2, 1) && !defined GLIBC_VERSION_21 + #define GLIBC_VERSION_21 + #endif +@@ -590,6 +591,7 @@ typedef int pid_t; + #define GLIBC_VERSION_212 + #endif + #endif ++#endif + + /* + * Convenience definitions of unicode characters.
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch new file +24 -0
@@ -0,0 +1,24 @@ +From d44c7c9de7380ad7b284231bd5b5c99b5c19758d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 07:37:59 -0700 +Subject: [PATCH 02/11] include poll.h instead of obsolete sys/poll.h + +Signed-off-by: Khem Raj <[email protected]> +--- + open-vm-tools/lib/asyncsocket/asyncSocketInt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: open-vm-tools/lib/asyncsocket/asyncSocketInt.h +=================================================================== +--- open-vm-tools.orig/lib/asyncsocket/asyncSocketInt.h ++++ open-vm-tools/lib/asyncsocket/asyncSocketInt.h +@@ -71,8 +71,8 @@ + #else + #include <stddef.h> + #include <ctype.h> ++#include <poll.h> + #include <sys/types.h> +-#include <sys/poll.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <netdb.h>
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch new file +756 -0
756 lines not on this page · raw message
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch new file +31 -0
@@ -0,0 +1,31 @@ +From cdb0b3c898c6b6b6c8259d9ddb8b00163ac5e419 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 09:43:18 -0700 +Subject: [PATCH 04/11] Add -Wno-incompatible-pointer-types and + -Wno-error=address + +Signed-off-by: Khem Raj <[email protected]> +--- + open-vm-tools/lib/dynxdr/Makefile.am | 2 +- + open-vm-tools/lib/file/Makefile.am | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +Index: open-vm-tools/lib/dynxdr/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/dynxdr/Makefile.am ++++ open-vm-tools/lib/dynxdr/Makefile.am +@@ -20,4 +20,4 @@ noinst_LTLIBRARIES = libDynxdr.la + libDynxdr_la_SOURCES = + libDynxdr_la_SOURCES += dynxdr.c + libDynxdr_la_SOURCES += xdrutil.c +- ++libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types +Index: open-vm-tools/lib/file/Makefile.am +=================================================================== +--- open-vm-tools.orig/lib/file/Makefile.am ++++ open-vm-tools/lib/file/Makefile.am +@@ -27,3 +27,4 @@ libFile_la_SOURCES += fileLockPrimitive. + libFile_la_SOURCES += fileLockPosix.c + libFile_la_SOURCES += fileTempPosix.c + libFile_la_SOURCES += fileTemp.c ++libFile_la_CPPFLAGS = -Wno-error=address
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch new file +45 -0
45 lines not on this page · raw message
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch new file +58 -0
58 lines not on this page · raw message
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch new file +144 -0
144 lines not on this page · raw message
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch new file +30 -0
@@ -0,0 +1,30 @@ +From d4d1e7146ca2698089f6bd532f2fb8b9c1134ca7 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <[email protected]> +Date: Mon, 2 Jan 2017 14:39:27 +0000 +Subject: [PATCH 08/11] use posix strerror_r unless gnu + +--- + open-vm-tools/lib/err/errPosix.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +Index: open-vm-tools/lib/err/errPosix.c +=================================================================== +--- open-vm-tools.orig/lib/err/errPosix.c ++++ open-vm-tools/lib/err/errPosix.c +@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, + { + char *p; + +-#if defined(linux) && !defined(N_PLAT_NLM) && !defined(__ANDROID__) ++#if defined(__GLIBC__) + p = strerror_r(errorNumber, buf, bufSize); + #else +- p = strerror(errorNumber); +-#endif ++ if (strerror_r(errorNumber, buf, bufSize) != 0) ++ snprintf(buf, bufSize, "unknown error %i", errorNumber); ++ p = buf; ++#endif /* defined __GLIBC__ */ + ASSERT(p != NULL); + return p; + }
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch new file +342 -0
342 lines not on this page · raw message
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch new file +65 -0
65 lines not on this page · raw message
meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 95c6184d9ff70a47c41768850923a96de9e544aa Mon Sep 17 00:00:00 2001 +From: Natanael Copa <[email protected]> +Date: Wed, 18 Nov 2015 10:41:01 +0000 +Subject: [PATCH 11/11] Use configure test for sys/stat.h include + +This is needed for musl libc. + +Signed-off-by: Natanael Copa <[email protected]> +--- + open-vm-tools/services/plugins/vix/vixTools.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: open-vm-tools/services/plugins/vix/vixTools.c +=================================================================== +--- open-vm-tools.orig/services/plugins/vix/vixTools.c ++++ open-vm-tools/services/plugins/vix/vixTools.c +@@ -66,7 +66,7 @@ + #include <unistd.h> + #endif + +-#if defined(sun) || defined(__FreeBSD__) || defined(__APPLE__) ++#ifdef HAVE_SYS_STAT_H + #include <sys/stat.h> + #endif +
meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +19 -6
@@ -13,26 +13,39 @@ SUMMARY = "Tools to enhance VMWare guest integration and performance" HOMEPAGE = "https://github.com/vmware/open-vm-tools" SECTION = "vmware-tools" -LICENSE = "LGPLv2.1 & GPLv2 & BSD & CDDLv1" +LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b66ba4cb4fc017682c95efc300410e79" LICENSE_modules/freebsd/vmblock = "BSD" -LICENSE_modules/freebsd/vmmemctl = "GPLv2" -LICENSE_modules/freebsd/vmxnet = "GPLv2" -LICENSE_modules/linux = "GPLv2" -LICENSE_modules/solaris = "CDDLv1" +LICENSE_modules/freebsd/vmmemctl = "GPL-2.0" +LICENSE_modules/freebsd/vmxnet = "GPL-2.0" +LICENSE_modules/linux = "GPL-2.0" +LICENSE_modules/solaris = "CDDL-1.0" SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://tools.conf \ file://vmtoolsd.service \ file://0001-configure.ac-don-t-use-dnet-config.patch \ file://0002-add-include-sys-sysmacros.h.patch \ + file://0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch \ + file://0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch \ + file://0003-Rename-poll.h-to-vm_poll.h.patch \ + file://0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch \ + file://0005-Use-configure-test-for-struct-timespec.patch \ + file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \ + file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \ + file://0008-use-posix-strerror_r-unless-gnu.patch \ + file://0011-Use-configure-test-for-sys-stat.h-include.patch \ + " +SRC_URI_append_libc-musl = "\ + file://0009-Add-support-for-building-with-system-libtirpc.patch \ + file://0010-gnu-ucontext.patch \ " - SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" S = "${WORKDIR}/git/open-vm-tools" DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps" +DEPENDS_append_libc-musl = " libtirpc" # open-vm-tools is supported only on x86. COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
Signature · 1 line
2.13.3
PATCH 16/17 lm_sensors: Fix build on musl
In reply to Khem Raj--- ...-limit-sys-io.h-header-include-to-just-gl.patch | 88 ++++++++++++++++++++++ .../recipes-support/lm_sensors/lmsensors_3.4.0.bb | 6 ++ 2 files changed, 94 insertions(+) create mode 100644 meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch
meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch new file +88 -0
@@ -0,0 +1,88 @@ +From 727524453f115ddc05109e9bbb3d0e60a7db9185 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 15:05:50 -0700 +Subject: [PATCH] prog: Do not limit sys/io.h header include to just glibc + +musl provides it too. + +Signed-off-by: Khem Raj <[email protected]> +--- + prog/dump/isadump.c | 6 ------ + prog/dump/isaset.c | 6 ------ + prog/dump/superio.c | 5 ----- + prog/dump/util.c | 5 ----- + 4 files changed, 22 deletions(-) + +diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c +index e0e6f00..8794537 100644 +--- a/prog/dump/isadump.c ++++ b/prog/dump/isadump.c +@@ -36,13 +36,7 @@ + #include "util.h" + #include "superio.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c +index e743755..85a4f64 100644 +--- a/prog/dump/isaset.c ++++ b/prog/dump/isaset.c +@@ -32,13 +32,7 @@ + #include <string.h> + #include "util.h" + +- +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + #ifdef __powerpc__ + unsigned long isa_io_base = 0; /* XXX for now */ +diff --git a/prog/dump/superio.c b/prog/dump/superio.c +index 64ef27b..906fe55 100644 +--- a/prog/dump/superio.c ++++ b/prog/dump/superio.c +@@ -20,12 +20,7 @@ + */ + + #include <stdlib.h> +- +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + #include "superio.h" + +diff --git a/prog/dump/util.c b/prog/dump/util.c +index 874c1b9..197fa64 100644 +--- a/prog/dump/util.c ++++ b/prog/dump/util.c +@@ -11,12 +11,7 @@ + #include <stdio.h> + #include "util.h" + +-/* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include <sys/io.h> +-#else +-#include <asm/io.h> +-#endif + + /* Return 1 if we should continue, 0 if we should abort */ + int user_ack(int def) +-- +2.13.3 +
meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb +6 -0
@@ -11,6 +11,7 @@ SRC_URI = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz \ file://fancontrol.init \ file://sensord.init \ file://0001-lmsensors-sensors-detect-print-a-special-message-whe.patch \ + file://0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch \ " SRC_URI[md5sum] = "1e9f117cbfa11be1955adc96df71eadb" SRC_URI[sha256sum] = "e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e"
@@ -37,6 +38,11 @@ EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ CC="${CC}" AR="${AR}"' do_compile() { + sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile + # Respect LDFLAGS + sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile + sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ + ${S}/lib/Module.mk oe_runmake user PROG_EXTRA="sensors sensord" }
Signature · 1 line
2.13.3
PATCH 17/17 gperftools: Upgrade to 2.6.1
In reply to Khem RajFix build with musl
---
.../0001-Fix-build-failure-for-ppc.patch | 28 ----------
.../gperftools/0001-fix-build-with-musl-libc.patch | 61 ++++++++++++++++++++++
...001-include-fcntl.h-for-loff_t-definition.patch | 28 ++++++++++
.../{gperftools_2.5.bb => gperftools_2.6.1.bb} | 13 ++---
4 files changed, 96 insertions(+), 34 deletions(-)
delete mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch
create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch
create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch
rename meta-oe/recipes-support/gperftools/{gperftools_2.5.bb => gperftools_2.6.1.bb} (67%)meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Subject: Fix build failure for ppc - -Upstream-Status: Pending - -Fix the following build failure. - - error: 'siginfo_t' does not name a type - -Signed-off-by: Chen Qi <[email protected]> ---- - src/stacktrace_powerpc-linux-inl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h -index 5d16fa1..a9bf775 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -44,6 +44,7 @@ - - #include <stdint.h> // for uintptr_t - #include <stdlib.h> // for NULL -+#include <signal.h> // for siginfo_t - #include <gperftools/stacktrace.h> - #include <base/vdso_support.h> - --- -2.8.3 -
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +61 -0
61 lines not on this page · raw message
meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 19:28:17 -0700 +Subject: [PATCH] include fcntl.h for loff_t definition + +Fixes +linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared + +Signed-off-by: Khem Raj <[email protected]> +--- + src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h +index 85347a2..70431ca 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h +@@ -162,6 +162,7 @@ extern "C" { + #include <unistd.h> + #include <linux/unistd.h> + #include <endian.h> ++#include <fcntl.h> + + #ifdef __mips__ + /* Include definitions of the ABI currently in use. */ +-- +2.13.3 +
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +7 -6
@@ -2,19 +2,20 @@ SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" HOMEPAGE = "http://code.google.com/p/gperftools/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -DEPENDS = "libunwind" +DEPENDS += "libunwind" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f50/gperftools-2.5.tar.gz \ +SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" +SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Fix-build-failure-for-ppc.patch \ file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch \ + file://0001-fix-build-with-musl-libc.patch \ + file://0001-include-fcntl.h-for-loff_t-definition.patch \ " -SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" -SRC_URI[sha256sum] = "6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173" - inherit autotools +S = "${WORKDIR}/git" + # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 # Segmentation fault (core dumped)
Signature · 1 line
2.13.3
Re: [meta-oe][PATCH 10/17] efivar: Upgrade to 0.31
In reply to Khem RajFor target version it fails to apply gold linker patch:
Applying patch 0004-fix-unknow-option-for-gold-linker.patch patching file gcc.specs
Hunk #1 FAILED at 14.
1 out of 1 hunk FAILED -- rejects in file gcc.specs
Patch 0004-fix-unknow-option-for-gold-linker.patch does not apply (enforce with -f)
and native version fails in do_compile with:
In file included from dp.c:27:0:
util.h:109:10: error: expected expression before ‘int’
int *: int_add(a,b,c), \
^Quoted 361 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- ...some-extra-const-that-gcc-complains-about.patch | 44 --------------- ...Do-not-use-__bswap_constant_-16-32-macros.patch | 37 ++++++++++++ ...-version-new-way-symbol-versioning-breaks.patch | 66 ---------------------- .../efivar/efivar/0002-disable-static-build.patch | 33 ----------- .../fix-compile-failure-with-host-gcc-4.6.patch | 13 ++--- .../efivar/efivar/musl-strndupa.patch | 17 ++++++ .../efivar/{efivar_0.24.bb => efivar_0.31.bb} | 9 ++- 7 files changed, 63 insertions(+), 156 deletions(-) delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-Remove- some-extra-const-that-gcc-complains-about.patch create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-makeguids- Do-not-use-__bswap_constant_-16-32-macros.patch delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-New-gcc- version-new-way-symbol-versioning-breaks.patch delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-disable- static-build.patch create mode 100644 meta-oe/recipes-extended/efivar/efivar/musl-strndupa. patch rename meta-oe/recipes-extended/efivar/{efivar_0.24.bb => efivar_0.31.bb}(83%)
(quoted diff) +0
-0some-extra-const-that-gcc-complains-about.patch b/meta-oe/recipes-extended/efivar/efivar/0001-Remove- some-extra-const-that-gcc-complains-about.patch deleted file mode 100644
index 4ae8cb90f..000000000
--- a/meta-oe/recipes-extended/efivar/efivar/0001-Remove- some-extra-const-that-gcc-complains-about.patch +++/dev/nullmeta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0
-14@@ -1,44 +0,0 @@ -From 29a2dea16113b5a8e51de46437c6a9f7426c5867 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Mon, 6 Feb 2017 14:28:19 -0500 -Subject: [PATCH 1/2] Remove some extra "const" that gcc complains about. - -One of these days I'll get these right. - -Signed-off-by: Peter Jones <[email protected]> ---- - src/include/efivar/efiboot-loadopt.h | 4 ++-- - src/loadopt.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/include/efivar/efiboot-loadopt.h
b/src/include/efivar/efiboot-loadopt.h
-index 07db5c4..efc29c6 100644
----a/src/include/efivar/efiboot-loadopt.h
-+++b/src/include/efivar/efiboot-loadopt.h
-@@ -32,8 +32,8 @@ externssize_tefi_loadopt_create(uint8_t *buf,ssize_tsize,meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0
-4- - extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) - __attribute__((__nonnull__ (1))); --extern const unsigned char const * efi_loadopt_desc(efi_load_option*opt,
--ssize_tlimit)
-+extern const unsigned char * efi_loadopt_desc(efi_load_option *opt,
-+ssize_tlimit)meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0
-19- __attribute__((__visibility__ ("default"))) - __attribute__((__nonnull__ (1))); - extern uint32_t efi_loadopt_attrs(efi_load_option *opt) -diff --git a/src/loadopt.c b/src/loadopt.c -index 64e333f..ec50722 100644 ---- a/src/loadopt.c -+++ b/src/loadopt.c -@@ -336,7 +336,7 @@ teardown(void) - - __attribute__((__nonnull__ (1))) - __attribute__((__visibility__ ("default"))) --const unsigned char const * -+const unsigned char * - efi_loadopt_desc(efi_load_option *opt, ssize_t limit) - { - if (last_desc) { --- -2.12.2 -(quoted diff) +0
-0Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-oe/recipes-extended/efivar/efivar/0001-makeguids- Do-not-use-__bswap_constant_-16-32-macros.patch new file mode 100644
index 000000000..73a772186meta-oe/recipes-extended/efivar/efivar/0001-makeguids- new file +0
-0Do-not-use-__bswap_constant_-16-32-macros.patch
meta-oe/recipes-extended/efivar/efivar/0001-makeguids- new file +23
-0@@ -0,0 +1,37 @@ +From 98b33d4193998687aa3a78c097f7bd4c393e0c85 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 00:29:42 -0700 +Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros + +not available on musl + +Signed-off-by: Khem Raj <[email protected]> +--- + src/makeguids.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/makeguids.c b/src/makeguids.c +index da2f5f7..daf821a 100644 +--- a/src/makeguids.c ++++ b/src/makeguids.c +@@ -155,13 +155,13 @@ main(int argc, char *argv[]) + #if BYTE_ORDER == BIG_ENDIAN\n\ + #define cpu_to_be32(n) (n)\n\ + #define cpu_to_be16(n) (n)\n\ +-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 |(n)<<8&0xff0000 | (n)<<24))\n\
++#definecpu_to_le16(n)((uint16_t) ((n)<<8 | (n)>>8))\n\
+ #else\n\
+ #definecpu_to_le32(n)(n)\n\
+ #definecpu_to_le16(n)(n)\n\+-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\+ #endif\n\
+ """);meta-oe/recipes-extended/efivar/efivar/0001-makeguids- new file +4
-0+ +-- +2.13.3 +(quoted diff) +0
-0version-new-way-symbol-versioning-breaks.patch b/meta-oe/recipes-extended/
efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patchdeleted file mode 100644
index 737b78b01..000000000
--- a/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc- version-new-way-symbol-versioning-breaks.patch
+++/dev/nullmeta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0
-26@@ -1,66 +0,0 @@ -From 31e655d2b5f66e772d9714422b7332bbaa60d2e6 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Mon, 6 Feb 2017 14:41:58 -0500 -Subject: [PATCH 2/2] New gcc version, new way symbol versioning breaks. - -Apparently I get to redo this every time there's a compiler release. -Yaaaaaay. - -Anyway, the current method is to define the two compat things from the -land before time as @libefivar.so.0 symbols and list them there in the -link map. Then we have the real one defined with another name, and set -as efi_set_variable@@LIBEFIVAR_0.24. Then to make there actually be a -efi_set_variable symbol to link against, we create it as a weak alias. - -This is all completely absurd. - -Signed-off-by: Peter Jones <[email protected]> ---- - src/lib.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/lib.c b/src/lib.c -index 6a9b392..afa7d94 100644 ---- a/src/lib.c -+++ b/src/lib.c -@@ -49,7 +49,7 @@ _efi_set_variable(efi_guid_t guid, const char *name,
uint8_t*data,
- {
- return ops->set_variable(guid, name, data,data_size, attributes,
0600);
- }
--__asm__(".symver _efi_set_variable,_efi_set_variable@"); -+__asm__(".symver _efi_set_variable,[email protected]"); -
- int
-__attribute__((__nonnull__ (2, 3)))
-@@ -59,17 +59,24 @@ _efi_set_variable_variadic(efi_guid_t guid, const char *name,uint8_t*data,
- {
- return ops->set_variable(guid, name, data,data_size, attributes,
0600);
- }
--__asm__(".symver _efi_set_variable_variadic,efi_set_variable@"); -+__asm__(".symver_efi_set_variable_variadic, [email protected]");meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0
-10- - int - __attribute__((__nonnull__ (2, 3))) - __attribute__((__visibility__ ("default"))) --efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, -- size_t data_size, uint32_t attributes, mode_t mode) -+_efi_set_variable_mode(efi_guid_t guid, const char *name, uint8_t *data, -+ size_t data_size, uint32_t attributes, mode_t mode) - { - return ops->set_variable(guid, name, data, data_size, attributes,mode);
- }
--__asm__(".symver efi_set_variable,efi_set_variable@@LIBEFIVAR_0.24"); -+__asm__(".symver _efi_set_variable_mode,efi_set_variable@ @LIBEFIVAR_0.24");
-+
-+int
-+__attribute__((__nonnull__ (2, 3))) -+__attribute__((__visibility__ ("default"))) -+efi_set_variable(efi_guid_t guid, const char *name,uint8_t*data,
-+size_tdata_size,uint32_tattributes,mode_tmode)
-+__attribute((weak, alias ("_efi_set_variable_mode")));meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0
-6- - int - __attribute__((__nonnull__ (2, 3))) --- -2.12.2 -meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch deleted +0
-1--- a/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch
+++/dev/nullmeta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch deleted +0
-33@@ -1,33 +0,0 @@ -From 126e0d3c1ad74cf5b0abe9e98ec444bcc3c83159 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <[email protected]> -Date: Fri, 4 Mar 2016 14:53:55 +0100 -Subject: [PATCH 2/2] disable static build - -Signed-off-by: Koen Kooi <[email protected]> - -Upstream-Status: Inappropriate [meta-oe specific] -Signed-off-by: Hongxu Jia <[email protected]> - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 1829d22..c7a0ca3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,9 +8,9 @@ include $(TOPDIR)/Make.defaults - - LIBTARGETS=libefivar.so libefiboot.so - STATICLIBTARGETS=libefivar.a libefiboot.a --BINTARGETS=efivar efivar-static -+BINTARGETS=efivar - PCTARGETS=efivar.pc efiboot.pc --TARGETS=$(LIBTARGETS) $(STATICLIBTARGETS) $(BINTARGETS) $(PCTARGETS) -+TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) - - LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c linux.c loadopt.c - LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) --- -2.4.3 -(quoted diff) +0
-0failure-with-host-gcc-4.6.patch b/meta-oe/recipes-extended/
efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patchindex1c68a2934..e3fa2e1c1100644
--- a/meta-oe/recipes-extended/efivar/efivar/fix-compile- failure-with-host-gcc-4.6.patch
+++ b/meta-oe/recipes-extended/efivar/efivar/fix-compile- failure-with-host-gcc-4.6.patchmeta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +5
-11@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <[email protected]> gcc.specs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/gcc.specs b/gcc.specs -index 0d4bbda..3802ca6 100644 ---- a/gcc.specs -+++ b/gcc.specs +Index: git/gcc.specs +=================================================================== +--- git.orig/gcc.specs ++++ git/gcc.specs @@ -2,13 +2,13 @@ + -D_GNU_SOURCE@@ -35,11 +35,8 @@ index 0d4bbda..3802ca6 100644 + %(efivar_cpp_options) *cc1_options: --+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -flto -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:% {!fPIC:%{!fno-pic:-fPIE}}}}}} +-+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:% {!fPIC:%{!fno-pic:-fPIE}}}}}} ++ %(efivar_cpp_options) -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} *self_spec: + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} --- -2.8.1 -meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch new file +17
-0@@ -0,0 +1,17 @@ +Taken from void linux + +Index: git/src/linux.c +=================================================================== +--- git.orig/src/linux.c ++++ git/src/linux.c +@@ -40,6 +40,10 @@ + #include <efivar.h> + #include <efiboot.h> + ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + #include "dp.h" + #include "linux.h" + #include "util.h"meta-oe/recipes-extended/efivar/efivar_0.31.bb renamed from meta-oe/recipes-extended/efivar/efivar_0.24.bb +4
-5@@ -12,13 +12,12 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "963cb2e5adc145fe00717f94e382f2973f80e753" +SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://0002-disable-static-build.patch \ file://allow-multi-definitions-for-native.patch \ - file://0001-Remove-some-extra-const-that-gcc-complains-about.patch \ - file://0002-New-gcc-version-new-way-symbol-versioning-breaks.patch \ -" + file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ + file://musl-strndupa.patch \ + "SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch
\ file://0003-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES','ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \
--
2.13.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 17/17] gperftools: Upgrade to 2.6.1
In reply to Khem RajFails to build with:
http://errors.yoctoproject.org/Errors/Details/148214/
Quoted 220 lines · Khem Raj
Fix build with musl
Signed-off-by Khem Raj <[email protected]>--- .../0001-Fix-build-failure-for-ppc.patch | 28 ---------- .../gperftools/0001-fix-build-with-musl-libc.patch | 61 ++++++++++++++++++++++ ...001-include-fcntl.h-for-loff_t-definition.patch | 28 ++++++++++ .../{gperftools_2.5.bb => gperftools_2.6.1.bb} | 13 ++--- 4 files changed, 96 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001- Fix-build-failure-for-ppc.patch create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001- fix-build-with-musl-libc.patch create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001- include-fcntl.h-for-loff_t-definition.patch rename meta-oe/recipes-support/gperftools/{gperftools_2.5.bb =>gperftools_2.6.1.bb} (67%)
(quoted diff) +0
-0Fix-build-failure-for-ppc.patch b/meta-oe/recipes-support/
gperftools/gperftools/0001-Fix-build-failure-for-ppc.patchdeleted file mode 100644
index 27f855d1e..000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/0001- Fix-build-failure-for-ppc.patch
+++/dev/nullmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14@@ -1,28 +0,0 @@ -Subject: Fix build failure for ppc - -Upstream-Status: Pending - -Fix the following build failure. - - error: 'siginfo_t' does not name a type - -Signed-off-by: Chen Qi <[email protected]> ---- - src/stacktrace_powerpc-linux-inl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-
linux-inl.hmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14-index 5d16fa1..a9bf775 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -44,6 +44,7 @@ - - #include <stdint.h> // for uintptr_t - #include <stdlib.h> // for NULL -+#include <signal.h> // for siginfo_t - #include <gperftools/stacktrace.h> - #include <base/vdso_support.h> - --- -2.8.3 -meta-oe/recipes-support/gperftools/gperftools/0001- renamed from meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +0
-0fix-build-with-musl-libc.patch
new file mode 100644
index 000000000..78621c7femeta-oe/recipes-support/gperftools/gperftools/0001- new file +0
-0fix-build-with-musl-libc.patch
meta-oe/recipes-support/gperftools/gperftools/0001- new file +21
-0@@ -0,0 +1,61 @@ +From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 15:51:28 -0700 +Subject: [PATCH] fix build with musl libc + +Patch from https://github.com/gperftools/gperftools/pull/765/ + +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 1 + + src/malloc_hook_mmap_linux.h | 8 ++++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b42fea3..70b49a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,7 @@ AC_HEADER_STDC + AC_CHECK_TYPES([__int64]) # defined in some windows platforms + AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>]) + AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # for
vdso_support.h++AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory allocator + AC_CHECK_FUNCS(sbrk) # for tcmalloc to get memory + AC_CHECK_FUNCS(geteuid) # for turning off services when run asroot
+AC_CHECK_FUNCS(fork)# for thepthread_atforksetupmeta-oe/recipes-support/gperftools/gperftools/0001- new file +16
-0+diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h +index 79ac4e3..d444635 100755 +--- a/src/malloc_hook_mmap_linux.h ++++ b/src/malloc_hook_mmap_linux.h +@@ -46,6 +46,10 @@ + #include <errno.h> + #include "base/linux_syscall_support.h" + ++#ifndef __GLIBC__ ++typedef off64_t __off64_t; ++#endif ++ + // The x86-32 case and the x86-64 case differ: + // 32b has a mmap2() syscall, 64b does not. + // 64b and 32b have different calling conventions for mmap(). +@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length,int prot, int flags,
meta-oe/recipes-support/gperftools/gperftools/0001- new file +5
-0+ return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) ||!defined(__REDIRECT_NTH))
meta-oe/recipes-support/gperftools/gperftools/0001- new file +4
-0+ + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { +@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t
old_size,size_tnew_size,meta-oe/recipes-support/gperftools/gperftools/0001- new file +11
-0+ return result; + } + +-#ifndef __UCLIBC__ ++#if HAVE___SBRK + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + +-- +2.13.3 +(quoted diff) +0
-0include-fcntl.h-for-loff_t-definition.patch b/meta-oe/recipes-support/
gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchnew file mode 100644
index 000000000..667008a5bmeta-oe/recipes-support/gperftools/gperftools/0001- new file +0
-0include-fcntl.h-for-loff_t-definition.patch
meta-oe/recipes-support/gperftools/gperftools/0001- new file +14
-0@@ -0,0 +1,28 @@ +From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 19:28:17 -0700 +Subject: [PATCH] include fcntl.h for loff_t definition + +Fixes +linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared + +Signed-off-by: Khem Raj <[email protected]> +--- + src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_
support.hmeta-oe/recipes-support/gperftools/gperftools/0001- new file +14
-0+index 85347a2..70431ca 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h +@@ -162,6 +162,7 @@ extern "C" { + #include <unistd.h> + #include <linux/unistd.h> + #include <endian.h> ++#include <fcntl.h> + + #ifdef __mips__ + /* Include definitions of the ABI currently in use. */ +-- +2.13.3 +meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +0
-0@@ -2,19 +2,20 @@ SUMMARY = "Fast, multi-threaded malloc() and niftyperformance analysis tools"
HOMEPAGE = "http://code.google.com/p/gperftools/"
LICENSE = "BSD"
LIC_FILES_CHKSUM= "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +1
-2-DEPENDS = "libunwind" +DEPENDS += "libunwind" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f 50/gperftools-2.5.tar.gz \
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +4
-3+SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" +SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Fix-build-failure-for-ppc.patch \ file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch \ + file://0001-fix-build-with-musl-libc.patch \ + file://0001-include-fcntl.h-for-loff_t-definition.patch \ " -SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" -SRC_URI[sha256sum] = "6fa2748f1acdf44d750253e160cf6e
2e72571329b42e563b455bde09e9e85173"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-1- inherit autotools +S = "${WORKDIR}/git" + # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from00000008
# Segmentation fault (core dumped)
--
2.13.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 10/17] efivar: Upgrade to 0.31
In reply to Martin JansaQuoted 9 lines · Martin Jansa
For target version it fails to apply gold linker patch:
Applying patch 0004-fix-unknow-option-for-gold-linker.patch patching file gcc.specs
Hunk #1 FAILED at 14.
1 out of 1 hunk FAILED -- rejects in file gcc.specs
Patch 0004-fix-unknow-option-for-gold-linker.patch does not apply (enforce with -f)
Quoted 6 lines
and native version fails in
do_compilewith:
In file included from dp.c:27:0:
util.h:109:10: error: expected expression before ‘int’int *: int_add(a,b,c), \ ^
Interesting, I will take a look again
Quoted 363 lines · Khem Raj
Quoted 360 lines
Signed-off-by Khem Raj <[email protected]>--- ...some-extra-const-that-gcc-complains-about.patch | 44 --------------- ...Do-not-use-__bswap_constant_-16-32-macros.patch | 37 ++++++++++++ ...-version-new-way-symbol-versioning-breaks.patch | 66 ---------------------- .../efivar/efivar/0002-disable-static-build.patch | 33 ----------- .../fix-compile-failure-with-host-gcc-4.6.patch | 13 ++--- .../efivar/efivar/musl-strndupa.patch | 17 ++++++ .../efivar/{efivar_0.24.bb => efivar_0.31.bb} | 9 ++- 7 files changed, 63 insertions(+), 156 deletions(-) delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch create mode 100644 meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch delete mode 100644 meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch create mode 100644 meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch rename meta-oe/recipes-extended/efivar/{efivar_0.24.bb => efivar_0.31.bb}(83%)
diff --git
a/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patchb/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patchdeleted file mode 100644
index 4ae8cb90f..000000000
---a/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch+++/dev/nullmeta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0
-14@@ -1,44 +0,0 @@ -From 29a2dea16113b5a8e51de46437c6a9f7426c5867 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Mon, 6 Feb 2017 14:28:19 -0500 -Subject: [PATCH 1/2] Remove some extra "const" that gcc complains about. - -One of these days I'll get these right. - -Signed-off-by: Peter Jones <[email protected]> ---- - src/include/efivar/efiboot-loadopt.h | 4 ++-- - src/loadopt.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/include/efivar/efiboot-loadopt.h
b/src/include/efivar/efiboot-loadopt.h
-index 07db5c4..efc29c6 100644
----a/src/include/efivar/efiboot-loadopt.h
-+++b/src/include/efivar/efiboot-loadopt.h
-@@ -32,8 +32,8 @@ externssize_tefi_loadopt_create(uint8_t *buf,ssize_tsize,meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0
-4- - extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) - __attribute__((__nonnull__ (1))); --extern const unsigned char const * efi_loadopt_desc(efi_load_option*opt,
--ssize_tlimit)
-+extern const unsigned char * efi_loadopt_desc(efi_load_option *opt,
-+ssize_tlimit)meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted +0
-19- __attribute__((__visibility__ ("default"))) - __attribute__((__nonnull__ (1))); - extern uint32_t efi_loadopt_attrs(efi_load_option *opt) -diff --git a/src/loadopt.c b/src/loadopt.c -index 64e333f..ec50722 100644 ---- a/src/loadopt.c -+++ b/src/loadopt.c -@@ -336,7 +336,7 @@ teardown(void) - - __attribute__((__nonnull__ (1))) - __attribute__((__visibility__ ("default"))) --const unsigned char const * -+const unsigned char * - efi_loadopt_desc(efi_load_option *opt, ssize_t limit) - { - if (last_desc) { --- -2.12.2 -diff --git
a/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patchb/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patchnew file mode 100644
index 000000000..73a772186
---/dev/null
+++b/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patchmeta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch new file +23
-0@@ -0,0 +1,37 @@ +From 98b33d4193998687aa3a78c097f7bd4c393e0c85 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 15 Jul 2017 00:29:42 -0700 +Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros + +not available on musl + +Signed-off-by: Khem Raj <[email protected]> +--- + src/makeguids.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/makeguids.c b/src/makeguids.c +index da2f5f7..daf821a 100644 +--- a/src/makeguids.c ++++ b/src/makeguids.c +@@ -155,13 +155,13 @@ main(int argc, char *argv[]) + #if BYTE_ORDER == BIG_ENDIAN\n\ + #define cpu_to_be32(n) (n)\n\ + #define cpu_to_be16(n) (n)\n\ +-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 |(n)<<8&0xff0000 | (n)<<24))\n\
++#definecpu_to_le16(n)((uint16_t) ((n)<<8 | (n)>>8))\n\
+ #else\n\
+ #definecpu_to_le32(n)(n)\n\
+ #definecpu_to_le16(n)(n)\n\+-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\+ #endif\n\
+ """);meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch new file +4
-0+ +-- +2.13.3 +diff --git
a/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patchb/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patchdeleted file mode 100644
index 737b78b01..000000000
---a/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch+++/dev/nullmeta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0
-26@@ -1,66 +0,0 @@ -From 31e655d2b5f66e772d9714422b7332bbaa60d2e6 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Mon, 6 Feb 2017 14:41:58 -0500 -Subject: [PATCH 2/2] New gcc version, new way symbol versioning breaks. - -Apparently I get to redo this every time there's a compiler release. -Yaaaaaay. - -Anyway, the current method is to define the two compat things from the -land before time as @libefivar.so.0 symbols and list them there in the -link map. Then we have the real one defined with another name, and set -as efi_set_variable@@LIBEFIVAR_0.24. Then to make there actually be a -efi_set_variable symbol to link against, we create it as a weak alias. - -This is all completely absurd. - -Signed-off-by: Peter Jones <[email protected]> ---- - src/lib.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/lib.c b/src/lib.c -index 6a9b392..afa7d94 100644 ---- a/src/lib.c -+++ b/src/lib.c -@@ -49,7 +49,7 @@ _efi_set_variable(efi_guid_t guid, const char *name,
uint8_t*data,
- {
- return ops->set_variable(guid, name, data,data_size, attributes,
0600);
- }
--__asm__(".symver _efi_set_variable,_efi_set_variable@"); -+__asm__(".symver _efi_set_variable,[email protected]"); -
- int
-__attribute__((__nonnull__ (2, 3)))
-@@ -59,17 +59,24 @@ _efi_set_variable_variadic(efi_guid_t guid, const char *name,uint8_t*data,
- {
- return ops->set_variable(guid, name, data,data_size, attributes,
0600);
- }
--__asm__(".symver _efi_set_variable_variadic,efi_set_variable@"); -+__asm__(".symver _efi_set_variable_variadic,[email protected]");meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0
-10- - int - __attribute__((__nonnull__ (2, 3))) - __attribute__((__visibility__ ("default"))) --efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, -- size_t data_size, uint32_t attributes, mode_t mode) -+_efi_set_variable_mode(efi_guid_t guid, const char *name, uint8_t *data, -+ size_t data_size, uint32_t attributes, mode_t mode) - { - return ops->set_variable(guid, name, data, data_size, attributes,mode);
- }
--__asm__(".symver efi_set_variable,efi_set_variable@@LIBEFIVAR_0.24"); -+__asm__(".symver _efi_set_variable_mode,efi_set_variable@@LIBEFIVAR_0.24"); -+
-+int
-+__attribute__((__nonnull__ (2, 3))) -+__attribute__((__visibility__ ("default"))) -+efi_set_variable(efi_guid_t guid, const char *name,uint8_t*data,
-+size_tdata_size,uint32_tattributes,mode_tmode)
-+__attribute((weak, alias ("_efi_set_variable_mode")));meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted +0
-6- - int - __attribute__((__nonnull__ (2, 3))) --- -2.12.2 -diff --git
a/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patchb/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patchdeleted file mode 100644
index 951b15921..000000000
---a/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch+++/dev/nullmeta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch deleted +0
-33@@ -1,33 +0,0 @@ -From 126e0d3c1ad74cf5b0abe9e98ec444bcc3c83159 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <[email protected]> -Date: Fri, 4 Mar 2016 14:53:55 +0100 -Subject: [PATCH 2/2] disable static build - -Signed-off-by: Koen Kooi <[email protected]> - -Upstream-Status: Inappropriate [meta-oe specific] -Signed-off-by: Hongxu Jia <[email protected]> - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 1829d22..c7a0ca3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,9 +8,9 @@ include $(TOPDIR)/Make.defaults - - LIBTARGETS=libefivar.so libefiboot.so - STATICLIBTARGETS=libefivar.a libefiboot.a --BINTARGETS=efivar efivar-static -+BINTARGETS=efivar - PCTARGETS=efivar.pc efiboot.pc --TARGETS=$(LIBTARGETS) $(STATICLIBTARGETS) $(BINTARGETS) $(PCTARGETS) -+TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) - - LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c linux.c loadopt.c - LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) --- -2.4.3 -diff --git
a/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patchb/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patchindex1c68a2934..e3fa2e1c1100644
---a/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch
+++b/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patchmeta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +5
-11@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <[email protected]> gcc.specs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/gcc.specs b/gcc.specs -index 0d4bbda..3802ca6 100644 ---- a/gcc.specs -+++ b/gcc.specs +Index: git/gcc.specs +=================================================================== +--- git.orig/gcc.specs ++++ git/gcc.specs @@ -2,13 +2,13 @@ + -D_GNU_SOURCE@@ -35,11 +35,8 @@ index 0d4bbda..3802ca6 100644 + %(efivar_cpp_options) *cc1_options: --+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -flto -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} +-+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} ++ %(efivar_cpp_options) -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} *self_spec: + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} --- -2.8.1 -meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch new file +17
-0@@ -0,0 +1,17 @@ +Taken from void linux + +Index: git/src/linux.c +=================================================================== +--- git.orig/src/linux.c ++++ git/src/linux.c +@@ -40,6 +40,10 @@ + #include <efivar.h> + #include <efiboot.h> + ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + #include "dp.h" + #include "linux.h" + #include "util.h"meta-oe/recipes-extended/efivar/efivar_0.31.bb renamed from meta-oe/recipes-extended/efivar/efivar_0.24.bb +4
-5@@ -12,13 +12,12 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "963cb2e5adc145fe00717f94e382f2973f80e753" +SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://0002-disable-static-build.patch \ file://allow-multi-definitions-for-native.patch \ - file://0001-Remove-some-extra-const-that-gcc-complains-about.patch \ - file://0002-New-gcc-version-new-way-symbol-versioning-breaks.patch \ -" + file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ + file://musl-strndupa.patch \ + "SRC_URI_append_class-target = "
file://0001-efivar-fix-for-cross-compile.patch \file://0003-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES','ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \
--
2.13.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 17/17] gperftools: Upgrade to 2.6.1
In reply to Martin JansaQuoted 3 lines · Martin Jansa
Fails to build with:
http://errors.yoctoproject.org/Errors/Details/148214/
{standard input}: Assembler messages:
{standard input}:434: Error: lo register required -- `ldr pc,[sp]'
we need to get you off thumb1 somehow :)
Quoted 224 lines · Khem Raj
Quoted 221 lines
Fix build with musl
Signed-off-by Khem Raj <[email protected]>--- .../0001-Fix-build-failure-for-ppc.patch | 28 ---------- .../gperftools/0001-fix-build-with-musl-libc.patch | 61 ++++++++++++++++++++++ ...001-include-fcntl.h-for-loff_t-definition.patch | 28 ++++++++++ .../{gperftools_2.5.bb => gperftools_2.6.1.bb} | 13 ++--- 4 files changed, 96 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch rename meta-oe/recipes-support/gperftools/{gperftools_2.5.bb =>gperftools_2.6.1.bb} (67%)
diff --git
a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patchb/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patchdeleted file mode 100644
index 27f855d1e..000000000
---a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch+++/dev/nullmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14@@ -1,28 +0,0 @@ -Subject: Fix build failure for ppc - -Upstream-Status: Pending - -Fix the following build failure. - - error: 'siginfo_t' does not name a type - -Signed-off-by: Chen Qi <[email protected]> ---- - src/stacktrace_powerpc-linux-inl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/stacktrace_powerpc-linux-inl.h
b/src/stacktrace_powerpc-linux-inl.hmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14-index 5d16fa1..a9bf775 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -44,6 +44,7 @@ - - #include <stdint.h> // for uintptr_t - #include <stdlib.h> // for NULL -+#include <signal.h> // for siginfo_t - #include <gperftools/stacktrace.h> - #include <base/vdso_support.h> - --- -2.8.3 -diff --git
a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patchb/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patchnew file mode 100644
index 000000000..78621c7fe
---/dev/null
+++b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patchmeta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +21
-0@@ -0,0 +1,61 @@ +From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 15:51:28 -0700 +Subject: [PATCH] fix build with musl libc + +Patch from https://github.com/gperftools/gperftools/pull/765/ + +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 1 + + src/malloc_hook_mmap_linux.h | 8 ++++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b42fea3..70b49a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,7 @@ AC_HEADER_STDC + AC_CHECK_TYPES([__int64]) # defined in some windows platforms + AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>]) + AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # for
vdso_support.h
++AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory
allocator
+AC_CHECK_FUNCS(sbrk)# for tcmalloc to get memory
+AC_CHECK_FUNCS(geteuid)# for turning off services when run as
root
+AC_CHECK_FUNCS(fork)# for thepthread_atforksetupmeta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +16
-0+diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h +index 79ac4e3..d444635 100755 +--- a/src/malloc_hook_mmap_linux.h ++++ b/src/malloc_hook_mmap_linux.h +@@ -46,6 +46,10 @@ + #include <errno.h> + #include "base/linux_syscall_support.h" + ++#ifndef __GLIBC__ ++typedef off64_t __off64_t; ++#endif ++ + // The x86-32 case and the x86-64 case differ: + // 32b has a mmap2() syscall, 64b does not. + // 64b and 32b have different calling conventions for mmap(). +@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length,int prot, int flags,
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +5
-0+ return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) ||!defined(__REDIRECT_NTH))
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +4
-0+ + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { +@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t
old_size,size_tnew_size,meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +11
-0+ return result; + } + +-#ifndef __UCLIBC__ ++#if HAVE___SBRK + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + +-- +2.13.3 +diff --git
a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchb/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchnew file mode 100644
index 000000000..667008a5b
---/dev/null
+++b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchmeta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +14
-0@@ -0,0 +1,28 @@ +From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 19:28:17 -0700 +Subject: [PATCH] include fcntl.h for loff_t definition + +Fixes +linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared + +Signed-off-by: Khem Raj <[email protected]> +--- + src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/base/linux_syscall_support.h
b/src/base/linux_syscall_support.hmeta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +11
-0+index 85347a2..70431ca 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h +@@ -162,6 +162,7 @@ extern "C" { + #include <unistd.h> + #include <linux/unistd.h> + #include <endian.h> ++#include <fcntl.h> + + #ifdef __mips__ + /* Include definitions of the ABI currently in use.*/
+--
+2.13.3(quoted diff) +1
-0+meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +0
-0@@ -2,19 +2,20 @@ SUMMARY = "Fast, multi-threaded malloc() and niftyperformance analysis tools"
HOMEPAGE = "http://code.google.com/p/gperftools/"
LICENSE = "BSD"
LIC_FILES_CHKSUM= "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +1
-2-DEPENDS = "libunwind" +DEPENDS += "libunwind" -SRC_URI =meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +4
-3+SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" +SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Fix-build-failure-for-ppc.patch \ file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch \ + file://0001-fix-build-with-musl-libc.patch \ + file://0001-include-fcntl.h-for-loff_t-definition.patch \ " -SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" -SRC_URI[sha256sum] ="
6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-1- inherit autotools +S = "${WORKDIR}/git" + # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from00000008
# Segmentation fault (core dumped)
--
2.13.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 17/17] gperftools: Upgrade to 2.6.1
I would be happy to test with qemuarmv7 and/or qemuarmv8 once they are added to oe-core.
I know some people have qemuarmv7 for long time, but as long as qemuarm in oe-core defaults to armv5t I'll continue to test it.
Quoted 253 lines · Khem Raj
Quoted 3 lines · Martin Jansa
Fails to build with:
http://errors.yoctoproject.org/Errors/Details/148214/{standard input}: Assembler messages:
{standard input}:434: Error: lo register required -- `ldr pc,[sp]'we need to get you off thumb1 somehow :)
Quoted 14 lines · Khem Raj
Quoted 12 lines
Fix build with musl
Signed-off-by Khem Raj <[email protected]>--- .../0001-Fix-build-failure-for-ppc.patch | 28 ---------- .../gperftools/0001-fix-build-with-musl-libc.patch | 61 ++++++++++++++++++++++ ...001-include-fcntl.h-for-loff_t-definition.patch | 28 ++++++++++ .../{gperftools_2.5.bb => gperftools_2.6.1.bb} | 13 ++--- 4 files changed, 96 insertions(+), 34 deletions(-) delete mode 100644Quoted 1 line
meta-oe/recipes-support/gperftools/gperftools/0001-
Fix-build-failure-for-ppc.patch
Quoted 2 lines
Quoted 2 lines
create mode 100644meta-oe/recipes-support/gperftools/gperftools/0001-
fix-build-with-musl-libc.patch
Quoted 2 lines
Quoted 2 lines
create mode 100644meta-oe/recipes-support/gperftools/gperftools/0001-
include-fcntl.h-for-loff_t-definition.patch
Quoted 5 lines
Quoted 5 lines
rename meta-oe/recipes-support/gperftools/{gperftools_2.5.bb =>gperftools_2.6.1.bb} (67%)
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-
Fix-build-failure-for-ppc.patch
Quoted 1 line
Quoted 1 line
b/meta-oe/recipes-support/gperftools/gperftools/0001-
Fix-build-failure-for-ppc.patch
Quoted 4 lines
Quoted 4 lines
deleted file mode 100644
index 27f855d1e..000000000
---
a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch
Quoted 25 lines
Quoted 25 lines
+++
/dev/nullmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14@@ -1,28 +0,0 @@ -Subject: Fix build failure for ppc - -Upstream-Status: Pending - -Fix the following build failure. - - error: 'siginfo_t' does not name a type - -Signed-off-by: Chen Qi <[email protected]> ---- - src/stacktrace_powerpc-linux-inl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/stacktrace_powerpc-linux-inl.h
b/src/stacktrace_powerpc-linux-inl.hmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-8-index 5d16fa1..a9bf775 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -44,6 +44,7 @@ - - #include <stdint.h> // for uintptr_t - #include <stdlib.h> // for NULL -+#include <signal.h> // for siginfo_tQuoted 8 lines
Quoted 8 lines
- #include <
gperftools/stacktrace.h>
- #include <base/vdso_support.h>meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-4- --- -2.8.3 -diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-
fix-build-with-musl-libc.patch
Quoted 1 line
Quoted 1 line
b/meta-oe/recipes-support/gperftools/gperftools/0001-
fix-build-with-musl-libc.patch
Quoted 5 lines
Quoted 5 lines
new file mode 100644
index 000000000..78621c7fe
---/dev/null
+++
b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch
Quoted 22 lines
Quoted 22 lines
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +21
-0@@ -0,0 +1,61 @@ +From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 15:51:28 -0700 +Subject: [PATCH] fix build with musl libc + +Patch from https://github.com/gperftools/gperftools/pull/765/ + +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 1 + + src/malloc_hook_mmap_linux.h | 8 ++++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b42fea3..70b49a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,7 @@ AC_HEADER_STDC + AC_CHECK_TYPES([__int64]) # defined in some windows platforms + AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>]) + AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # forQuoted 8 lines
Quoted 8 lines
vdso_support.h
++AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory
allocator
+AC_CHECK_FUNCS(sbrk)# for tcmalloc to get memory
+AC_CHECK_FUNCS(geteuid)# for turning off services when run as
root
+AC_CHECK_FUNCS(fork)# for thepthread_atforksetup
+diff --gita/src/malloc_hook_mmap_linux.h
b/src/malloc_hook_mmap_linux.hQuoted 32 lines
Quoted 32 lines
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +15
-0+index 79ac4e3..d444635 100755 +--- a/src/malloc_hook_mmap_linux.h ++++ b/src/malloc_hook_mmap_linux.h +@@ -46,6 +46,10 @@ + #include <errno.h> + #include "base/linux_syscall_support.h" + ++#ifndef __GLIBC__ ++typedef off64_t __off64_t; ++#endif ++ + // The x86-32 case and the x86-64 case differ: + // 32b has a mmap2() syscall, 64b does not. + // 64b and 32b have different calling conventions for mmap(). +@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_t length,int prot, int flags,
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +5
-0+ return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) ||!defined(__REDIRECT_NTH))
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +4
-0+ + extern "C" void* mmap(void *start, size_t length, int prot, int flags, + int fd, off_t offset) __THROW { +@@ -206,7 +210,7 @@ extern "C" void* mremap(void* old_addr, size_t
old_size,size_tnew_size,meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +5
-0+ return result; + } + +-#ifndef __UCLIBC__ ++#if HAVE___SBRKQuoted 8 lines
Quoted 8 lines
+ // libc's version:
+ extern "C" void*__sbrk(ptrdiff_t increment);meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +4
-0+ +-- +2.13.3 +diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-
include-fcntl.h-for-loff_t-definition.patch
Quoted 1 line
Quoted 1 line
b/meta-oe/recipes-support/gperftools/gperftools/0001-
include-fcntl.h-for-loff_t-definition.patch
Quoted 5 lines
Quoted 5 lines
new file mode 100644
index 000000000..667008a5b
---/dev/null
+++
b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch
Quoted 36 lines
Quoted 36 lines
meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +14
-0@@ -0,0 +1,28 @@ +From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 19:28:17 -0700 +Subject: [PATCH] include fcntl.h for loff_t definition + +Fixes +linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared + +Signed-off-by: Khem Raj <[email protected]> +--- + src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/base/linux_syscall_support.h
b/src/base/linux_syscall_support.hmeta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +11
-0+index 85347a2..70431ca 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h +@@ -162,6 +162,7 @@ extern "C" { + #include <unistd.h> + #include <linux/unistd.h> + #include <endian.h> ++#include <fcntl.h> + + #ifdef __mips__ + /* Include definitions of the ABI currently in use.*/
+--
+2.13.3(quoted diff) +1
-0+meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +0
-0Quoted 8 lines
Quoted 8 lines
index 43780a5ee..946463805 100644
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +0
-0@@ -2,19 +2,20 @@ SUMMARY = "Fast, multi-threaded malloc() and niftyperformance analysis tools"
HOMEPAGE = "http://code.google.com/p/gperftools/"
LICENSE = "BSD"
LIC_FILES_CHKSUM= "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
Quoted 5 lines
Quoted 5 lines
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +1
-2-DEPENDS = "libunwind" +DEPENDS += "libunwind" -SRC_URI =gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f 50/gperftools-2.5.tar.gz
Quoted 6 lines
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools"
Quoted 6 lines
\
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-1+SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" +SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Fix-build-failure-for-ppc.patch \ file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch\
Quoted 26 lines
Quoted 24 lines
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-2+ file://0001-fix-build-with-musl-libc.patch \ + file://0001-include-fcntl.h-for-loff_t-definition.patch \ " -SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" -SRC_URI[sha256sum] ="
6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-1- inherit autotools +S = "${WORKDIR}/git" + # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from00000008
# Segmentation fault (core dumped)
--
2.13.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 17/17] gperftools: Upgrade to 2.6.1
Quoted 5 lines · Martin Jansa
I would be happy to test with qemuarmv7 and/or qemuarmv8 once they are added to oe-core.
I know some people have qemuarmv7 for long time, but as long as qemuarm in oe-core defaults to armv5t I'll continue to test it.
may be stop testing with thumb ISA for now
Quoted 260 lines · Khem Raj
Quoted 256 lines
Quoted 3 lines · Martin Jansa
Fails to build with:
http://errors.yoctoproject.org/Errors/Details/148214/{standard input}: Assembler messages:
{standard input}:434: Error: lo register required -- `ldr pc,[sp]'we need to get you off thumb1 somehow :)
Quoted 244 lines · Khem Raj
Quoted 241 lines
Fix build with musl
Signed-off-by Khem Raj <[email protected]>--- .../0001-Fix-build-failure-for-ppc.patch | 28 ---------- .../gperftools/0001-fix-build-with-musl-libc.patch | 61 ++++++++++++++++++++++ ...001-include-fcntl.h-for-loff_t-definition.patch | 28 ++++++++++ .../{gperftools_2.5.bb => gperftools_2.6.1.bb} | 13 ++--- 4 files changed, 96 insertions(+), 34 deletions(-) delete mode 100644
meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patchcreate mode 100644
meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patchcreate mode 100644
meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchrename meta-oe/recipes-support/gperftools/{gperftools_2.5.bb =>gperftools_2.6.1.bb} (67%)
diff --git
a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch
b/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patchdeleted file mode 100644
index 27f855d1e..000000000
---
a/meta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch+++/dev/nullmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14@@ -1,28 +0,0 @@ -Subject: Fix build failure for ppc - -Upstream-Status: Pending - -Fix the following build failure. - - error: 'siginfo_t' does not name a type - -Signed-off-by: Chen Qi <[email protected]> ---- - src/stacktrace_powerpc-linux-inl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/stacktrace_powerpc-linux-inl.h
b/src/stacktrace_powerpc-linux-inl.hmeta-oe/recipes-support/gperftools/gperftools/0001-Fix-build-failure-for-ppc.patch deleted +0
-14-index 5d16fa1..a9bf775 100644 ---- a/src/stacktrace_powerpc-linux-inl.h -+++ b/src/stacktrace_powerpc-linux-inl.h -@@ -44,6 +44,7 @@ - - #include <stdint.h> // for uintptr_t - #include <stdlib.h> // for NULL -+#include <signal.h> // for siginfo_t - #include <gperftools/stacktrace.h> - #include <base/vdso_support.h> - --- -2.8.3 -diff --git
a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch
b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patchnew file mode 100644
index 000000000..78621c7fe
---/dev/null
+++
b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patchmeta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +21
-0@@ -0,0 +1,61 @@ +From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 15:51:28 -0700 +Subject: [PATCH] fix build with musl libc + +Patch from https://github.com/gperftools/gperftools/pull/765/ + +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 1 + + src/malloc_hook_mmap_linux.h | 8 ++++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b42fea3..70b49a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,6 +188,7 @@ AC_HEADER_STDC + AC_CHECK_TYPES([__int64]) # defined in some windows platforms + AC_CHECK_TYPES([struct mallinfo],,, [#include <malloc.h>]) + AC_CHECK_TYPES([Elf32_Versym],,, [#include <elf.h>]) # for
vdso_support.h
++AC_CHECK_FUNCS(__sbrk) # for intercepting glibc memory
allocator
+AC_CHECK_FUNCS(sbrk)# for tcmalloc to get memory
+AC_CHECK_FUNCS(geteuid)# for turning off services when run
as
root
+AC_CHECK_FUNCS(fork)# for thepthread_atforksetup
+diff --gita/src/malloc_hook_mmap_linux.hb/src/malloc_hook_mmap_linux.hmeta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +15
-0+index 79ac4e3..d444635 100755 +--- a/src/malloc_hook_mmap_linux.h ++++ b/src/malloc_hook_mmap_linux.h +@@ -46,6 +46,10 @@ + #include <errno.h> + #include "base/linux_syscall_support.h" + ++#ifndef __GLIBC__ ++typedef off64_t __off64_t; ++#endif ++ + // The x86-32 case and the x86-64 case differ: + // 32b has a mmap2() syscall, 64b does not. + // 64b and 32b have different calling conventions for mmap(). +@@ -168,7 +172,7 @@ extern "C" void* mmap64(void *start, size_tlength,
int prot, int flags,meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +5
-0+ return result; + } + +-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) ++# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) ||!defined(__REDIRECT_NTH))
+
+ extern "C" void* mmap(void *start,size_tlength, int prot, int flags,
+ int fd,off_toffset)__THROW{
+@@ -206,7 +210,7 @@ extern "C" void* mremap(void*old_addr,size_told_size,size_tnew_size,meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch new file +11
-0+ return result; + } + +-#ifndef __UCLIBC__ ++#if HAVE___SBRK + // libc's version: + extern "C" void* __sbrk(ptrdiff_t increment); + +-- +2.13.3 +diff --git
a/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch
b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchnew file mode 100644
index 000000000..667008a5b
---/dev/null
+++
b/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patchmeta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +14
-0@@ -0,0 +1,28 @@ +From 04ea8e001501931f4dbf20288aca78469617b08a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 16 Jul 2017 19:28:17 -0700 +Subject: [PATCH] include fcntl.h for loff_t definition + +Fixes +linux_syscall_support.h:2641:26: error: 'loff_t' has not been declared + +Signed-off-by: Khem Raj <[email protected]> +--- + src/base/linux_syscall_support.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/base/linux_syscall_support.h
b/src/base/linux_syscall_support.hmeta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch new file +11
-0+index 85347a2..70431ca 100644 +--- a/src/base/linux_syscall_support.h ++++ b/src/base/linux_syscall_support.h +@@ -162,6 +162,7 @@ extern "C" { + #include <unistd.h> + #include <linux/unistd.h> + #include <endian.h> ++#include <fcntl.h> + + #ifdef __mips__ + /* Include definitions of the ABI currently in use.*/
+--
+2.13.3(quoted diff) +1
-0+meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +0
-0@@ -2,19 +2,20 @@ SUMMARY = "Fast, multi-threaded malloc() and niftyperformance analysis tools"
HOMEPAGE = "http://code.google.com/p/gperftools/" LICENSE = "BSD"
LIC_FILES_CHKSUM=
"file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +1
-2-DEPENDS = "libunwind" +DEPENDS += "libunwind" -SRC_URI =meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-1+SRCREV = "bf840dec0495e17f5c8403e68e10b9d6bf05c559" +SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-Fix-build-failure-for-ppc.patch \ file://0001-Use-ucontext_t-instead-of-struct-ucontext.patch\
meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-2+ file://0001-fix-build-with-musl-libc.patch \ + file://0001-include-fcntl.h-for-loff_t-definition.patch \ " -SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" -SRC_URI[sha256sum] ="
6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173"meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb renamed from meta-oe/recipes-support/gperftools/gperftools_2.5.bb +2
-1- inherit autotools +S = "${WORKDIR}/git" + # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read accessfrom
00000008
# Segmentation fault (core dumped)
--
2.13.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-oe][PATCH 10/17] efivar: Upgrade to 0.31
In reply to Khem RajQuoted 10 lines · Khem Raj
Quoted 9 lines · Martin Jansa
For target version it fails to apply gold linker patch:
Applying patch 0004-fix-unknow-option-for-gold-linker.patch patching file gcc.specs
Hunk #1 FAILED at 14.
1 out of 1 hunk FAILED -- rejects in file gcc.specs
Patch 0004-fix-unknow-option-for-gold-linker.patch does not apply (enforce with -f)
Quoted 8 lines
Quoted 6 lines
and native version fails in
do_compilewith:
In file included from dp.c:27:0:
util.h:109:10: error: expected expression before ‘int’int *: int_add(a,b,c), \ ^Interesting, I will take a look again
I just rebased kraj/master
https://github.com/kraj/meta-openembedded/commit/26ac6c0863936618321eadaa12c2fa9d562b6261
it rebased fine and also built fine for intel-corei7-64
Re: [meta-oe][PATCH 10/17] efivar: Upgrade to 0.31
Quoted 18 lines · Khem Raj
Quoted 17 lines · Khem Raj
Quoted 15 lines · Martin Jansa
For target version it fails to apply gold linker patch:
Applying patch 0004-fix-unknow-option-for-gold-linker.patch patching file gcc.specs
Hunk #1 FAILED at 14.
1 out of 1 hunk FAILED -- rejects in file gcc.specs
Patch 0004-fix-unknow-option-for-gold-linker.patch does not apply (enforce with -f)and native version fails in
do_compilewith:
In file included from dp.c:27:0:
util.h:109:10: error: expected expression before ‘int’int *: int_add(a,b,c), \ ^
Quoted 7 lines
Quoted 1 line
Interesting, I will take a look again
I just rebased kraj/master
https://github.com/kraj/meta-openembedded/commit/26ac6c0863936618321eadaa12c2fa9d562b6261
it rebased fine and also built fine for intel-corei7-64
just sent a v2, again the issue was due to me not using/testing ld-is-gold