diff options
Diffstat (limited to 'meta-oe/recipes-devtools')
122 files changed, 3034 insertions, 3304 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup index f7d9973722..beca353e67 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup @@ -1,5 +1,8 @@ #!/bin/sh +[ ! -e /dev/pts ] && mkdir -p /dev/pts +[ ! -e /dev/pts/0 ] && mount devpts /dev/pts -t devpts + # TODO enable the lines below once we have support for getprop # retrieve the product info from Android # manufacturer=$(getprop ro.product.manufacturer Android) @@ -17,7 +20,7 @@ echo $manufacturer > /sys/class/android_usb/android0/iManufacturer echo $model > /sys/class/android_usb/android0/iProduct echo "0" > /sys/class/android_usb/android0/enable -echo "18d1" > /sys/class/android_usbid_usb/android0/idVendor +echo "18d1" > /sys/class/android_usb/android0/idVendor echo "D002" > /sys/class/android_usb/android0/idProduct echo "adb" > /sys/class/android_usb/android0/functions echo "1" > /sys/class/android_usb/android0/enable diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/Nonnull.patch b/meta-oe/recipes-devtools/android-tools/android-tools/Nonnull.patch new file mode 100644 index 0000000000..28747feb30 --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/Nonnull.patch @@ -0,0 +1,19 @@ +Description: Bring Clang's _Nonnull keyword to GCC +Author: Kai-Chung Yan +--- a/adb/sysdeps.h ++++ b/adb/sysdeps.h +@@ -66,11 +66,12 @@ + #endif + #endif + ++#define _Nonnull ++#define _Nullable ++ + #ifdef _WIN32 + + // Clang-only nullability specifiers +-#define _Nonnull +-#define _Nullable + + #include <ctype.h> + #include <direct.h> diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk deleted file mode 100644 index 0687c22c17..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk +++ /dev/null @@ -1,72 +0,0 @@ -# Makefile for adb - -SRCDIR ?= $(S) - -VPATH += $(SRCDIR)/system/core/adb -adb_SRC_FILES += adb.c -adb_SRC_FILES += console.c -adb_SRC_FILES += transport.c -adb_SRC_FILES += transport_local.c -adb_SRC_FILES += transport_usb.c -adb_SRC_FILES += commandline.c -adb_SRC_FILES += adb_client.c -adb_SRC_FILES += adb_auth_host.c -adb_SRC_FILES += sockets.c -adb_SRC_FILES += services.c -adb_SRC_FILES += file_sync_client.c -adb_SRC_FILES += get_my_path_linux.c -adb_SRC_FILES += usb_linux.c -adb_SRC_FILES += usb_vendors.c -adb_SRC_FILES += fdevent.c -adb_OBJS := $(adb_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libcutils -libcutils_SRC_FILES += atomic.c -libcutils_SRC_FILES += hashmap.c -libcutils_SRC_FILES += native_handle.c -libcutils_SRC_FILES += config_utils.c -libcutils_SRC_FILES += cpu_info.c -libcutils_SRC_FILES += load_file.c -# libcutils_SRC_FILES += open_memstream.c -# libcutils_SRC_FILES += strdup16to8.c -# libcutils_SRC_FILES += strdup8to16.c -# libcutils_SRC_FILES += record_stream.c -# libcutils_SRC_FILES += process_name.c -# libcutils_SRC_FILES += threads.c -# libcutils_SRC_FILES += sched_policy.c -# libcutils_SRC_FILES += iosched_policy.c -libcutils_SRC_FILES += str_parms.c -libcutils_SRC_FILES += fs.c -libcutils_SRC_FILES += multiuser.c -libcutils_SRC_FILES += socket_inaddr_any_server.c -libcutils_SRC_FILES += socket_local_client.c -libcutils_SRC_FILES += socket_local_server.c -libcutils_SRC_FILES += socket_loopback_client.c -libcutils_SRC_FILES += socket_loopback_server.c -libcutils_SRC_FILES += socket_network_client.c -libcutils_SRC_FILES += sockets.c -libcutils_SRC_FILES += ashmem-host.c -libcutils_SRC_FILES += dlmalloc_stubs.c -libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) - -CFLAGS += -DANDROID -CFLAGS += -DWORKAROUND_BUG6558362 -CFLAGS += -DADB_HOST=1 -CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -CFLAGS += -DANDROID_SMP=0 -CFLAGS += -I$(SRCDIR)/system/core/adb -CFLAGS += -I$(SRCDIR)/system/core/include -CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h - -LIBS += libcutils.a -lpthread -lcrypto - -all: adb - -adb: libcutils.a $(adb_OBJS) - $(CC) -o $@ $(LDFLAGS) $(adb_OBJS) $(LIBS) - -libcutils.a: $(libcutils_OBJS) - $(AR) rcs $@ $(libcutils_OBJS) - -clean: - $(RM) $(adb_OBJS) $(libcutils_OBJS) adb *.a diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk deleted file mode 100644 index 31452ae104..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk +++ /dev/null @@ -1,164 +0,0 @@ -# Makefile for adbd - -SRCDIR ?= $(S) - -VPATH += $(SRCDIR)/system/core/adb -adbd_SRC_FILES += adb.c -adbd_SRC_FILES += fdevent.c -adbd_SRC_FILES += transport.c -adbd_SRC_FILES += transport_local.c -adbd_SRC_FILES += transport_usb.c -adbd_SRC_FILES += adb_auth_client.c -adbd_SRC_FILES += sockets.c -adbd_SRC_FILES += services.c -adbd_SRC_FILES += file_sync_service.c -adbd_SRC_FILES += jdwp_service.c -adbd_SRC_FILES += framebuffer_service.c -adbd_SRC_FILES += remount_service.c -adbd_SRC_FILES += disable_verity_service.c -adbd_SRC_FILES += base64.c -adbd_SRC_FILES += usb_linux_client.c -adbd_OBJS := $(adbd_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/liblog -liblog_SRC_FILES += logd_write.c -liblog_SRC_FILES += log_event_write.c -liblog_SRC_FILES += logprint.c -liblog_SRC_FILES += event_tag_map.c -liblog_SRC_FILES += fake_log_device.c -liblog_OBJS := $(liblog_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/fs_mgr -fs_mgr_SRC_FILES += fs_mgr_fstab.c -fs_mgr_OBJS := $(fs_mgr_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libcutils -libcutils_SRC_FILES += atomic.c -libcutils_SRC_FILES += hashmap.c -libcutils_SRC_FILES += native_handle.c -libcutils_SRC_FILES += config_utils.c -libcutils_SRC_FILES += cpu_info.c -libcutils_SRC_FILES += load_file.c -# libcutils_SRC_FILES += open_memstream.c -# libcutils_SRC_FILES += strdup16to8.c -# libcutils_SRC_FILES += strdup8to16.c -# libcutils_SRC_FILES += record_stream.c -# libcutils_SRC_FILES += process_name.c -# libcutils_SRC_FILES += threads.c -# libcutils_SRC_FILES += sched_policy.c -# libcutils_SRC_FILES += iosched_policy.c -libcutils_SRC_FILES += str_parms.c -libcutils_SRC_FILES += fs.c -libcutils_SRC_FILES += multiuser.c -libcutils_SRC_FILES += socket_inaddr_any_server.c -libcutils_SRC_FILES += socket_local_client.c -libcutils_SRC_FILES += socket_local_server.c -libcutils_SRC_FILES += socket_loopback_client.c -libcutils_SRC_FILES += socket_loopback_server.c -libcutils_SRC_FILES += socket_network_client.c -libcutils_SRC_FILES += sockets.c -libcutils_SRC_FILES += ashmem-host.c -libcutils_SRC_FILES += dlmalloc_stubs.c -libcutils_SRC_FILES += klog.c -libcutils_SRC_FILES += properties.c -libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/external/libselinux/src -libselinux_SRC_FILES += booleans.c -libselinux_SRC_FILES += canonicalize_context.c -libselinux_SRC_FILES += disable.c -libselinux_SRC_FILES += enabled.c -libselinux_SRC_FILES += fgetfilecon.c -libselinux_SRC_FILES += fsetfilecon.c -libselinux_SRC_FILES += getenforce.c -libselinux_SRC_FILES += getfilecon.c -libselinux_SRC_FILES += getpeercon.c -libselinux_SRC_FILES += lgetfilecon.c -libselinux_SRC_FILES += load_policy.c -libselinux_SRC_FILES += lsetfilecon.c -libselinux_SRC_FILES += policyvers.c -libselinux_SRC_FILES += procattr.c -libselinux_SRC_FILES += setenforce.c -libselinux_SRC_FILES += setfilecon.c -libselinux_SRC_FILES += context.c -libselinux_SRC_FILES += mapping.c -libselinux_SRC_FILES += stringrep.c -libselinux_SRC_FILES += compute_create.c -libselinux_SRC_FILES += compute_av.c -libselinux_SRC_FILES += avc.c -libselinux_SRC_FILES += avc_internal.c -libselinux_SRC_FILES += avc_sidtab.c -libselinux_SRC_FILES += get_initial_context.c -libselinux_SRC_FILES += checkAccess.c -libselinux_SRC_FILES += sestatus.c -libselinux_SRC_FILES += deny_unknown.c - -libselinux_SRC_FILES += callbacks.c -libselinux_SRC_FILES += check_context.c -libselinux_SRC_FILES += freecon.c -libselinux_SRC_FILES += init.c -libselinux_SRC_FILES += label.c -libselinux_SRC_FILES += label_file.c -libselinux_SRC_FILES += label_android_property.c -libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/extras/ext4_utils -libext4_utils_SRC_FILES += make_ext4fs.c -libext4_utils_SRC_FILES += ext4fixup.c -libext4_utils_SRC_FILES += ext4_utils.c -libext4_utils_SRC_FILES += allocate.c -libext4_utils_SRC_FILES += contents.c -libext4_utils_SRC_FILES += extent.c -libext4_utils_SRC_FILES += indirect.c -libext4_utils_SRC_FILES += uuid.c -libext4_utils_SRC_FILES += sha1.c -libext4_utils_SRC_FILES += wipe.c -libext4_utils_SRC_FILES += crc16.c -libext4_utils_SRC_FILES += ext4_sb.c -libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) - -CFLAGS += -std=gnu11 -CFLAGS += -DANDROID -CFLAGS += -DADB_HOST=0 -CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -CFLAGS += -DALLOW_ADBD_ROOT=1 -CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 -CFLAGS += -DPROP_NAME_MAX=32 -CFLAGS += -DPROP_VALUE_MAX=92 -CFLAGS += -DAUDITD_LOG_TAG=1003 -# CFLAGS += -DHOST -CFLAGS += -DANDROID_SMP=0 -CFLAGS += -I$(SRCDIR)/system/core/adb -CFLAGS += -I$(SRCDIR)/system/core/include -CFLAGS += -I$(SRCDIR)/system/core/libsparse/include -CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils -CFLAGS += -I$(SRCDIR)/system/core/fs_mgr/include -CFLAGS += -I$(SRCDIR)/hardware/libhardware/include -CFLAGS += -I$(SRCDIR)/external/libselinux/include -CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h - -LIBS += liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a -lpthread -lbsd -lpcre -lresolv -lcrypto - -all: adbd - -adbd: liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a $(adbd_OBJS) - $(CC) -o $@ $(LDFLAGS) $(adbd_OBJS) $(LIBS) - -liblog.a: $(liblog_OBJS) - $(AR) rcs $@ $(liblog_OBJS) - -libfs_mgr.a: $(fs_mgr_OBJS) - $(AR) rcs $@ $(fs_mgr_OBJS) - -libcutils.a: $(libcutils_OBJS) - $(AR) rcs $@ $(libcutils_OBJS) - -libselinux.a: $(libselinux_OBJS) - export CFLAGS="-DANDROID -DHOST" - $(AR) rcs $@ $(libselinux_OBJS) - -libext4_utils.a: $(libext4_utils_OBJS) - $(AR) rcs $@ $(libext4_utils_OBJS) - -clean: - $(RM) *.o *.a adbd diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch deleted file mode 100644 index 7d20c50680..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7b7200727413ca4a9bb132221c543ec033dffafa Mon Sep 17 00:00:00 2001 -From: Sergio Schvezov <sergio.schvezov@canonical.com> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] adb: remove selinux extensions - -* drop useless includes of Android SELINUX extensions -* avoids having to clone another module -* this should be sent upstream - -Upstream-Status: Inappropriate - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - adb/file_sync_service.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c -index 7933858516..3cbd0cd863 100644 ---- a/adb/file_sync_service.c -+++ b/adb/file_sync_service.c -@@ -26,7 +26,6 @@ - - #include <errno.h> - #include <private/android_filesystem_config.h> --#include <selinux/android.h> - #include "sysdeps.h" - - #define TRACE_TAG TRACE_SYNC -@@ -73,7 +72,6 @@ static int mkdirs(char *name) - *x = '/'; - return ret; - } -- selinux_android_restorecon(name, 0); - } - *x++ = '/'; - } -@@ -251,7 +249,6 @@ static int handle_send_file(int s, char *path, uid_t uid, - if(fd >= 0) { - struct utimbuf u; - adb_close(fd); -- selinux_android_restorecon(path, 0); - u.actime = timestamp; - u.modtime = timestamp; - utime(path, &u); diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch deleted file mode 100644 index 3627110ad8..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d855f042ca09a358cebe2d3c1d29d512afd7ebb8 Mon Sep 17 00:00:00 2001 -From: Hilko Bengen <bengen@debian.org> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] adb: Use local sockets where appropriate - -Upstream-Status: Inappropriate ---- - adb/adb.c | 6 +++++- - adb/adb_client.c | 5 +++-- - adb/transport_local.c | 3 ++- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/adb/adb.c b/adb/adb.c -index 10a1e0da26..027edd9359 100644 ---- a/adb/adb.c -+++ b/adb/adb.c -@@ -1230,7 +1230,11 @@ int launch_server(int server_port) - */ - void build_local_name(char* target_str, size_t target_size, int server_port) - { -- snprintf(target_str, target_size, "tcp:%d", server_port); -+ if (gListenAll > 0) { -+ snprintf(target_str, target_size, "tcp:%d", server_port); -+ } else { -+ snprintf(target_str, target_size, "local:%d", server_port); -+ } - } - - #if !ADB_HOST -diff --git a/adb/adb_client.c b/adb/adb_client.c -index eb1720d22c..a383faefe3 100644 ---- a/adb/adb_client.c -+++ b/adb/adb_client.c -@@ -185,12 +185,12 @@ int _adb_connect(const char *service) - strcpy(__adb_error, "service name too long"); - return -1; - } -- snprintf(tmp, sizeof tmp, "%04x", len); -+ snprintf(tmp, sizeof tmp, "%d", __adb_server_port); - - if (__adb_server_name) - fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM); - else -- fd = socket_loopback_client(__adb_server_port, SOCK_STREAM); -+ fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); - - if(fd < 0) { - strcpy(__adb_error, "cannot connect to daemon"); -@@ -201,6 +201,7 @@ int _adb_connect(const char *service) - return -1; - } - -+ snprintf(tmp, sizeof tmp, "%04x", len); - if(writex(fd, tmp, 4) || writex(fd, service, len)) { - strcpy(__adb_error, "write failure during connection"); - adb_close(fd); -diff --git a/adb/transport_local.c b/adb/transport_local.c -index 948cc15812..71582a8c88 100644 ---- a/adb/transport_local.c -+++ b/adb/transport_local.c -@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int console_port, int adb_port) - } - #endif - if (fd < 0) { -- fd = socket_loopback_client(adb_port, SOCK_STREAM); -+ snprintf(buf, sizeof buf, "%d", adb_port); -+ fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); - } - - if (fd >= 0) { diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch deleted file mode 100644 index cf1d9cbc3d..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4421c2e19946dcd651fd8ac022b96627fc526149 Mon Sep 17 00:00:00 2001 -From: Fathi Boudra <fabo@debian.org> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] adb: define shell command - -we intend to run on Linux system so the shell is always /bin/sh, -for the host or the target. - -Upstream-Status: Inappropriate ---- - adb/services.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/adb/services.c b/adb/services.c -index 21b08dc201..d44b0c5068 100644 ---- a/adb/services.c -+++ b/adb/services.c -@@ -299,11 +299,7 @@ static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg - } - #endif /* !ABD_HOST */ - --#if ADB_HOST - #define SHELL_COMMAND "/bin/sh" --#else --#define SHELL_COMMAND "/system/bin/sh" --#endif - - #if !ADB_HOST - static void subproc_waiter_service(int fd, void *cookie) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch deleted file mode 100644 index 79e9d4d3b2..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 548b8ca62c64a16305929e2eaf3d546d48de9c25 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Tue, 21 Feb 2017 19:46:24 +0100 -Subject: [PATCH] adb: Fix build on big endian systems - -The usb_linux_client.c file defines cpu_to_le16/32 by using the C -library htole16/32 function calls. However, cpu_to_le16/32 are used -when initializing structures, i.e in a context where a function call -is not allowed. - -It works fine on little endian systems because htole16/32 are defined -by the C library as no-ops. But on big-endian systems, they are -actually doing something, which might involve calling a function, -causing build failures. - -To solve this, we simply open-code cpu_to_le16/32 in a way that allows -them to be used when initializing structures. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - adb/usb_linux_client.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c -index 8426e0ea14..6e8b5bbbd2 100644 ---- a/adb/usb_linux_client.c -+++ b/adb/usb_linux_client.c -@@ -34,8 +34,15 @@ - #define MAX_PACKET_SIZE_FS 64 - #define MAX_PACKET_SIZE_HS 512 - --#define cpu_to_le16(x) htole16(x) --#define cpu_to_le32(x) htole32(x) -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# define cpu_to_le16(x) (x) -+# define cpu_to_le32(x) (x) -+#else -+# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) -+# define cpu_to_le32(x) \ -+ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ -+ (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) -+#endif - - struct usb_handle - { diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch deleted file mode 100644 index fcd4ae2388..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch +++ /dev/null @@ -1,348 +0,0 @@ -From 753bcb5971401b82fb2e6197d31c9e386f6d0392 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Sep 2017 15:46:38 -0700 -Subject: [PATCH] adb: add base64 implementation - -musl needs it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - adb/adb_auth_client.c | 2 +- - adb/base64.c | 315 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 316 insertions(+), 1 deletion(-) - create mode 100644 adb/base64.c - -diff --git a/adb/adb_auth_client.c b/adb/adb_auth_client.c -index 55e9dcad19..104b413b8b 100644 ---- a/adb/adb_auth_client.c -+++ b/adb/adb_auth_client.c -@@ -75,7 +75,7 @@ static void read_keys(const char *file, struct listnode *list) - if (sep) - *sep = '\0'; - -- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4); -+ ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4); - if (ret != sizeof(key->key)) { - D("%s: Invalid base64 data ret=%d\n", file, ret); - free(key); -diff --git a/adb/base64.c b/adb/base64.c -new file mode 100644 -index 0000000000..95da284d0d ---- /dev/null -+++ b/adb/base64.c -@@ -0,0 +1,315 @@ -+/* -+ * Copyright (c) 1996-1999 by Internet Software Consortium. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ */ -+ -+/* -+ * Portions Copyright (c) 1995 by International Business Machines, Inc. -+ * -+ * International Business Machines, Inc. (hereinafter called IBM) grants -+ * permission under its copyrights to use, copy, modify, and distribute this -+ * Software with or without fee, provided that the above copyright notice and -+ * all paragraphs of this notice appear in all copies, and that the name of IBM -+ * not be used in connection with the marketing of any product incorporating -+ * the Software or modifications thereof, without specific, written prior -+ * permission. -+ * -+ * To the extent it has a right to do so, IBM grants an immunity from suit -+ * under its patents, if any, for the use, sale or manufacture of products to -+ * the extent that such products are used for performing Domain Name System -+ * dynamic updates in TCP/IP networks by means of the Software. No immunity is -+ * granted for any product per se or for any other function of any product. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, -+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN -+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. -+ */ -+ -+#if !defined(LINT) && !defined(CODECENTER) -+static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; -+#endif /* not lint */ -+ -+#include <sys/types.h> -+#include <sys/param.h> -+#include <sys/socket.h> -+ -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <arpa/nameser.h> -+ -+#include <ctype.h> -+#include <resolv.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <stdint.h> -+#include <string.h> -+ -+#define Assert(Cond) if (!(Cond)) abort() -+ -+static const char Base64[] = -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -+static const char Pad64 = '='; -+ -+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) -+ The following encoding technique is taken from RFC 1521 by Borenstein -+ and Freed. It is reproduced here in a slightly edited form for -+ convenience. -+ -+ A 65-character subset of US-ASCII is used, enabling 6 bits to be -+ represented per printable character. (The extra 65th character, "=", -+ is used to signify a special processing function.) -+ -+ The encoding process represents 24-bit groups of input bits as output -+ strings of 4 encoded characters. Proceeding from left to right, a -+ 24-bit input group is formed by concatenating 3 8-bit input groups. -+ These 24 bits are then treated as 4 concatenated 6-bit groups, each -+ of which is translated into a single digit in the base64 alphabet. -+ -+ Each 6-bit group is used as an index into an array of 64 printable -+ characters. The character referenced by the index is placed in the -+ output string. -+ -+ Table 1: The Base64 Alphabet -+ -+ Value Encoding Value Encoding Value Encoding Value Encoding -+ 0 A 17 R 34 i 51 z -+ 1 B 18 S 35 j 52 0 -+ 2 C 19 T 36 k 53 1 -+ 3 D 20 U 37 l 54 2 -+ 4 E 21 V 38 m 55 3 -+ 5 F 22 W 39 n 56 4 -+ 6 G 23 X 40 o 57 5 -+ 7 H 24 Y 41 p 58 6 -+ 8 I 25 Z 42 q 59 7 -+ 9 J 26 a 43 r 60 8 -+ 10 K 27 b 44 s 61 9 -+ 11 L 28 c 45 t 62 + -+ 12 M 29 d 46 u 63 / -+ 13 N 30 e 47 v -+ 14 O 31 f 48 w (pad) = -+ 15 P 32 g 49 x -+ 16 Q 33 h 50 y -+ -+ Special processing is performed if fewer than 24 bits are available -+ at the end of the data being encoded. A full encoding quantum is -+ always completed at the end of a quantity. When fewer than 24 input -+ bits are available in an input group, zero bits are added (on the -+ right) to form an integral number of 6-bit groups. Padding at the -+ end of the data is performed using the '=' character. -+ -+ Since all base64 input is an integral number of octets, only the -+ ------------------------------------------------- -+ following cases can arise: -+ -+ (1) the final quantum of encoding input is an integral -+ multiple of 24 bits; here, the final unit of encoded -+ output will be an integral multiple of 4 characters -+ with no "=" padding, -+ (2) the final quantum of encoding input is exactly 8 bits; -+ here, the final unit of encoded output will be two -+ characters followed by two "=" padding characters, or -+ (3) the final quantum of encoding input is exactly 16 bits; -+ here, the final unit of encoded output will be three -+ characters followed by one "=" padding character. -+ */ -+ -+int -+b64_ntop(const uint8_t* src, size_t srclength, char* target, size_t targsize) -+{ -+ size_t datalength = 0; -+ uint8_t input[3]; -+ uint8_t output[4]; -+ size_t i; -+ -+ while (2 < srclength) { -+ input[0] = *src++; -+ input[1] = *src++; -+ input[2] = *src++; -+ srclength -= 3; -+ -+ output[0] = input[0] >> 2; -+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); -+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); -+ output[3] = input[2] & 0x3f; -+ Assert(output[0] < 64); -+ Assert(output[1] < 64); -+ Assert(output[2] < 64); -+ Assert(output[3] < 64); -+ -+ if (datalength + 4 > targsize) -+ return (-1); -+ target[datalength++] = Base64[output[0]]; -+ target[datalength++] = Base64[output[1]]; -+ target[datalength++] = Base64[output[2]]; -+ target[datalength++] = Base64[output[3]]; -+ } -+ -+ /* Now we worry about padding. */ -+ if (0 != srclength) { -+ /* Get what's left. */ -+ input[0] = input[1] = input[2] = '\0'; -+ for (i = 0; i < srclength; i++) -+ input[i] = *src++; -+ -+ output[0] = input[0] >> 2; -+ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); -+ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); -+ Assert(output[0] < 64); -+ Assert(output[1] < 64); -+ Assert(output[2] < 64); -+ -+ if (datalength + 4 > targsize) -+ return (-1); -+ target[datalength++] = Base64[output[0]]; -+ target[datalength++] = Base64[output[1]]; -+ if (srclength == 1) -+ target[datalength++] = Pad64; -+ else -+ target[datalength++] = Base64[output[2]]; -+ target[datalength++] = Pad64; -+ } -+ if (datalength >= targsize) -+ return (-1); -+ target[datalength] = '\0'; /* Returned value doesn't count \0. */ -+ return (datalength); -+} -+ -+/* skips all whitespace anywhere. -+ converts characters, four at a time, starting at (or after) -+ src from base - 64 numbers into three 8 bit bytes in the target area. -+ it returns the number of data bytes stored at the target, or -1 on error. -+ */ -+ -+int b64_pton(const char* src, uint8_t* target, size_t targsize) -+{ -+ int tarindex, state, ch; -+ char *pos; -+ -+ state = 0; -+ tarindex = 0; -+ -+ while ((ch = *src++) != '\0') { -+ if (isspace(ch)) /* Skip whitespace anywhere. */ -+ continue; -+ -+ if (ch == Pad64) -+ break; -+ -+ pos = strchr(Base64, ch); -+ if (pos == 0) /* A non-base64 character. */ -+ return (-1); -+ -+ switch (state) { -+ case 0: -+ if (target) { -+ if ((size_t)tarindex >= targsize) -+ return (-1); -+ target[tarindex] = (pos - Base64) << 2; -+ } -+ state = 1; -+ break; -+ case 1: -+ if (target) { -+ if ((size_t)tarindex + 1 >= targsize) -+ return (-1); -+ target[tarindex] |= (pos - Base64) >> 4; -+ target[tarindex+1] = ((pos - Base64) & 0x0f) -+ << 4 ; -+ } -+ tarindex++; -+ state = 2; -+ break; -+ case 2: -+ if (target) { -+ if ((size_t)tarindex + 1 >= targsize) -+ return (-1); -+ target[tarindex] |= (pos - Base64) >> 2; -+ target[tarindex+1] = ((pos - Base64) & 0x03) -+ << 6; -+ } -+ tarindex++; -+ state = 3; -+ break; -+ case 3: -+ if (target) { -+ if ((size_t)tarindex >= targsize) -+ return (-1); -+ target[tarindex] |= (pos - Base64); -+ } -+ tarindex++; -+ state = 0; -+ break; -+ default: -+ abort(); -+ } -+ } -+ -+ /* -+ * We are done decoding Base-64 chars. Let's see if we ended -+ * on a byte boundary, and/or with erroneous trailing characters. -+ */ -+ -+ if (ch == Pad64) { /* We got a pad char. */ -+ ch = *src++; /* Skip it, get next. */ -+ switch (state) { -+ case 0: /* Invalid = in first position */ -+ case 1: /* Invalid = in second position */ -+ return (-1); -+ -+ case 2: /* Valid, means one byte of info */ -+ /* Skip any number of spaces. */ -+ for ((void)NULL; ch != '\0'; ch = *src++) -+ if (!isspace(ch)) -+ break; -+ /* Make sure there is another trailing = sign. */ -+ if (ch != Pad64) -+ return (-1); -+ ch = *src++; /* Skip the = */ -+ /* Fall through to "single trailing =" case. */ -+ /* FALLTHROUGH */ -+ -+ case 3: /* Valid, means two bytes of info */ -+ /* -+ * We know this char is an =. Is there anything but -+ * whitespace after it? -+ */ -+ for ((void)NULL; ch != '\0'; ch = *src++) -+ if (!isspace(ch)) -+ return (-1); -+ -+ /* -+ * Now make sure for cases 2 and 3 that the "extra" -+ * bits that slopped past the last full byte were -+ * zeros. If we don't check them, they become a -+ * subliminal channel. -+ */ -+ if (target && target[tarindex] != 0) -+ return (-1); -+ } -+ } else { -+ /* -+ * We ended by seeing the end of the string. Make sure we -+ * have no partial bytes lying around. -+ */ -+ if (state != 0) -+ return (-1); -+ } -+ -+ return (tarindex); -+} -+ diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch deleted file mode 100644 index b5d383f383..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 62d957a1271c88ec08d67984fbe31601f0bd41a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Sep 2017 15:50:57 -0700 -Subject: [PATCH] adb: Musl fixes - -__nonnull is gcc specific -include sys/types.h for size_t -Do not redefine close() and lseek() - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - adb/adb.h | 2 ++ - adb/disable_verity_service.c | 13 ++++++++----- - adb/framebuffer_service.c | 7 ++++--- - adb/sysdeps.h | 12 ++++++------ - 4 files changed, 20 insertions(+), 14 deletions(-) - -diff --git a/adb/adb.h b/adb/adb.h -index 44e5981bdc..bcdc49f63c 100644 ---- a/adb/adb.h -+++ b/adb/adb.h -@@ -18,7 +18,9 @@ - #define __ADB_H - - #include <limits.h> -+#include <sys/types.h> - -+#include "fdevent.h" - #include "adb_trace.h" - #include "transport.h" /* readx(), writex() */ - -diff --git a/adb/disable_verity_service.c b/adb/disable_verity_service.c -index ed3da52108..29fa3d65a9 100644 ---- a/adb/disable_verity_service.c -+++ b/adb/disable_verity_service.c -@@ -14,25 +14,28 @@ - * limitations under the License. - */ - --#include "sysdeps.h" - - #define TRACE_TAG TRACE_ADB - #include "adb.h" -+#include "sysdeps.h" -+#include "cutils/properties.h" -+#include "ext4_sb.h" -+#include <fs_mgr.h> - - #include <stdio.h> - #include <stdarg.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <inttypes.h> -+#include <unistd.h> -+#include <errno.h> -+#include <stdbool.h> - --#include "cutils/properties.h" --#include "ext4_sb.h" --#include <fs_mgr.h> - - #define FSTAB_PREFIX "/fstab." - struct fstab *fstab; - --__attribute__((__format__(printf, 2, 3))) __nonnull((2)) -+__attribute__((__format__(printf, 2, 3))) __attribute__((nonnull((2)))) - static void write_console(int fd, const char* format, ...) - { - char buffer[256]; -diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c -index 8cbe8403cc..8f0ccfb7aa 100644 ---- a/adb/framebuffer_service.c -+++ b/adb/framebuffer_service.c -@@ -14,6 +14,10 @@ - * limitations under the License. - */ - -+#include "fdevent.h" -+#include "adb.h" -+#include "sysdeps.h" -+ - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> -@@ -23,9 +27,6 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include "fdevent.h" --#include "adb.h" -- - #include <linux/fb.h> - #include <sys/ioctl.h> - #include <sys/mman.h> -diff --git a/adb/sysdeps.h b/adb/sysdeps.h -index cc1f839e9f..ea39ac39cc 100644 ---- a/adb/sysdeps.h -+++ b/adb/sysdeps.h -@@ -123,8 +123,8 @@ static __inline__ int unix_close(int fd) - { - return close(fd); - } --#undef close --#define close ____xxx_close -+//#undef close -+//#define close ____xxx_close - - static __inline__ int unix_read(int fd, void* buf, size_t len) - { -@@ -369,8 +369,8 @@ static __inline__ int adb_close(int fd) - { - return close(fd); - } --#undef close --#define close ____xxx_close -+//#undef close -+//#define close ____xxx_close - - - static __inline__ int adb_read(int fd, void* buf, size_t len) -@@ -392,8 +392,8 @@ static __inline__ int adb_lseek(int fd, int pos, int where) - { - return lseek(fd, pos, where); - } --#undef lseek --#define lseek ___xxx_lseek -+//#undef lseek -+//#define lseek ___xxx_lseek - - static __inline__ int adb_unlink(const char* path) - { diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch deleted file mode 100644 index e02a95687f..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch +++ /dev/null @@ -1,24 +0,0 @@ -From de393bba41c8feff932c77d6c30233945f380d42 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 11 Aug 2018 13:23:37 +0000 -Subject: [PATCH] adb: usb_linux.c: fix build with glibc-2.28 - -* include sysmacros for major, minor - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - adb/usb_linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/adb/usb_linux.c b/adb/usb_linux.c -index f16bdd0361..c8a7732441 100644 ---- a/adb/usb_linux.c -+++ b/adb/usb_linux.c -@@ -22,6 +22,7 @@ - #include <sys/ioctl.h> - #include <sys/types.h> - #include <sys/time.h> -+#include <sys/sysmacros.h> - #include <dirent.h> - #include <fcntl.h> - #include <errno.h> diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch deleted file mode 100644 index 7d223e05f1..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3a788e9168c9b9eac66c4fa479413f4a95c61be4 Mon Sep 17 00:00:00 2001 -From: Florent Revest <revestflo@gmail.com> -Date: Mon, 30 Oct 2017 21:05:46 +0100 -Subject: [PATCH] adb: Allow adbd to be ran as root - ---- - adb/adb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/adb/adb.c b/adb/adb.c -index 027edd9359..e0f7ecde45 100644 ---- a/adb/adb.c -+++ b/adb/adb.c -@@ -1271,6 +1271,7 @@ static int should_drop_privileges() { - int secure = 0; - char value[PROPERTY_VALUE_MAX]; - -+ return 0; - /* run adbd in secure mode if ro.secure is set and - ** we are not in the emulator - */ diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch deleted file mode 100644 index a4dc6e1e35..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch +++ /dev/null @@ -1,110 +0,0 @@ -From dd195778a9930b7967b21a3b8eb390b70253dbad Mon Sep 17 00:00:00 2001 -From: David Ng <dave@codeaurora.org> -Date: Fri, 27 Jul 2012 17:15:03 -0700 -Subject: [PATCH] mkbootimg: Add --dt parameter to specify DT image - -New optional --dt parameter to specify a kernel device -tree image. - -Upstream-Status: Inappropriate ---- - mkbootimg/bootimg.h | 7 +++++-- - mkbootimg/mkbootimg.c | 21 +++++++++++++++++++++ - 2 files changed, 26 insertions(+), 2 deletions(-) - -diff --git a/mkbootimg/bootimg.h b/mkbootimg/bootimg.h -index 9171d85a7b..308c537d6b 100644 ---- a/mkbootimg/bootimg.h -+++ b/mkbootimg/bootimg.h -@@ -41,8 +41,8 @@ struct boot_img_hdr - - unsigned tags_addr; /* physical addr for kernel tags */ - unsigned page_size; /* flash page size we assume */ -- unsigned unused[2]; /* future expansion: should be 0 */ -- -+ unsigned dt_size; /* device tree in bytes */ -+ unsigned unused; /* future expansion: should be 0 */ - unsigned char name[BOOT_NAME_SIZE]; /* asciiz product name */ - - unsigned char cmdline[BOOT_ARGS_SIZE]; -@@ -64,10 +64,13 @@ struct boot_img_hdr - ** +-----------------+ - ** | second stage | o pages - ** +-----------------+ -+** | device tree | p pages -+** +-----------------+ - ** - ** n = (kernel_size + page_size - 1) / page_size - ** m = (ramdisk_size + page_size - 1) / page_size - ** o = (second_size + page_size - 1) / page_size -+** p = (dt_size + page_size - 1) / page_size - ** - ** 0. all entities are page_size aligned in flash - ** 1. kernel and ramdisk are required (size != 0) -diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c -index fc92b4dc30..658052cdf2 100644 ---- a/mkbootimg/mkbootimg.c -+++ b/mkbootimg/mkbootimg.c -@@ -65,6 +65,7 @@ int usage(void) - " [ --board <boardname> ]\n" - " [ --base <address> ]\n" - " [ --pagesize <pagesize> ]\n" -+ " [ --dt <filename> ]\n" - " -o|--output <filename>\n" - ); - return 1; -@@ -105,6 +106,8 @@ int main(int argc, char **argv) - char *cmdline = ""; - char *bootimg = 0; - char *board = ""; -+ char *dt_fn = 0; -+ void *dt_data = 0; - unsigned pagesize = 2048; - int fd; - SHA_CTX ctx; -@@ -158,6 +161,8 @@ int main(int argc, char **argv) - fprintf(stderr,"error: unsupported page size %d\n", pagesize); - return -1; - } -+ } else if(!strcmp(arg, "--dt")) { -+ dt_fn = val; - } else { - return usage(); - } -@@ -232,6 +237,14 @@ int main(int argc, char **argv) - } - } - -+ if(dt_fn) { -+ dt_data = load_file(dt_fn, &hdr.dt_size); -+ if (dt_data == 0) { -+ fprintf(stderr,"error: could not load device tree image '%s'\n", dt_fn); -+ return 1; -+ } -+ } -+ - /* put a hash of the contents in the header so boot images can be - * differentiated based on their first 2k. - */ -@@ -242,6 +255,10 @@ int main(int argc, char **argv) - SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size)); - SHA_update(&ctx, second_data, hdr.second_size); - SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size)); -+ if(dt_data) { -+ SHA_update(&ctx, dt_data, hdr.dt_size); -+ SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size)); -+ } - sha = SHA_final(&ctx); - memcpy(hdr.id, sha, - SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE); -@@ -266,6 +283,10 @@ int main(int argc, char **argv) - if(write_padding(fd, pagesize, hdr.second_size)) goto fail; - } - -+ if(dt_data) { -+ if(write(fd, dt_data, hdr.dt_size) != (ssize_t) hdr.dt_size) goto fail; -+ if(write_padding(fd, pagesize, hdr.dt_size)) goto fail; -+ } - return 0; - - fail: diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch deleted file mode 100644 index 2c607ff67c..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ef743c9c3c7452ae904a5c343ee2b759ab3a87cb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@ubuntu.com> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] Use linux/capability.h on linux systems too - -Upstream-Status: Inappropriate ---- - include/private/android_filesystem_config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h -index 2f528b95c8..3e0b00928e 100644 ---- a/include/private/android_filesystem_config.h -+++ b/include/private/android_filesystem_config.h -@@ -27,7 +27,7 @@ - #include <sys/types.h> - #include <stdint.h> - --#ifdef HAVE_ANDROID_OS -+#if defined(HAVE_ANDROID_OS) || defined(__linux__) - #include <linux/capability.h> - #else - #include "android_filesystem_capability.h" diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch deleted file mode 100644 index 5b18f461a3..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9eff8799831961c0edf6e37e5d4cbf43baa7c748 Mon Sep 17 00:00:00 2001 -From: Fathi Boudra <fabo@debian.org> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] Remove bionic specific calls - -Upstream-Status: Inappropriate ---- - include/cutils/properties.h | 1 - - libcutils/properties.c | 2 +- - liblog/logd_write.c | 5 +++++ - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/cutils/properties.h b/include/cutils/properties.h -index 798db8b36f..7d01f28d6e 100644 ---- a/include/cutils/properties.h -+++ b/include/cutils/properties.h -@@ -19,7 +19,6 @@ - - #include <sys/cdefs.h> - #include <stddef.h> --#include <sys/system_properties.h> - #include <stdint.h> - - #ifdef __cplusplus -diff --git a/libcutils/properties.c b/libcutils/properties.c -index b283658aa4..4151e7882c 100644 ---- a/libcutils/properties.c -+++ b/libcutils/properties.c -@@ -104,10 +104,10 @@ int32_t property_get_int32(const char *key, int32_t default_value) { - return (int32_t)property_get_imax(key, INT32_MIN, INT32_MAX, default_value); - } - -+#undef HAVE_LIBC_SYSTEM_PROPERTIES - #ifdef HAVE_LIBC_SYSTEM_PROPERTIES - - #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ --#include <sys/_system_properties.h> - - int property_set(const char *key, const char *value) - { -diff --git a/liblog/logd_write.c b/liblog/logd_write.c -index b2668cedb7..f5a44fe901 100644 ---- a/liblog/logd_write.c -+++ b/liblog/logd_write.c -@@ -23,6 +23,7 @@ - #include <stdlib.h> - #include <string.h> - #include <sys/stat.h> -+#include <sys/syscall.h> - #include <sys/types.h> - #if (FAKE_LOG_DEVICE == 0) - #include <sys/socket.h> -@@ -205,7 +206,11 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr) - realtime_ts.tv_nsec = ts.tv_nsec; - - log_id_buf = log_id; -+#ifdef __BIONIC__ - tid = gettid(); -+#else -+ tid = (pid_t) syscall(__NR_gettid); -+#endif - - newVec[0].iov_base = (unsigned char *) &log_id_buf; - newVec[0].iov_len = sizeof_log_id_t; diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch deleted file mode 100644 index b0feb65921..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cd4525d760c6f88c9bf85f7bf488da79cd0d3264 Mon Sep 17 00:00:00 2001 -From: Fathi Boudra <fabo@debian.org> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] Fix implicit declaration of stlcat/strlcopy functions - -Upstream-Status: Inappropriate ---- - adb/adb.c | 1 + - fs_mgr/fs_mgr_fstab.c | 2 +- - include/cutils/sockets.h | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/adb/adb.c b/adb/adb.c -index e0f7ecde45..aaefd9b401 100644 ---- a/adb/adb.c -+++ b/adb/adb.c -@@ -41,6 +41,7 @@ - #include <sys/prctl.h> - #include <getopt.h> - #include <selinux/selinux.h> -+#include <grp.h> - #else - #include "usb_vendors.h" - #endif -diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c -index edd9591164..9ddb4643b5 100644 ---- a/fs_mgr/fs_mgr_fstab.c -+++ b/fs_mgr/fs_mgr_fstab.c -@@ -17,7 +17,7 @@ - #include <ctype.h> - #include <stdio.h> - #include <stdlib.h> --#include <string.h> -+#include <bsd/string.h> - #include <sys/mount.h> - - #include "fs_mgr_priv.h" -diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h -index daf43ec944..d3270c69e7 100644 ---- a/include/cutils/sockets.h -+++ b/include/cutils/sockets.h -@@ -19,7 +19,7 @@ - - #include <errno.h> - #include <stdlib.h> --#include <string.h> -+#include <bsd/string.h> - #include <stdbool.h> - - #ifdef HAVE_WINSOCK diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff new file mode 100644 index 0000000000..3ead649b1d --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff @@ -0,0 +1,39 @@ +Description: adb: Make compatible with openssl 1.1 + OpenSSL version 1.1 brought some API changes which broke the build here, + fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. +Author: Chirayu Desai <chirayudesai1@gmail.com +Last-Update: 2016-11-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + system/core/adb/adb_auth_host.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/adb/adb_auth_host.c ++++ b/adb/adb_auth_host.c +@@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + BIGNUM* rem = BN_new(); + BIGNUM* n = BN_new(); + BIGNUM* n0inv = BN_new(); ++ BIGNUM* e = BN_new(); + + if (RSA_size(rsa) != RSANUMBYTES) { + ret = 0; +@@ -82,7 +83,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + } + + BN_set_bit(r32, 32); +- BN_copy(n, rsa->n); ++ RSA_get0_key(rsa, &n, &e, NULL); + BN_set_bit(r, RSANUMWORDS * 32); + BN_mod_sqr(rr, r, n, ctx); + BN_div(NULL, rem, n, r32, ctx); +@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + BN_div(n, rem, n, r32, ctx); + pkey->n[i] = BN_get_word(rem); + } +- pkey->exponent = BN_get_word(rsa->e); ++ pkey->exponent = BN_get_word(e); + + out: + BN_free(n0inv); diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk b/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk deleted file mode 100644 index c18aa9c4d2..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk +++ /dev/null @@ -1,103 +0,0 @@ -# Makefile for ext4_utils - -SRCDIR ?= $(S) - -VPATH += $(SRCDIR)/system/extras/ext4_utils -make_ext4fs_SRC_FILES += make_ext4fs_main.c -make_ext4fs_SRC_FILES += canned_fs_config.c -make_ext4fs_OBJS := $(make_ext4fs_SRC_FILES:.c=.o) - -ext2simg_SRC_FILES += ext2simg.c -ext2simg_OBJS := $(ext2simg_SRC_FILES:.c=.o) - -ext4fixup_SRC_FILES += ext4fixup_main.c -ext4fixup_OBJS := $(ext4fixup_SRC_FILES:.c=.o) - -libext4_utils_SRC_FILES += make_ext4fs.c -libext4_utils_SRC_FILES += ext4fixup.c -libext4_utils_SRC_FILES += ext4_utils.c -libext4_utils_SRC_FILES += allocate.c -libext4_utils_SRC_FILES += contents.c -libext4_utils_SRC_FILES += extent.c -libext4_utils_SRC_FILES += indirect.c -libext4_utils_SRC_FILES += uuid.c -libext4_utils_SRC_FILES += sha1.c -libext4_utils_SRC_FILES += wipe.c -libext4_utils_SRC_FILES += crc16.c -libext4_utils_SRC_FILES += ext4_sb.c -libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libsparse -simg2img_SRC_FILES += simg2img.c -simg2img_SRC_FILES += sparse_crc32.c -simg2img_OBJS := $(simg2img_SRC_FILES:.c=.o) - -img2simg_SRC_FILES += img2simg.c -img2simg_OBJS := $(img2simg_SRC_FILES:.c=.o) - -simg2simg_SRC_FILES += simg2simg.c -simg2simg_SRC_FILES += sparse_crc32.c -simg2simg_OBJS := $(simg2simg_SRC_FILES:.c=.o) - -libsparse_SRC_FILES += backed_block.c -libsparse_SRC_FILES += output_file.c -libsparse_SRC_FILES += sparse.c -libsparse_SRC_FILES += sparse_crc32.c -libsparse_SRC_FILES += sparse_err.c -libsparse_SRC_FILES += sparse_read.c -libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/external/libselinux/src -libselinux_SRC_FILES += callbacks.c -libselinux_SRC_FILES += check_context.c -libselinux_SRC_FILES += freecon.c -libselinux_SRC_FILES += init.c -libselinux_SRC_FILES += label.c -libselinux_SRC_FILES += label_file.c -libselinux_SRC_FILES += label_android_property.c -libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) - -CFLAGS += -DANDROID -CFLAGS += -DHOST -CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils -CFLAGS += -I$(SRCDIR)/system/core/include -CFLAGS += -I$(SRCDIR)/system/core/libsparse/include -CFLAGS += -I$(SRCDIR)/external/libselinux/include -CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h - -all: make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg - -make_ext4fs: libext4_utils.a libsparse.a libselinux.a $(make_ext4fs_OBJS) - $(CC) -o $@ $(LDFLAGS) $(make_ext4fs_OBJS) \ - libext4_utils.a libsparse.a libselinux.a -lz -lpcre - -ext2simg: libext4_utils.a libselinux.a libsparse.a $(ext2simg_OBJS) - $(CC) -o $@ $(LDFLAGS) $(ext2simg_OBJS) \ - libext4_utils.a libselinux.a libsparse.a -lz -lpcre - -ext4fixup: libext4_utils.a libsparse.a $(ext4fixup_OBJS) - $(CC) -o $@ $(LDFLAGS) $(ext4fixup_OBJS) libext4_utils.a libsparse.a -lz - -simg2img: libsparse.a $(simg2img_OBJS) - $(CC) -o $@ $(LDFLAGS) $(simg2img_OBJS) libsparse.a -lz - -img2simg: libsparse.a $(img2simg_OBJS) - $(CC) -o $@ $(LDFLAGS) $(img2simg_OBJS) libsparse.a -lz - -simg2simg: libsparse.a $(simg2simg_OBJS) - $(CC) -o $@ $(LDFLAGS) $(simg2simg_OBJS) libsparse.a -lz - -libext4_utils.a: $(libext4_utils_OBJS) - $(AR) rcs $@ $(libext4_utils_OBJS) - -libsparse.a: $(libsparse_OBJS) - $(AR) rcs $@ $(libsparse_OBJS) - -libselinux.a: $(libselinux_OBJS) - $(AR) rcs $@ $(libselinux_OBJS) - -clean: - $(RM) $(make_ext4fs_OBJS) $(ext2simg_OBJS) $(ext4fixup_OBJS) \ - $(simg2img_OBJS) $(img2simg_OBJS) $(simg2simg_OBJS) \ - $(libext4_utils_OBJS) $(libsparse_OBJS) $(libselinux_OBJS) \ - make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg *.a diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch deleted file mode 100644 index 4a19a5d65a..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 354604da9d152f1931e91991d3f34197fc8fc759 Mon Sep 17 00:00:00 2001 -From: Sergio Schvezov <sergio.schvezov@canonical.com> -Date: Tue, 2 Oct 2018 16:36:54 +0000 -Subject: [PATCH] ext4_utils: remove selinux extensions - -* drop useless includes of Android SELINUX extensions -* avoids having to clone another module -* this should be sent upstream - -Upstream-Status: Inappropriate ---- - ext4_utils/make_ext4fs.c | 1 - - ext4_utils/make_ext4fs_main.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c -index 2f89ae8a0..732afbed7 100644 ---- a/ext4_utils/make_ext4fs.c -+++ b/ext4_utils/make_ext4fs.c -@@ -62,7 +62,6 @@ - - #include <selinux/selinux.h> - #include <selinux/label.h> --#include <selinux/android.h> - - #define O_BINARY 0 - -diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c -index a6c5f6160..f8e7b9da9 100644 ---- a/ext4_utils/make_ext4fs_main.c -+++ b/ext4_utils/make_ext4fs_main.c -@@ -32,7 +32,6 @@ - #ifndef USE_MINGW - #include <selinux/selinux.h> - #include <selinux/label.h> --#include <selinux/android.h> - #else - struct selabel_handle; - #endif diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch deleted file mode 100644 index 3b50ffbf36..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b9254539811ce912bfd16dd1d185eba7a10cceff Mon Sep 17 00:00:00 2001 -From: Markus Mayer <mmayer@mmayer.net> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] ext4_utils: add -o argument to preserve ownership - -See also https://android-review.googlesource.com/#/c/100312/ - -Upstream-Status: Inappropriate ---- - ext4_utils/make_ext4fs.c | 6 ++++++ - ext4_utils/make_ext4fs_main.c | 10 ++++++++-- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c -index 732afbed7..2cbf04399 100644 ---- a/ext4_utils/make_ext4fs.c -+++ b/ext4_utils/make_ext4fs.c -@@ -67,6 +67,8 @@ - - #endif - -+int preserve_owner = 0; -+ - /* TODO: Not implemented: - Allocating blocks in the same block group as the file inode - Hash or binary tree directories -@@ -185,6 +187,10 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path - } else { - dentries[i].mtime = fixed_time; - } -+ if (preserve_owner) { -+ dentries[i].uid = stat.st_uid; -+ dentries[i].gid = stat.st_gid; -+ } - uint64_t capabilities; - if (fs_config_func != NULL) { - #ifdef ANDROID -diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c -index f8e7b9da9..e82d43277 100644 ---- a/ext4_utils/make_ext4fs_main.c -+++ b/ext4_utils/make_ext4fs_main.c -@@ -47,13 +47,15 @@ struct selabel_handle; - extern struct fs_info info; - - -+extern int preserve_owner; -+ - static void usage(char *path) - { - fprintf(stderr, "%s [ -l <len> ] [ -j <journal size> ] [ -b <block_size> ]\n", basename(path)); - fprintf(stderr, " [ -g <blocks per group> ] [ -i <inodes> ] [ -I <inode size> ]\n"); - fprintf(stderr, " [ -L <label> ] [ -f ] [ -a <android mountpoint> ]\n"); - fprintf(stderr, " [ -S file_contexts ] [ -C fs_config ] [ -T timestamp ]\n"); -- fprintf(stderr, " [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -v ] [ -B <block_list_file> ]\n"); -+ fprintf(stderr, " [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -o ] [ -v ] [ -B <block_list_file> ]\n"); - fprintf(stderr, " <filename> [<directory>]\n"); - } - -@@ -79,7 +81,7 @@ int main(int argc, char **argv) - struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } }; - #endif - -- while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctv")) != -1) { -+ while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctov")) != -1) { - switch (opt) { - case 'l': - info.len = parse_num(optarg); -@@ -142,6 +144,10 @@ int main(int argc, char **argv) - } - #endif - break; -+ case 'o': -+ preserve_owner = 1; -+ printf("Warning: Enabling 'preserve ownership', this is an unofficial feature!\n"); -+ break; - case 'v': - verbose = 1; - break; diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk b/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk deleted file mode 100644 index b9ba95f38a..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk +++ /dev/null @@ -1,89 +0,0 @@ -# Makefile for fastboot - -SRCDIR ?= $(S) - -VPATH += $(SRCDIR)/system/core/fastboot -fastboot_SRC_FILES += protocol.c -fastboot_SRC_FILES += engine.c -fastboot_SRC_FILES += bootimg.c -fastboot_SRC_FILES += fastboot.c -fastboot_SRC_FILES += util.c -fastboot_SRC_FILES += fs.c -fastboot_SRC_FILES += usb_linux.c -fastboot_SRC_FILES += util_linux.c -fastboot_OBJS := $(fastboot_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libzipfile -libzipfile_SRC_FILES += centraldir.c -libzipfile_SRC_FILES += zipfile.c -libzipfile_OBJS := $(libzipfile_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/extras/ext4_utils -libext4_utils_SRC_FILES += make_ext4fs.c -libext4_utils_SRC_FILES += ext4fixup.c -libext4_utils_SRC_FILES += ext4_utils.c -libext4_utils_SRC_FILES += allocate.c -libext4_utils_SRC_FILES += contents.c -libext4_utils_SRC_FILES += extent.c -libext4_utils_SRC_FILES += indirect.c -libext4_utils_SRC_FILES += uuid.c -libext4_utils_SRC_FILES += sha1.c -libext4_utils_SRC_FILES += wipe.c -libext4_utils_SRC_FILES += crc16.c -libext4_utils_SRC_FILES += ext4_sb.c -libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libsparse -libsparse_SRC_FILES += backed_block.c -libsparse_SRC_FILES += output_file.c -libsparse_SRC_FILES += sparse.c -libsparse_SRC_FILES += sparse_crc32.c -libsparse_SRC_FILES += sparse_err.c -libsparse_SRC_FILES += sparse_read.c -libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/external/libselinux/src -libselinux_SRC_FILES += callbacks.c -libselinux_SRC_FILES += check_context.c -libselinux_SRC_FILES += freecon.c -libselinux_SRC_FILES += init.c -libselinux_SRC_FILES += label.c -libselinux_SRC_FILES += label_file.c -libselinux_SRC_FILES += label_android_property.c -libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) - -CFLAGS += -std=gnu11 -CFLAGS += -DANDROID -# CFLAGS += -DUSE_F2FS -CFLAGS += -DHOST -CFLAGS += -I$(SRCDIR)/system/core/fastboot -CFLAGS += -I$(SRCDIR)/system/core/include -CFLAGS += -I$(SRCDIR)/system/core/mkbootimg -CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils -CFLAGS += -I$(SRCDIR)/system/extras/f2fs_utils -CFLAGS += -I$(SRCDIR)/system/core/libsparse/include -CFLAGS += -I$(SRCDIR)/external/libselinux/include -CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h - -LIBS += libzipfile.a libext4_utils.a libsparse.a libselinux.a -lz -lpcre - -all: fastboot - -fastboot: libzipfile.a libext4_utils.a libsparse.a libselinux.a $(fastboot_OBJS) - $(CC) -o $@ $(LDFLAGS) $(fastboot_OBJS) $(LIBS) - -libzipfile.a: $(libzipfile_OBJS) - $(AR) rcs $@ $(libzipfile_OBJS) - -libext4_utils.a: $(libext4_utils_OBJS) - $(AR) rcs $@ $(libext4_utils_OBJS) - -libsparse.a: $(libsparse_OBJS) - $(AR) rcs $@ $(libsparse_OBJS) - -libselinux.a: $(libselinux_OBJS) - $(AR) rcs $@ $(libselinux_OBJS) - -clean: - $(RM) $(fastboot_OBJS) $(libzipfile_OBJS) $(libext4_utils_OBJS) \ - $(libsparse_OBJS) $(libselinux_OBJS) fastboot *.a diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_core.patch b/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_core.patch new file mode 100644 index 0000000000..7b163633de --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_core.patch @@ -0,0 +1,118 @@ +diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp +index 46c3f58ec5..a0c36f0151 100644 +--- a/adb/client/usb_libusb.cpp ++++ b/adb/client/usb_libusb.cpp +@@ -22,6 +22,7 @@ + #include <stdlib.h> + + #include <atomic> ++#include <condition_variable> + #include <chrono> + #include <condition_variable> + #include <memory> +@@ -30,7 +31,7 @@ + #include <thread> + #include <unordered_map> + +-#include <libusb/libusb.h> ++#include <libusb-1.0/libusb.h> + + #include <android-base/file.h> + #include <android-base/logging.h> +diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp +index 1f376a4c93..f1d6779159 100644 +--- a/adb/client/usb_linux.cpp ++++ b/adb/client/usb_linux.cpp +@@ -29,6 +29,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #include <sys/time.h> + #include <sys/types.h> + #include <unistd.h> +diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp +index ecd1fd24ec..86166c0e2c 100644 +--- a/adb/sysdeps/posix/network.cpp ++++ b/adb/sysdeps/posix/network.cpp +@@ -21,6 +21,7 @@ + #include <sys/socket.h> + + #include <string> ++#include <string.h> + + #include "adb_unique_fd.h" + +diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp +index 296995efe2..48269b6750 100644 +--- a/base/errors_unix.cpp ++++ b/base/errors_unix.cpp +@@ -17,6 +17,7 @@ + #include "android-base/errors.h" + + #include <errno.h> ++#include <string.h> + + namespace android { + namespace base { +diff --git a/base/file.cpp b/base/file.cpp +index 2f697a1cc1..81aef5758c 100644 +--- a/base/file.cpp ++++ b/base/file.cpp +@@ -22,6 +22,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <string.h> + + #include <memory> + #include <mutex> +diff --git a/base/logging.cpp b/base/logging.cpp +index a31feefab2..d746cc4d78 100644 +--- a/base/logging.cpp ++++ b/base/logging.cpp +@@ -23,6 +23,7 @@ + #include <fcntl.h> + #include <libgen.h> + #include <time.h> ++#include <string.h> + + // For getprogname(3) or program_invocation_short_name. + #if defined(__ANDROID__) || defined(__APPLE__) +diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp +index c30ca1e4b3..fdc042ff36 100644 +--- a/fastboot/fs.cpp ++++ b/fastboot/fs.cpp +@@ -117,7 +117,7 @@ static int generate_ext4_image(const char* fileName, long long partSize, + static constexpr int block_size = 4096; + const std::string exec_dir = android::base::GetExecutableDirectory(); + +- const std::string mke2fs_path = exec_dir + "/mke2fs"; ++ const std::string mke2fs_path = exec_dir + "/mke2fs.android"; + std::vector<const char*> mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"}; + + std::string block_size_str = std::to_string(block_size); +diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp +index 4379635270..ccb565bb63 100644 +--- a/libsparse/sparse_read.cpp ++++ b/libsparse/sparse_read.cpp +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <string.h> + #include <string> ++#include <string.h> + #include <unistd.h> + + #include <sparse/sparse.h> +diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc +index 5e5e7afd18..ebbc819a7a 100644 +--- a/libziparchive/zip_archive.cc ++++ b/libziparchive/zip_archive.cc +@@ -29,6 +29,7 @@ + #include <string.h> + #include <time.h> + #include <unistd.h> ++#include <string_view> + + #include <memory> + #include <vector> diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_e2fsprogs.patch b/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_e2fsprogs.patch new file mode 100644 index 0000000000..b9fdb5eafe --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_e2fsprogs.patch @@ -0,0 +1,83 @@ +diff --git a/contrib/android/perms.c b/contrib/android/perms.c +index d83ad35a..dca5b620 100644 +--- a/contrib/android/perms.c ++++ b/contrib/android/perms.c +@@ -5,6 +5,7 @@ + #include "support/nls-enable.h" + #include <time.h> + #include <sys/stat.h> ++#include "private/android_filesystem_capability.h" + + #ifndef XATTR_SELINUX_SUFFIX + # define XATTR_SELINUX_SUFFIX "selinux" +diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h +index 505b3c9c..7be5105f 100644 +--- a/lib/ext2fs/bitops.h ++++ b/lib/ext2fs/bitops.h +@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_generic_bmap(ext2fs_generic_bitmap bitmap + #if (__STDC_VERSION__ >= 199901L) + #define _INLINE_ extern inline + #else +-#define _INLINE_ inline ++#define _INLINE_ static inline + #endif + #else /* !INCLUDE_INLINE FUNCS */ + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else /* not C99 */ + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ +diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h +index 470e7d7a..95a41e0d 100644 +--- a/lib/ext2fs/ext2fs.h ++++ b/lib/ext2fs/ext2fs.h +@@ -1743,7 +1743,7 @@ extern const struct ext2_inode *ext2fs_const_inode(const struct ext2_inode_large + #define _INLINE_ extern + #else + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ +diff --git a/misc/create_inode.c b/misc/create_inode.c +index 1373b46b..e6f34bd9 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -403,7 +403,7 @@ static ssize_t my_pread(int fd, void *buf, size_t count, off_t offset) + } + #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */ + +-static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, ++static errcode_t e2_copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, + off_t start, off_t end, char *buf, + char *zerobuf) + { +@@ -477,7 +477,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, + + data_blk = data & ~(fs->blocksize - 1); + hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); +- err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, ++ err = e2_copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, + zerobuf); + if (err) + return err; +@@ -527,7 +527,7 @@ static errcode_t try_fiemap_copy(ext2_filsys fs, int fd, ext2_file_t e2_file, + } + for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents; + i++, ext++) { +- err = copy_file_range(fs, fd, e2_file, ext->fe_logical, ++ err = e2_copy_file_range(fs, fd, e2_file, ext->fe_logical, + ext->fe_logical + ext->fe_length, + buf, zerobuf); + if (err) +@@ -580,7 +580,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf, + goto out; + #endif + +- err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, ++ err = e2_copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, + zerobuf); + out: + ext2fs_free_mem(&zerobuf); diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_selinux.patch b/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_selinux.patch new file mode 100644 index 0000000000..429f87ce57 --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/fix_build_selinux.patch @@ -0,0 +1,26 @@ +diff --git a/libsepol/src/private.h b/libsepol/src/private.h +index b884c23b..447fa64b 100644 +--- a/libsepol/src/private.h ++++ b/libsepol/src/private.h +@@ -14,7 +14,7 @@ + #endif + + #include <errno.h> +-#include <dso.h> ++#include "dso.h" + + #ifdef __APPLE__ + #define __BYTE_ORDER BYTE_ORDER +diff --git a/libsepol/src/util.c b/libsepol/src/util.c +index b00251c6..68e7c6a0 100644 +--- a/libsepol/src/util.c ++++ b/libsepol/src/util.c +@@ -27,7 +27,7 @@ + #include <sepol/policydb/flask_types.h> + #include <sepol/policydb/policydb.h> + #include <sepol/policydb/util.h> +-#include <dso.h> ++#include "dso.h" + + struct val_to_name { + unsigned int val; diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/generate_build.rb b/meta-oe/recipes-devtools/android-tools/android-tools/generate_build.rb new file mode 100644 index 0000000000..91f42fec0b --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/generate_build.rb @@ -0,0 +1,398 @@ +#!/usr/bin/ruby + +# Android build system is complicated and does not allow to build +# separate parts easily. +# This script tries to mimic Android build rules. + +def expand(dir, files) + files.map { |f| File.join(dir, f) } +end + +# Compiles sources to *.o files. +# Returns array of output *.o filenames +def compile(sources, cflags) + outputs = [] + for s in sources + ext = File.extname(s) + + case ext + when ".c" + cc = "cc" + lang_flags = "-std=gnu11 $CFLAGS $CPPFLAGS" + when ".cpp", ".cc" + cc = "cxx" + lang_flags = "-std=gnu++17 $CXXFLAGS $CPPFLAGS" + else + raise "Unknown extension #{ext}" + end + + output = s + ".o" + outputs << output + puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}" + end + + return outputs +end + +# dir - directory where ninja file is located +# lib - static library path relative to dir +def subninja(dir, lib) + puts "subninja #{dir}build.ninja" + return lib.each { |l| dir + l } +end + +# Links object files +def link(output, objects, ldflags) + puts "build #{output}: link #{objects.join(" ")}\n ldflags = #{ldflags} $LDFLAGS" +end + +puts "# This set of commands generated by generate_build.rb script\n\n" +puts "CC = #{ENV["CC"] || "clang"}" +puts "CXX = #{ENV["CXX"] || "clang++"}\n\n" +puts "CFLAGS = #{ENV["CFLAGS"]}" +puts "CXXFLAGS = #{ENV["CXXFLAGS"]}" +puts "LDFLAGS = #{ENV["LDFLAGS"]}" +puts "PKGVER = #{ENV["PKGVER"]}\n\n" + +puts "" " +rule cc + command = $CC $cflags -c $in -o $out + +rule cxx + command = $CXX $cflags -c $in -o $out + +rule link + command = $CXX $ldflags $LDFLAGS $in -o $out + + +" "" + +adbdfiles = %w( + adb.cpp + adb_io.cpp + adb_listeners.cpp + adb_trace.cpp + adb_utils.cpp + bugreport.cpp + line_printer.cpp + sockets.cpp + transport.cpp + transport_local.cpp + transport_usb.cpp + transport_mdns_unsupported.cpp + fdevent.cpp + adb_auth_host.cpp + shell_service_protocol.cpp +) +libadbd = compile(expand("core/adb", adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include') + +adbfiles = %w( + console.cpp + socket_spec.cpp + commandline.cpp + adb_client.cpp + services.cpp + file_sync_client.cpp + sysdeps_unix.cpp + sysdeps/errno.cpp + client/main.cpp + client/usb_dispatch.cpp + client/usb_linux.cpp + client/usb_libusb.cpp + sysdeps/posix/network.cpp +) +libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb") + +basefiles = %w( + file.cpp + logging.cpp + parsenetaddress.cpp + stringprintf.cpp + strings.cpp + errors_unix.cpp + test_utils.cpp +) +libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include") + +logfiles = %w( + log_event_write.c + fake_log_device.c + log_event_list.c + logger_write.c + config_write.c + config_read.c + logger_lock.c + local_logger.c + fake_writer.c + logger_name.c + stderr_write.c + logprint.c +) +liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include") + +cutilsfiles = %w( + load_file.cpp + socket_local_client_unix.cpp + socket_network_client_unix.cpp + socket_local_server_unix.cpp + sockets_unix.cpp + socket_inaddr_any_server_unix.cpp + sockets.cpp + android_get_control_file.cpp + threads.cpp + fs_config.cpp + canned_fs_config.cpp +) +libcutils = compile(expand("core/libcutils", cutilsfiles), "-D_GNU_SOURCE -Icore/libcutils/include -Icore/include") + +diagnoseusbfiles = %w( + diagnose_usb.cpp +) +libdiagnoseusb = compile(expand("core/adb", diagnoseusbfiles), "-Icore/include -Icore/base/include") + +libcryptofiles = %w( + android_pubkey.c +) +libcrypto = compile(expand("core/libcrypto_utils", libcryptofiles), "-Icore/libcrypto_utils/include -Iboringssl/include") + +# TODO: make subninja working +#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a']) +boringssl = ["boringssl/build/crypto/libcrypto.a"] + +link("adb", libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, "-lpthread -lusb-1.0") + +fastbootfiles = %w( + protocol.cpp + engine.cpp + bootimg_utils.cpp + fastboot.cpp + util.cpp + fs.cpp + usb_linux.cpp + socket.cpp + tcp.cpp + udp.cpp +) +libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg') + +sparsefiles = %w( + backed_block.c + output_file.c + sparse.c + sparse_crc32.c + sparse_err.c + sparse_read.cpp +) +libsparse = compile(expand("core/libsparse", sparsefiles), "-Icore/libsparse/include -Icore/base/include") + +f2fsfiles = %w( +) +f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include") + +zipfiles = %w( + zip_archive.cc +) +libzip = compile(expand("core/libziparchive", zipfiles), "-Icore/base/include -Icore/include -Icore/libziparchive/include") + +utilfiles = %w( + FileMap.cpp +) +libutil = compile(expand("core/libutils", utilfiles), "-Icore/include") + +ext4files = %w( + ext4_utils.c + wipe.c + ext4_sb.c +) +libext4 = compile(expand("extras/ext4_utils", ext4files), "-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include") + +selinuxfiles = %w( + callbacks.c + check_context.c + freecon.c + init.c + label.c + label_file.c + label_support.c + setrans_client.c + regex.c + matchpathcon.c + selinux_config.c + label_backends_android.c + canonicalize_context.c + lsetfilecon.c + policyvers.c + lgetfilecon.c + load_policy.c + seusers.c + sha1.c + booleans.c + disable.c + enabled.c + getenforce.c + setenforce.c +) +libselinux = compile(expand("selinux/libselinux/src", selinuxfiles), "-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include") + +libsepolfiles = %w( + policydb_public.c + genbools.c + debug.c + policydb.c + conditional.c + services.c + ebitmap.c + util.c + assertion.c + avtab.c + hashtab.c + sidtab.c + context.c + genusers.c + context_record.c + mls.c + avrule_block.c + symtab.c + policydb_convert.c + write.c + constraint.c + expand.c + hierarchy.c +) +libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include") + +link("fastboot", libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, "-lz -lpcre2-8 -lpthread -ldl") + +# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955) +libext2fsfiles = %w( + lib/blkid/cache.c + lib/blkid/dev.c + lib/blkid/devname.c + lib/blkid/devno.c + lib/blkid/getsize.c + lib/blkid/llseek.c + lib/blkid/probe.c + lib/blkid/read.c + lib/blkid/resolve.c + lib/blkid/save.c + lib/blkid/tag.c + lib/e2p/feature.c + lib/e2p/hashstr.c + lib/e2p/mntopts.c + lib/e2p/ostype.c + lib/e2p/parse_num.c + lib/e2p/uuid.c + lib/et/com_err.c + lib/et/error_message.c + lib/et/et_name.c + lib/ext2fs/alloc.c + lib/ext2fs/alloc_sb.c + lib/ext2fs/alloc_stats.c + lib/ext2fs/alloc_tables.c + lib/ext2fs/atexit.c + lib/ext2fs/badblocks.c + lib/ext2fs/bb_inode.c + lib/ext2fs/bitmaps.c + lib/ext2fs/bitops.c + lib/ext2fs/blkmap64_ba.c + lib/ext2fs/blkmap64_rb.c + lib/ext2fs/blknum.c + lib/ext2fs/block.c + lib/ext2fs/bmap.c + lib/ext2fs/closefs.c + lib/ext2fs/crc16.c + lib/ext2fs/crc32c.c + lib/ext2fs/csum.c + lib/ext2fs/dirblock.c + lib/ext2fs/dir_iterate.c + lib/ext2fs/expanddir.c + lib/ext2fs/ext2_err.c + lib/ext2fs/ext_attr.c + lib/ext2fs/extent.c + lib/ext2fs/fallocate.c + lib/ext2fs/fileio.c + lib/ext2fs/freefs.c + lib/ext2fs/gen_bitmap64.c + lib/ext2fs/gen_bitmap.c + lib/ext2fs/get_num_dirs.c + lib/ext2fs/getsectsize.c + lib/ext2fs/getsize.c + lib/ext2fs/hashmap.c + lib/ext2fs/i_block.c + lib/ext2fs/ind_block.c + lib/ext2fs/initialize.c + lib/ext2fs/inline.c + lib/ext2fs/inline_data.c + lib/ext2fs/inode.c + lib/ext2fs/io_manager.c + lib/ext2fs/ismounted.c + lib/ext2fs/link.c + lib/ext2fs/llseek.c + lib/ext2fs/lookup.c + lib/ext2fs/mkdir.c + lib/ext2fs/mkjournal.c + lib/ext2fs/mmp.c + lib/ext2fs/namei.c + lib/ext2fs/newdir.c + lib/ext2fs/openfs.c + lib/ext2fs/progress.c + lib/ext2fs/punch.c + lib/ext2fs/rbtree.c + lib/ext2fs/read_bb.c + lib/ext2fs/read_bb_file.c + lib/ext2fs/res_gdt.c + lib/ext2fs/rw_bitmaps.c + lib/ext2fs/sha512.c + lib/ext2fs/sparse_io.c + lib/ext2fs/symlink.c + lib/ext2fs/undo_io.c + lib/ext2fs/unix_io.c + lib/ext2fs/valid_blk.c + lib/support/dict.c + lib/support/mkquota.c + lib/support/parse_qtype.c + lib/support/plausible.c + lib/support/prof_err.c + lib/support/profile.c + lib/support/quotaio.c + lib/support/quotaio_tree.c + lib/support/quotaio_v2.c + lib/uuid/gen_uuid.c + lib/uuid/isnull.c + lib/uuid/pack.c + lib/uuid/parse.c + lib/uuid/unpack.c + lib/uuid/unparse.c + misc/create_inode.c +) +libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include") + +mke2fsfiles = %w( + misc/default_profile.c + misc/mke2fs.c + misc/mk_hugefiles.c + misc/util.c +) +mke2fs = compile(expand("e2fsprogs", mke2fsfiles), "-Ie2fsprogs/lib") + +link("mke2fs.android", mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lpthread -lz") + +e2fsdroidfiles = %w( + contrib/android/e2fsdroid.c + contrib/android/basefs_allocator.c + contrib/android/block_range.c + contrib/android/base_fs.c + contrib/android/fsmap.c + contrib/android/block_list.c + contrib/android/perms.c +) +e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc") + +link("e2fsdroid", e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, "-lz -lpthread -lpcre2-8") + +ext2simgfiles = %w( + contrib/android/ext2simg.c +) +ext2simg = compile(expand("e2fsprogs", ext2simgfiles), "-Ie2fsprogs/lib -Icore/libsparse/include") + +link("ext2simg", ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lz -lpthread") diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/gitignore b/meta-oe/recipes-devtools/android-tools/android-tools/gitignore deleted file mode 100644 index b034c10a1e..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/gitignore +++ /dev/null @@ -1,59 +0,0 @@ -* -!.gitignore -!*.indirectionsymlink -!*.[ch] -!*.mk -!*.patch -!*.service -!NOTICE -!MODULE_LICENSE_* -!/system/ -!/system/core/ -!/system/core/adb/ -!/system/core/fastboot/ -!/system/core/fs_mgr/ -!/system/core/fs_mgr/include/ -!/system/core/include/ -!/system/core/include/android/ -!/system/core/include/cutils/ -!/system/core/include/log/ -!/system/core/include/mincrypt/ -!/system/core/include/private/ -!/system/core/include/utils/ -!/system/core/include/zipfile/ -!/system/core/liblog/ -!/system/core/liblog/tests/ -!/system/core/libcutils/ -!/system/core/libmincrypt/ -!/system/core/libzipfile/ -!/system/core/libsparse/ -!/system/core/libsparse/include/ -!/system/core/libsparse/include/sparse/ -!/system/core/libsparse/simg_dump.py -!/system/core/mkbootimg/ -!/system/extras/ -!/system/extras/ext4_utils/ -!/system/extras/ext4_utils/mkuserimg.sh -!/system/extras/ext4_utils/test_ext4fixup -!/system/extras/f2fs_utils/ -!/hardware/ -!/hardware/libhardware/ -!/hardware/libhardware/include/ -!/hardware/libhardware/include/hardware/ -!/external/ -!/external/libselinux/ -!/external/libselinux/include/ -!/external/libselinux/include/selinux/ -!/external/libselinux/src/ -!/external/f2fs-tools/ -!/external/f2fs-tools/include/ -!/external/f2fs-tools/lib/ -!/external/f2fs-tools/mkfs/ -!/build/ -!/build/core/ -!/build/core/version_defaults.mk -!/build/core/combo/ -!/build/core/combo/include/ -!/build/core/combo/include/arch/ -!/build/core/combo/include/arch/linux-*/ -!/build/core/combo/include/arch/linux-*/AndroidConfig.h diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/log.do_compile.12223 b/meta-oe/recipes-devtools/android-tools/android-tools/log.do_compile.12223 new file mode 100644 index 0000000000..8cf4783365 --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/log.do_compile.12223 @@ -0,0 +1,641 @@ +DEBUG: Executing shell function do_compile +-- The C compiler identification is GNU 7.3.0 +-- Check for working C compiler: /OE/build/owpb/webos-ports/tmp-glibc/hosttools/gcc +-- Check for working C compiler: /OE/build/owpb/webos-ports/tmp-glibc/hosttools/gcc -- works +-- Detecting C compiler ABI info +-- Detecting C compiler ABI info - done +-- Detecting C compile features +-- Detecting C compile features - done +-- The CXX compiler identification is GNU 7.3.0 +-- Check for working CXX compiler: /OE/build/owpb/webos-ports/tmp-glibc/hosttools/g++ +-- Check for working CXX compiler: /OE/build/owpb/webos-ports/tmp-glibc/hosttools/g++ -- works +-- Detecting CXX compiler ABI info +-- Detecting CXX compiler ABI info - done +-- Detecting CXX compile features +-- Detecting CXX compile features - done +-- Found Perl: /OE/build/owpb/webos-ports/tmp-glibc/hosttools/perl (found version "5.26.1") +-- The ASM compiler identification is GNU +-- Found assembler: /OE/build/owpb/webos-ports/tmp-glibc/hosttools/gcc +-- Configuring done +-- Generating done +-- Build files have been written to: /OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build +[1/395] Building C object crypto/CMakeFiles/crypto_base.dir/cpu-arm.c.o +[2/395] Building C object crypto/CMakeFiles/crypto_base.dir/cpu-arm-linux.c.o +[3/395] Building C object crypto/CMakeFiles/crypto_base.dir/cpu-ppc64le.c.o +[4/395] Building C object crypto/CMakeFiles/crypto_base.dir/cpu-aarch64-linux.c.o +[5/395] Building C object crypto/CMakeFiles/crypto_base.dir/crypto.c.o +[6/395] Building C object crypto/CMakeFiles/crypto_base.dir/refcount_c11.c.o +[7/395] Building C object crypto/CMakeFiles/crypto_base.dir/cpu-intel.c.o +[8/395] Building C object crypto/CMakeFiles/crypto_base.dir/refcount_lock.c.o +[9/395] Building C object crypto/CMakeFiles/crypto_base.dir/mem.c.o +[10/395] Building C object crypto/CMakeFiles/crypto_base.dir/thread.c.o +[11/395] Building C object crypto/CMakeFiles/crypto_base.dir/ex_data.c.o +[12/395] Building C object crypto/CMakeFiles/crypto_base.dir/thread_none.c.o +[13/395] Building C object crypto/CMakeFiles/crypto_base.dir/thread_win.c.o +[14/395] Building C object crypto/CMakeFiles/crypto_base.dir/thread_pthread.c.o +[15/395] Building C object crypto/rc4/CMakeFiles/rc4.dir/rc4.c.o +[16/395] Building C object crypto/pool/CMakeFiles/pool.dir/pool.c.o +[17/395] Building C object crypto/lhash/CMakeFiles/lhash.dir/lhash.c.o +[18/395] Building C object crypto/bytestring/CMakeFiles/bytestring.dir/asn1_compat.c.o +[19/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_strnid.c.o +[20/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_time.c.o +[21/395] Building C object crypto/stack/CMakeFiles/stack.dir/stack.c.o +[22/395] Building C object crypto/buf/CMakeFiles/buf.dir/buf.c.o +[23/395] Building C object crypto/poly1305/CMakeFiles/poly1305.dir/poly1305.c.o +[24/395] Building C object crypto/bytestring/CMakeFiles/bytestring.dir/ber.c.o +[25/395] Building C object crypto/base64/CMakeFiles/base64.dir/base64.c.o +[26/395] Building C object crypto/poly1305/CMakeFiles/poly1305.dir/poly1305_arm.c.o +[27/395] Generating chacha-x86_64.S +[28/395] Building C object crypto/digest_extra/CMakeFiles/digest_extra.dir/digest_extra.c.o +[29/395] Building C object crypto/bytestring/CMakeFiles/bytestring.dir/cbs.c.o +[30/395] Building C object crypto/bytestring/CMakeFiles/bytestring.dir/cbb.c.o +[31/395] Building C object crypto/chacha/CMakeFiles/chacha.dir/chacha.c.o +[32/395] Building ASM object crypto/chacha/CMakeFiles/chacha.dir/chacha-x86_64.S.o +[33/395] Building C object crypto/curve25519/CMakeFiles/curve25519.dir/spake25519.c.o +[34/395] Building C object crypto/rand_extra/CMakeFiles/rand_extra.dir/deterministic.c.o +[35/395] Building C object crypto/conf/CMakeFiles/conf.dir/conf.c.o +[36/395] Building C object crypto/rand_extra/CMakeFiles/rand_extra.dir/fuchsia.c.o +[37/395] Building C object crypto/rand_extra/CMakeFiles/rand_extra.dir/forkunsafe.c.o +[38/395] Building C object crypto/rand_extra/CMakeFiles/rand_extra.dir/windows.c.o +[39/395] Building C object crypto/rand_extra/CMakeFiles/rand_extra.dir/rand_extra.c.o +[40/395] Generating err_data.c +[41/395] Building C object crypto/poly1305/CMakeFiles/poly1305.dir/poly1305_vec.c.o +[42/395] Building C object crypto/bio/CMakeFiles/bio.dir/bio_mem.c.o +[43/395] Building C object crypto/err/CMakeFiles/err.dir/err_data.c.o +[44/395] Building C object crypto/bio/CMakeFiles/bio.dir/fd.c.o +[45/395] Generating crypto_test_data.cc +[46/395] Generating aes128gcmsiv-x86_64.S +[47/395] Building C object crypto/bio/CMakeFiles/bio.dir/connect.c.o +[48/395] Building C object crypto/bio/CMakeFiles/bio.dir/printf.c.o +[49/395] Building C object crypto/bio/CMakeFiles/bio.dir/bio.c.o +[50/395] Building C object crypto/bn_extra/CMakeFiles/bn_extra.dir/bn_asn1.c.o +[51/395] Building C object crypto/bio/CMakeFiles/bio.dir/hexdump.c.o +[52/395] Building C object crypto/err/CMakeFiles/err.dir/err.c.o +[53/395] Building C object crypto/bio/CMakeFiles/bio.dir/pair.c.o +[54/395] Building C object crypto/bio/CMakeFiles/bio.dir/socket_helper.c.o +[55/395] Building C object crypto/bio/CMakeFiles/bio.dir/file.c.o +[56/395] Building C object crypto/bio/CMakeFiles/bio.dir/socket.c.o +[57/395] Building C object crypto/obj/CMakeFiles/obj.dir/obj_xref.c.o +[58/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_bool.c.o +[59/395] Building C object crypto/bn_extra/CMakeFiles/bn_extra.dir/convert.c.o +[60/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_dup.c.o +[61/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_enum.c.o +[62/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_bitstr.c.o +[63/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_d2i_fp.c.o +[64/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_i2d_fp.c.o +[65/395] Building C object crypto/obj/CMakeFiles/obj.dir/obj.c.o +[66/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_print.c.o +[67/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_mbstr.c.o +[68/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_octet.c.o +[69/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_gentm.c.o +[70/395] Generating chacha20_poly1305_x86_64.S +[71/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_type.c.o +[72/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_object.c.o +[73/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_int.c.o +[74/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_utctm.c.o +[75/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/cipher_extra.c.o +[76/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/asn1_par.c.o +[77/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/a_utf8.c.o +[78/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_rc4.c.o +[79/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_null.c.o +[80/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/derive_key.c.o +[81/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/asn1_lib.c.o +[82/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_aesctrhmac.c.o +[83/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_rc2.c.o +[84/395] Building ASM object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/aes128gcmsiv-x86_64.S.o +[85/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_chacha20poly1305.c.o +[86/395] Building ASM object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/chacha20_poly1305_x86_64.S.o +[87/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_aesgcmsiv.c.o +[88/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/f_string.c.o +[89/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/f_int.c.o +[90/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_ssl3.c.o +[91/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/tls_cbc.c.o +[92/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/f_enum.c.o +[93/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/asn_pack.c.o +[94/395] Building C object crypto/cipher_extra/CMakeFiles/cipher_extra.dir/e_tls.c.o +[95/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/time_support.c.o +[96/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/tasn_new.c.o +[97/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/tasn_fre.c.o +[98/395] Building C object crypto/engine/CMakeFiles/engine.dir/engine.c.o +[99/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/tasn_utl.c.o +[100/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/tasn_enc.c.o +[101/395] Building C object crypto/dh/CMakeFiles/dh.dir/check.c.o +[102/395] Building C object crypto/dh/CMakeFiles/dh.dir/params.c.o +[103/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/tasn_typ.c.o +[104/395] Building C object crypto/asn1/CMakeFiles/asn1.dir/tasn_dec.c.o +[105/395] Building C object crypto/dh/CMakeFiles/dh.dir/dh.c.o +[106/395] Building C object crypto/dh/CMakeFiles/dh.dir/dh_asn1.c.o +[107/395] Building C object crypto/ecdh/CMakeFiles/ecdh.dir/ecdh.c.o +[108/395] Building CXX object CMakeFiles/crypto_test_data.dir/crypto_test_data.cc.o +[109/395] Building C object crypto/dsa/CMakeFiles/dsa.dir/dsa_asn1.c.o +[110/395] Building C object crypto/rsa_extra/CMakeFiles/rsa_extra.dir/rsa_asn1.c.o +[111/395] Building C object crypto/evp/CMakeFiles/evp.dir/digestsign.c.o +[112/395] Building C object crypto/ecdsa_extra/CMakeFiles/ecdsa_extra.dir/ecdsa_asn1.c.o +[113/395] Building C object crypto/evp/CMakeFiles/evp.dir/evp.c.o +[114/395] Building C object crypto/ec_extra/CMakeFiles/ec_extra.dir/ec_asn1.c.o +[115/395] Building C object crypto/cmac/CMakeFiles/cmac.dir/cmac.c.o +[116/395] Building C object crypto/dsa/CMakeFiles/dsa.dir/dsa.c.o +[117/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_dsa_asn1.c.o +[118/395] Building C object crypto/evp/CMakeFiles/evp.dir/evp_asn1.c.o +[119/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_ec_asn1.c.o +[120/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_rsa_asn1.c.o +[121/395] Building C object crypto/evp/CMakeFiles/evp.dir/evp_ctx.c.o +[122/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_ed25519.c.o +[123/395] Building C object crypto/evp/CMakeFiles/evp.dir/pbkdf.c.o +[124/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_ed25519_asn1.c.o +[125/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_ec.c.o +[126/395] Building C object crypto/evp/CMakeFiles/evp.dir/sign.c.o +[127/395] Building C object crypto/hkdf/CMakeFiles/hkdf.dir/hkdf.c.o +[128/395] Building C object crypto/evp/CMakeFiles/evp.dir/p_rsa.c.o +[129/395] Building C object crypto/evp/CMakeFiles/evp.dir/print.c.o +[130/395] Building C object crypto/evp/CMakeFiles/evp.dir/scrypt.c.o +[131/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_info.c.o +[132/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_oth.c.o +[133/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_pkey.c.o +[134/395] Building C object crypto/x509/CMakeFiles/x509.dir/a_digest.c.o +[135/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_all.c.o +[136/395] Building C object crypto/x509/CMakeFiles/x509.dir/a_sign.c.o +[137/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_xaux.c.o +[138/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_pk8.c.o +[139/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_x509.c.o +[140/395] Building C object crypto/x509/CMakeFiles/x509.dir/a_verify.c.o +[141/395] Building C object crypto/x509/CMakeFiles/x509.dir/i2d_pr.c.o +[142/395] Building C object crypto/x509/CMakeFiles/x509.dir/algorithm.c.o +[143/395] Building C object crypto/x509/CMakeFiles/x509.dir/by_file.c.o +[144/395] Building C object crypto/pem/CMakeFiles/pem.dir/pem_lib.c.o +[145/395] Building C object crypto/x509/CMakeFiles/x509.dir/t_crl.c.o +[146/395] Building C object crypto/x509/CMakeFiles/x509.dir/rsa_pss.c.o +[147/395] Building C object crypto/x509/CMakeFiles/x509.dir/by_dir.c.o +[148/395] Building C object crypto/x509/CMakeFiles/x509.dir/t_req.c.o +[149/395] Building C object crypto/x509/CMakeFiles/x509.dir/a_strex.c.o +[150/395] Building C object crypto/x509/CMakeFiles/x509.dir/t_x509a.c.o +[151/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509.c.o +[152/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_d2.c.o +[153/395] Building C object crypto/x509/CMakeFiles/x509.dir/t_x509.c.o +[154/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_def.c.o +[155/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_att.c.o +[156/395] Building C object crypto/x509/CMakeFiles/x509.dir/asn1_gen.c.o +[157/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_r2x.c.o +[158/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_ext.c.o +[159/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_cmp.c.o +[160/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_obj.c.o +[161/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_set.c.o +[162/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_txt.c.o +[163/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_req.c.o +[164/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_trs.c.o +[165/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509cset.c.o +[166/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_lu.c.o +[167/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_v3.c.o +[168/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509rset.c.o +[169/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_vpm.c.o +[170/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509spki.c.o +[171/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_algor.c.o +[172/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_attrib.c.o +[173/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509name.c.o +[174/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_exten.c.o +[175/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_info.c.o +[176/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_pkey.c.o +[177/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_all.c.o +[178/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_spki.c.o +[179/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_sig.c.o +[180/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_req.c.o +[181/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_name.c.o +[182/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_crl.c.o +[183/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_val.c.o +[184/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_pubkey.c.o +[185/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_x509a.c.o +[186/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/pcy_lib.c.o +[187/395] Building C object crypto/x509/CMakeFiles/x509.dir/x_x509.c.o +[188/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/pcy_map.c.o +[189/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/pcy_cache.c.o +[190/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/pcy_data.c.o +[191/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_akeya.c.o +[192/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_akey.c.o +[193/395] Building C object crypto/x509/CMakeFiles/x509.dir/x509_vfy.c.o +[194/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/pcy_node.c.o +[195/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_bcons.c.o +[196/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_bitst.c.o +[197/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_enum.c.o +[198/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/pcy_tree.c.o +[199/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_extku.c.o +[200/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_genn.c.o +[201/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_conf.c.o +[202/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_int.c.o +[203/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_alt.c.o +[204/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_crld.c.o +[205/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_ia5.c.o +[206/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_cpols.c.o +[207/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_info.c.o +[208/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_lib.c.o +[209/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_pcia.c.o +[210/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_ncons.c.o +[211/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_pci.c.o +[212/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_pku.c.o +[213/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_pcons.c.o +[214/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_pmaps.c.o +[215/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_prn.c.o +[216/395] Building C object crypto/pkcs7/CMakeFiles/pkcs7.dir/pkcs7.c.o +[217/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_skey.c.o +[218/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_sxnet.c.o +[219/395] Building C object crypto/pkcs7/CMakeFiles/pkcs7.dir/pkcs7_x509.c.o +[220/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_purp.c.o +[221/395] Building C object crypto/pkcs8/CMakeFiles/pkcs8_lib.dir/p5_pbev2.c.o +[222/395] Building C object crypto/pkcs8/CMakeFiles/pkcs8_lib.dir/pkcs8.c.o +[223/395] Generating aesni-gcm-x86_64.S +[224/395] Building C object crypto/pkcs8/CMakeFiles/pkcs8_lib.dir/pkcs8_x509.c.o +[225/395] Building CXX object crypto/test/CMakeFiles/test_support.dir/malloc.cc.o +[226/395] Building C object crypto/x509v3/CMakeFiles/x509v3.dir/v3_utl.c.o +[227/395] Generating aes-x86_64.S +[228/395] Generating md5-x86_64.S +[229/395] Generating rdrand-x86_64.S +[230/395] Generating bsaes-x86_64.S +[231/395] Generating ghash-x86_64.S +[232/395] Building CXX object crypto/test/CMakeFiles/test_support.dir/test_util.cc.o +[233/395] Generating aesni-x86_64.S +[234/395] Generating vpaes-x86_64.S +[235/395] Generating p256-x86_64-asm.S +[236/395] Generating rsaz-avx2.S +[237/395] Generating x86_64-mont.S +[238/395] Generating x86_64-mont5.S +[239/395] Generating sha512-x86_64.S +[240/395] Generating sha256-x86_64.S +[241/395] Building C object decrepit/bio/CMakeFiles/bio_decrepit.dir/base64_bio.c.o +[242/395] Building C object decrepit/cast/CMakeFiles/cast.dir/cast_tables.c.o +[243/395] Building C object decrepit/cfb/CMakeFiles/cfb.dir/cfb.c.o +[244/395] Building C object decrepit/blowfish/CMakeFiles/blowfish.dir/blowfish.c.o +[245/395] Generating sha1-x86_64.S +[246/395] Building C object decrepit/des/CMakeFiles/des_decrepit.dir/cfb64ede.c.o +[247/395] Building C object decrepit/dh/CMakeFiles/dh_decrepit.dir/dh_decrepit.c.o +[248/395] Building CXX object crypto/test/CMakeFiles/boringssl_gtest_main.dir/gtest_main.cc.o +[249/395] Building C object decrepit/evp/CMakeFiles/evp_decrepit.dir/dss1.c.o +[250/395] Building C object decrepit/dsa/CMakeFiles/dsa_decrepit.dir/dsa_decrepit.c.o +[251/395] Building C object decrepit/cast/CMakeFiles/cast.dir/cast.c.o +[252/395] Building CXX object crypto/test/CMakeFiles/test_support.dir/file_test.cc.o +[253/395] Building C object third_party/fiat/CMakeFiles/fiat.dir/curve25519.c.o +[254/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/chacha/chacha_test.cc.o +[255/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/asn1/asn1_test.cc.o +[256/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/buf/buf_test.cc.o +[257/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/cmac/cmac_test.cc.o +[258/395] Building CXX object CMakeFiles/boringssl_gtest.dir/third_party/googletest/src/gtest-all.cc.o +[259/395] Linking CXX static library libboringssl_gtest.a +[260/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/cipher_extra/cipher_test.cc.o +[261/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/base64/base64_test.cc.o +[262/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/curve25519/spake25519_test.cc.o +[263/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/compiler_test.cc.o +[264/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/constant_time_test.cc.o +[265/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/curve25519/ed25519_test.cc.o +[266/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/curve25519/x25519_test.cc.o +[267/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/dh/dh_test.cc.o +[268/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/ecdh/ecdh_test.cc.o +[269/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/dsa/dsa_test.cc.o +[270/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/cipher_extra/aead_test.cc.o +[271/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/bio/bio_test.cc.o +[272/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/bytestring/bytestring_test.cc.o +[273/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/digest_extra/digest_test.cc.o +[274/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/evp/evp_test.cc.o +[275/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/err/err_test.cc.o +[276/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/evp/pbkdf_test.cc.o +[277/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/aes/aes_test.cc.o +[278/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/evp/evp_extra_test.cc.o +[279/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/evp/scrypt_test.cc.o +[280/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/hkdf/hkdf_test.cc.o +[281/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/modes/gcm_test.cc.o +[282/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/rand/ctrdrbg_test.cc.o +[283/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/ec/p256-x86_64_test.cc.o +[284/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/obj/obj_test.cc.o +[285/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/ecdsa/ecdsa_test.cc.o +[286/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/lhash/lhash_test.cc.o +[287/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/hmac_extra/hmac_test.cc.o +[288/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/ec/ec_test.cc.o +[289/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/poly1305/poly1305_test.cc.o +[290/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/pool/pool_test.cc.o +[291/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/refcount_test.cc.o +[292/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/pkcs8/pkcs8_test.cc.o +[293/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/pkcs7/pkcs7_test.cc.o +[294/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/pkcs8/pkcs12_test.cc.o +[295/395] Building C object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/is_fips.c.o +[296/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/aesni-gcm-x86_64.S.o +[297/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/aesni-x86_64.S.o +[298/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/aes-x86_64.S.o +[299/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/bsaes-x86_64.S.o +[300/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/ghash-x86_64.S.o +[301/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/self_test.cc.o +[302/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/md5-x86_64.S.o +[303/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/p256-x86_64-asm.S.o +[304/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/rdrand-x86_64.S.o +[305/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/test/file_test_gtest.cc.o +[306/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/rsaz-avx2.S.o +[307/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/sha256-x86_64.S.o +[308/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/sha1-x86_64.S.o +[309/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/vpaes-x86_64.S.o +[310/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/sha512-x86_64.S.o +[311/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/x86_64-mont5.S.o +[312/395] Building ASM object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/x86_64-mont.S.o +[313/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/thread_test.cc.o +[314/395] Building CXX object ssl/CMakeFiles/ssl.dir/bio_ssl.cc.o +[315/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/x509v3/tab_test.cc.o +[316/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/x509v3/v3name_test.cc.o +[317/395] Building CXX object ssl/CMakeFiles/ssl.dir/d1_both.cc.o +[318/395] Building CXX object ssl/CMakeFiles/ssl.dir/custom_extensions.cc.o +[319/395] Building CXX object ssl/CMakeFiles/ssl.dir/d1_pkt.cc.o +[320/395] Building CXX object ssl/CMakeFiles/ssl.dir/d1_srtp.cc.o +[321/395] Building CXX object ssl/CMakeFiles/ssl.dir/dtls_method.cc.o +[322/395] Building CXX object ssl/CMakeFiles/ssl.dir/handoff.cc.o +[323/395] Building CXX object ssl/CMakeFiles/ssl.dir/d1_lib.cc.o +[324/395] Building CXX object ssl/CMakeFiles/ssl.dir/dtls_record.cc.o +[325/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/rsa_extra/rsa_test.cc.o +[326/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/fipsmodule/bn/bn_test.cc.o +[327/395] Building CXX object ssl/CMakeFiles/ssl.dir/s3_both.cc.o +[328/395] Building CXX object ssl/CMakeFiles/ssl.dir/s3_pkt.cc.o +[329/395] Building CXX object ssl/CMakeFiles/ssl.dir/handshake_client.cc.o +[330/395] Building CXX object ssl/CMakeFiles/ssl.dir/s3_lib.cc.o +[331/395] Building CXX object ssl/CMakeFiles/ssl.dir/handshake.cc.o +[332/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_aead_ctx.cc.o +[333/395] Building CXX object crypto/CMakeFiles/crypto_test.dir/x509/x509_test.cc.o +[334/395] Building CXX object ssl/CMakeFiles/ssl.dir/handshake_server.cc.o +[335/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_file.cc.o +[336/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_asn1.cc.o +[337/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_buffer.cc.o +[338/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_key_share.cc.o +[339/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_cert.cc.o +[340/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_cipher.cc.o +[341/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_stat.cc.o +[342/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_privkey.cc.o +[343/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_session.cc.o +[344/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_versions.cc.o +[345/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_lib.cc.o +[346/395] Building CXX object ssl/CMakeFiles/ssl.dir/tls_method.cc.o +[347/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_transcript.cc.o +[348/395] Building CXX object ssl/CMakeFiles/ssl.dir/t1_enc.cc.o +[349/395] Building CXX object ssl/CMakeFiles/ssl.dir/tls_record.cc.o +[350/395] Building CXX object ssl/CMakeFiles/ssl.dir/ssl_x509.cc.o +[351/395] Building CXX object ssl/CMakeFiles/ssl.dir/tls13_enc.cc.o +[352/395] Building CXX object ssl/CMakeFiles/ssl.dir/tls13_client.cc.o +[353/395] Building CXX object ssl/test/CMakeFiles/bssl_shim.dir/async_bio.cc.o +[354/395] Building CXX object ssl/CMakeFiles/ssl.dir/tls13_both.cc.o +[355/395] Building CXX object ssl/CMakeFiles/ssl.dir/tls13_server.cc.o +[356/395] Building CXX object ssl/test/CMakeFiles/bssl_shim.dir/test_config.cc.o +[357/395] Building CXX object ssl/test/CMakeFiles/bssl_shim.dir/packeted_bio.cc.o +[358/395] Building CXX object tool/CMakeFiles/bssl.dir/const.cc.o +[359/395] Building CXX object ssl/CMakeFiles/ssl.dir/t1_lib.cc.o +[360/395] Building CXX object tool/CMakeFiles/bssl.dir/ciphers.cc.o +[361/395] Building CXX object tool/CMakeFiles/bssl.dir/args.cc.o +[362/395] Building CXX object tool/CMakeFiles/bssl.dir/file.cc.o +[363/395] Building CXX object tool/CMakeFiles/bssl.dir/digest.cc.o +[364/395] Building CXX object ssl/CMakeFiles/ssl_test.dir/span_test.cc.o +[365/395] Building CXX object tool/CMakeFiles/bssl.dir/generate_ed25519.cc.o +[366/395] Building CXX object tool/CMakeFiles/bssl.dir/genrsa.cc.o +[367/395] Building CXX object tool/CMakeFiles/bssl.dir/rand.cc.o +[368/395] Building CXX object tool/CMakeFiles/bssl.dir/client.cc.o +[369/395] Building CXX object tool/CMakeFiles/bssl.dir/pkcs12.cc.o +[370/395] Building CXX object tool/CMakeFiles/bssl.dir/sign.cc.o +[371/395] Building C object decrepit/evp/CMakeFiles/evp_decrepit.dir/evp_do_all.c.o +[372/395] Building CXX object tool/CMakeFiles/bssl.dir/tool.cc.o +[373/395] Building C object decrepit/rc4/CMakeFiles/rc4_decrepit.dir/rc4_decrepit.c.o +[374/395] Building C object decrepit/obj/CMakeFiles/obj_decrepit.dir/obj_decrepit.c.o +[375/395] Building C object decrepit/rsa/CMakeFiles/rsa_decrepit.dir/rsa_decrepit.c.o +[376/395] Building C object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/bcm.c.o +[377/395] Building C object decrepit/ssl/CMakeFiles/ssl_decrepit.dir/ssl_decrepit.c.o +[378/395] Linking C static library crypto/libcrypto.a +[379/395] Building CXX object ssl/test/CMakeFiles/bssl_shim.dir/bssl_shim.cc.o +[380/395] Building C object decrepit/x509/CMakeFiles/x509_decrepit.dir/x509_decrepit.c.o +[381/395] Linking CXX static library ssl/libssl.a +[382/395] Building C object decrepit/ripemd/CMakeFiles/ripemd_decrepit.dir/ripemd.c.o +[383/395] Building CXX object tool/CMakeFiles/bssl.dir/transport_common.cc.o +[384/395] Building C object decrepit/xts/CMakeFiles/xts.dir/xts.c.o +[385/395] Linking CXX static library decrepit/libdecrepit.a +[386/395] Building CXX object tool/CMakeFiles/bssl.dir/server.cc.o +[387/395] Building CXX object decrepit/CMakeFiles/decrepit_test.dir/ripemd/ripemd_test.cc.o +[388/395] Building CXX object tool/CMakeFiles/bssl.dir/speed.cc.o +[389/395] Linking CXX executable ssl/test/bssl_shim +[390/395] Building CXX object decrepit/CMakeFiles/decrepit_test.dir/cfb/cfb_test.cc.o +[391/395] Linking CXX executable tool/bssl +[392/395] Linking CXX executable decrepit/decrepit_test +[393/395] Linking CXX executable crypto/crypto_test +[394/395] Building CXX object ssl/CMakeFiles/ssl_test.dir/ssl_test.cc.o +[395/395] Linking CXX executable ssl/ssl_test +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git +[1/177] gcc -I/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -std=gnu11 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/libsparse/include -Icore/base/include -c core/libsparse/sparse_crc32.c -o core/libsparse/sparse_crc32.c.o +[2/177] gcc -I/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -std=gnu11 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/libsparse/include -Icore/base/include -c core/libsparse/sparse_err.c -o core/libsparse/sparse_err.c.o +[3/177] gcc -I/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -std=gnu11 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/libsparse/include -Icore/base/include -c core/libsparse/sparse.c -o core/libsparse/sparse.c.o +[4/177] gcc -I/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -std=gnu11 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/libsparse/include -Icore/base/include -c core/libsparse/backed_block.c -o core/libsparse/backed_block.c.o +[5/177] g++ -lpthread -lusb-1.0 -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-O1 -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-O1 core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.cpp.o core/adb/adb.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/bugreport.cpp.o core/adb/line_printer.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/transport_mdns_unsupported.cpp.o core/adb/fdevent.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/socket_spec.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/sysdeps/errno.cpp.o core/adb/client/main.cpp.o core/adb/client/usb_dispatch.cpp.o core/adb/client/usb_linux.cpp.o core/adb/client/usb_libusb.cpp.o core/adb/sysdeps/posix/network.cpp.o core/adb/diagnose_usb.cpp.o core/libcrypto_utils/android_pubkey.c.o boringssl/build/crypto/libcrypto.a -o adb +FAILED: adb +g++ -lpthread -lusb-1.0 -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-O1 -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -L/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/lib -Wl,-O1 core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.cpp.o core/adb/adb.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/bugreport.cpp.o core/adb/line_printer.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/transport_mdns_unsupported.cpp.o core/adb/fdevent.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/socket_spec.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/sysdeps/errno.cpp.o core/adb/client/main.cpp.o core/adb/client/usb_dispatch.cpp.o core/adb/client/usb_linux.cpp.o core/adb/client/usb_libusb.cpp.o core/adb/sysdeps/posix/network.cpp.o core/adb/diagnose_usb.cpp.o core/libcrypto_utils/android_pubkey.c.o boringssl/build/crypto/libcrypto.a -o adb +core/adb/commandline.cpp.o: In function `stdin_read_thread_loop(void*)': +commandline.cpp:(.text+0x49d): undefined reference to `pthread_sigmask' +commandline.cpp:(.text+0x4cb): undefined reference to `pthread_sigmask' +core/adb/commandline.cpp.o: In function `adb_shell(int, char const**)': +commandline.cpp:(.text+0x267c): undefined reference to `pthread_sigmask' +commandline.cpp:(.text+0x26a3): undefined reference to `pthread_create' +core/adb/client/usb_libusb.cpp.o: In function `libusb::get_device_address(libusb_device*)': +usb_libusb.cpp:(.text+0x22): undefined reference to `libusb_get_device_address' +usb_libusb.cpp:(.text+0x2c): undefined reference to `libusb_get_bus_number' +core/adb/client/usb_libusb.cpp.o: In function `adb_thread_setname(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)': +usb_libusb.cpp:(.text+0x149): undefined reference to `pthread_setname_np' +core/adb/client/usb_libusb.cpp.o: In function `std::call_once<libusb::hotplug_callback(libusb_context*, libusb_device*, libusb_hotplug_event, void*)::{lambda()#1}>(std::once_flag&, libusb::hotplug_callback(libusb_context*, libusb_device*, libusb_hotplug_event, void*)::{lambda()#1}&&)::{lambda()#2}::_FUN()': +usb_libusb.cpp:(.text+0x1bf): undefined reference to `pthread_create' +core/adb/client/usb_libusb.cpp.o: In function `std::thread::_State_impl<std::thread::_Invoker<std::tuple<libusb::usb_init()::{lambda()#7}> > >::_M_run()': +usb_libusb.cpp:(.text+0x3d3): undefined reference to `libusb_handle_events' +core/adb/client/usb_libusb.cpp.o: In function `libusb::usb_init()': +usb_libusb.cpp:(.text+0x411): undefined reference to `libusb_init' +usb_libusb.cpp:(.text+0x487): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x4e8): undefined reference to `libusb_hotplug_register_callback' +usb_libusb.cpp:(.text+0x526): undefined reference to `pthread_create' +core/adb/client/usb_libusb.cpp.o: In function `libusb::perform_usb_transfer(libusb::usb_handle*, transfer_info*, std::unique_lock<std::mutex>) [clone .isra.25]': +usb_libusb.cpp:(.text+0x859): undefined reference to `libusb_submit_transfer' +usb_libusb.cpp:(.text+0x90e): undefined reference to `libusb_error_name' +core/adb/client/usb_libusb.cpp.o: In function `libusb::transfer_callback(libusb_transfer*)': +usb_libusb.cpp:(.text+0x1006): undefined reference to `libusb_submit_transfer' +usb_libusb.cpp:(.text+0x107d): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x11fe): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x1261): undefined reference to `libusb_submit_transfer' +usb_libusb.cpp:(.text+0x1317): undefined reference to `libusb_error_name' +core/adb/client/usb_libusb.cpp.o: In function `libusb::usb_kick(libusb::usb_handle*)': +usb_libusb.cpp:(.text+0x20b8): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text+0x20c4): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text+0x20d3): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text+0x20db): undefined reference to `libusb_close' +core/adb/client/usb_libusb.cpp.o: In function `libusb::hotplug_callback(libusb_context*, libusb_device*, libusb_hotplug_event, void*)': +usb_libusb.cpp:(.text+0x2188): undefined reference to `pthread_once' +core/adb/client/usb_libusb.cpp.o: In function `libusb::hotplug_thread()': +usb_libusb.cpp:(.text+0x2574): undefined reference to `pthread_create' +usb_libusb.cpp:(.text+0x26ed): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text+0x2705): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text+0x2793): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text+0x279f): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text+0x27b3): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text+0x27bf): undefined reference to `libusb_close' +core/adb/client/usb_libusb.cpp.o: In function `libusb::process_device(libusb_device*)': +usb_libusb.cpp:(.text+0x2b69): undefined reference to `libusb_get_device_descriptor' +usb_libusb.cpp:(.text+0x2c07): undefined reference to `libusb_get_active_config_descriptor' +usb_libusb.cpp:(.text+0x2e23): undefined reference to `libusb_free_config_descriptor' +usb_libusb.cpp:(.text+0x31ea): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x34f0): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x3557): undefined reference to `libusb_open' +usb_libusb.cpp:(.text+0x35b2): undefined reference to `libusb_get_string_descriptor_ascii' +usb_libusb.cpp:(.text+0x35e5): undefined reference to `libusb_claim_interface' +usb_libusb.cpp:(.text+0x36a9): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x36d9): undefined reference to `libusb_close' +usb_libusb.cpp:(.text+0x3796): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x37e4): undefined reference to `libusb_get_port_numbers' +usb_libusb.cpp:(.text+0x3800): undefined reference to `libusb_get_bus_number' +usb_libusb.cpp:(.text+0x3a79): undefined reference to `libusb_alloc_transfer' +usb_libusb.cpp:(.text+0x3ae4): undefined reference to `libusb_alloc_transfer' +usb_libusb.cpp:(.text+0x3c19): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text+0x3c31): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text+0x3d45): undefined reference to `libusb_free_config_descriptor' +usb_libusb.cpp:(.text+0x4165): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x418c): undefined reference to `libusb_set_interface_alt_setting' +usb_libusb.cpp:(.text+0x41ad): undefined reference to `libusb_clear_halt' +usb_libusb.cpp:(.text+0x41c7): undefined reference to `libusb_clear_halt' +usb_libusb.cpp:(.text+0x42f9): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x4328): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text+0x438b): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text+0x4397): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text+0x43a6): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text+0x43ae): undefined reference to `libusb_close' +usb_libusb.cpp:(.text+0x44cd): undefined reference to `libusb_error_name' +usb_libusb.cpp:(.text+0x459e): undefined reference to `libusb_close' +usb_libusb.cpp:(.text+0x45a6): undefined reference to `libusb_free_config_descriptor' +usb_libusb.cpp:(.text+0x4693): undefined reference to `libusb_free_transfer' +core/adb/client/usb_libusb.cpp.o: In function `std::thread::_State_impl<std::thread::_Invoker<std::tuple<libusb::device_connected(libusb_device*)::{lambda()#1}> > >::_M_run()': +usb_libusb.cpp:(.text+0x49ff): undefined reference to `libusb_get_port_numbers' +usb_libusb.cpp:(.text+0x4a1a): undefined reference to `libusb_get_bus_number' +core/adb/client/usb_libusb.cpp.o: In function `libusb::usb_cleanup()': +usb_libusb.cpp:(.text+0x6f9): undefined reference to `libusb_hotplug_deregister_callback' +core/adb/client/usb_libusb.cpp.o: In function `std::default_delete<libusb::usb_handle>::operator()(libusb::usb_handle*) const [clone .isra.51] [clone .part.52]': +usb_libusb.cpp:(.text.unlikely+0x7f): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text.unlikely+0x8b): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text.unlikely+0x9a): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text.unlikely+0xa2): undefined reference to `libusb_close' +usb_libusb.cpp:(.text.unlikely+0xc8): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text.unlikely+0xe0): undefined reference to `libusb_free_transfer' +core/adb/client/usb_libusb.cpp.o: In function `std::_Hashtable<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::unique_ptr<libusb::usb_handle, std::default_delete<libusb::usb_handle> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::unique_ptr<libusb::usb_handle, std::default_delete<libusb::usb_handle> > > >, std::__detail::_Select1st, std::equal_to<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::hash<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >::_M_erase(unsigned long, std::__detail::_Hash_node_base*, std::__detail::_Hash_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::unique_ptr<libusb::usb_handle, std::default_delete<libusb::usb_handle> > >, true>*)': +usb_libusb.cpp:(.text._ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE[_ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE]+0xb5): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text._ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE[_ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE]+0xcd): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text._ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE[_ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE]+0x1d4): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text._ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE[_ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE]+0x1e0): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text._ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE[_ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE]+0x1ef): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text._ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE[_ZNSt10_HashtableINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St10unique_ptrIN6libusb10usb_handleESt14default_deleteISA_EEESaISE_ENSt8__detail10_Select1stESt8equal_toIS5_ESt4hashIS5_ENSG_18_Mod_range_hashingENSG_20_Default_ranged_hashENSG_20_Prime_rehash_policyENSG_17_Hashtable_traitsILb1ELb0ELb1EEEE8_M_eraseEmPNSG_15_Hash_node_baseEPNSG_10_Hash_nodeISE_Lb1EEE]+0x1f7): undefined reference to `libusb_close' +core/adb/client/usb_libusb.cpp.o: In function `std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::unique_ptr<libusb::usb_handle, std::default_delete<libusb::usb_handle> > >::~pair()': +usb_libusb.cpp:(.text._ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED2Ev[_ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED5Ev]+0x74): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text._ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED2Ev[_ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED5Ev]+0x8c): undefined reference to `libusb_free_transfer' +usb_libusb.cpp:(.text._ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED2Ev[_ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED5Ev]+0x144): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text._ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED2Ev[_ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED5Ev]+0x150): undefined reference to `libusb_cancel_transfer' +usb_libusb.cpp:(.text._ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED2Ev[_ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED5Ev]+0x15f): undefined reference to `libusb_release_interface' +usb_libusb.cpp:(.text._ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED2Ev[_ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10unique_ptrIN6libusb10usb_handleESt14default_deleteIS9_EEED5Ev]+0x167): undefined reference to `libusb_close' +core/adb/transport.cpp.o: In function `read_transport_thread(void*)': +transport.cpp:(.text+0x4ca2): undefined reference to `pthread_setname_np' +core/adb/transport.cpp.o: In function `write_transport_thread(void*)': +transport.cpp:(.text+0x5ad2): undefined reference to `pthread_setname_np' +core/adb/transport.cpp.o: In function `transport_registration_func(int, unsigned int, void*)': +transport.cpp:(.text+0x7b35): undefined reference to `pthread_create' +transport.cpp:(.text+0x7ba7): undefined reference to `pthread_create' +core/adb/transport_local.cpp.o: In function `local_init(int)': +transport_local.cpp:(.text+0x14d): undefined reference to `pthread_create' +core/adb/transport_local.cpp.o: In function `client_socket_thread(int)': +transport_local.cpp:(.text+0x1374): undefined reference to `pthread_setname_np' +core/adb/client/main.cpp.o: In function `adb_server_main(int, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)': +main.cpp:(.text+0x683): undefined reference to `pthread_create' +core/adb/client/usb_linux.cpp.o: In function `native::usb_kick(native::usb_handle*)': +usb_linux.cpp:(.text+0x2b6): undefined reference to `pthread_kill' +core/adb/client/usb_linux.cpp.o: In function `native::usb_init()': +usb_linux.cpp:(.text+0x681): undefined reference to `pthread_create' +core/adb/client/usb_linux.cpp.o: In function `native::device_poll_thread()': +usb_linux.cpp:(.text+0x3537): undefined reference to `pthread_setname_np' +core/liblog/logger_lock.c.o: In function `__android_log_trylock': +logger_lock.c:(.text+0x18): undefined reference to `pthread_mutex_trylock' +core/liblog/local_logger.c.o: In function `writeToLocalGetReadbleSize': +local_logger.c:(.text+0x2d): undefined reference to `pthread_rwlock_rdlock' +local_logger.c:(.text+0x52): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalGetSize': +local_logger.c:(.text+0x81): undefined reference to `pthread_rwlock_rdlock' +local_logger.c:(.text+0x99): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalSetSize': +local_logger.c:(.text+0xdc): undefined reference to `pthread_rwlock_wrlock' +local_logger.c:(.text+0xf4): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalClose': +local_logger.c:(.text+0x12c): undefined reference to `pthread_rwlock_wrlock' +core/liblog/local_logger.c.o: In function `writeToLocalClear': +local_logger.c:(.text+0x17c): undefined reference to `pthread_rwlock_wrlock' +local_logger.c:(.text+0x1c1): undefined reference to `pthread_rwlock_rdlock' +local_logger.c:(.text+0x1c9): undefined reference to `pthread_rwlock_unlock' +local_logger.c:(.text+0x200): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalPoll': +local_logger.c:(.text+0x2a3): undefined reference to `pthread_rwlock_rdlock' +local_logger.c:(.text+0x305): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalRead': +local_logger.c:(.text+0x34d): undefined reference to `pthread_rwlock_rdlock' +local_logger.c:(.text+0x3a4): undefined reference to `pthread_rwlock_unlock' +local_logger.c:(.text+0x420): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `LogBufferClear.constprop.5': +local_logger.c:(.text+0x4c9): undefined reference to `pthread_rwlock_wrlock' +core/liblog/local_logger.c.o: In function `writeToLocalInit': +local_logger.c:(.text+0x5c8): undefined reference to `pthread_rwlock_wrlock' +local_logger.c:(.text+0x662): undefined reference to `pthread_rwlock_unlock' +local_logger.c:(.text+0x67e): undefined reference to `pthread_rwlock_wrlock' +local_logger.c:(.text+0x6a1): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalWrite': +local_logger.c:(.text+0x7c7): undefined reference to `pthread_rwlock_wrlock' +local_logger.c:(.text+0x87d): undefined reference to `pthread_rwlock_rdlock' +local_logger.c:(.text+0x889): undefined reference to `pthread_rwlock_unlock' +local_logger.c:(.text+0x8c2): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalReset': +local_logger.c:(.text+0x98c): undefined reference to `pthread_rwlock_wrlock' +local_logger.c:(.text+0x9af): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `writeToLocalClose': +local_logger.c:(.text+0x144): undefined reference to `pthread_rwlock_unlock' +core/liblog/local_logger.c.o: In function `LogBufferClear.constprop.5': +local_logger.c:(.text+0x548): undefined reference to `pthread_rwlock_unlock' +core/libcutils/threads.cpp.o: In function `thread_store_set': +threads.cpp:(.text+0x61): undefined reference to `pthread_key_create' +core/libcutils/threads.cpp.o: In function `thread_store_get': +threads.cpp:(.text+0x2b): undefined reference to `pthread_getspecific' +core/libcutils/threads.cpp.o: In function `thread_store_set': +threads.cpp:(.text+0x83): undefined reference to `pthread_setspecific' +core/adb/services.cpp.o: In function `create_service_thread(char const*, void (*)(int, void*), void*)': +services.cpp:(.text+0xd5): undefined reference to `pthread_create' +core/adb/services.cpp.o: In function `service_bootstrap_func(void*)': +services.cpp:(.text+0x3de): undefined reference to `pthread_setname_np' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `thread_local_init': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:126: undefined reference to `pthread_key_create' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_MUTEX_init': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:31: undefined reference to `pthread_rwlock_init' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_MUTEX_lock_read': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:37: undefined reference to `pthread_rwlock_rdlock' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_MUTEX_lock_write': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:43: undefined reference to `pthread_rwlock_wrlock' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_MUTEX_unlock_read': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:49: undefined reference to `pthread_rwlock_unlock' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_STATIC_MUTEX_lock_read': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:65: undefined reference to `pthread_rwlock_rdlock' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_STATIC_MUTEX_lock_write': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:71: undefined reference to `pthread_rwlock_wrlock' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_STATIC_MUTEX_unlock_read': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:77: undefined reference to `pthread_rwlock_unlock' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_once': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:89: undefined reference to `pthread_once' +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:89: undefined reference to `pthread_once' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_get_thread_local': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:135: undefined reference to `pthread_getspecific' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_once': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:89: undefined reference to `pthread_once' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_set_thread_local': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:150: undefined reference to `pthread_getspecific' +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:158: undefined reference to `pthread_setspecific' +boringssl/build/crypto/libcrypto.a(thread_pthread.c.o): In function `CRYPTO_MUTEX_cleanup': +/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/git/boringssl/build/../crypto/thread_pthread.c:61: undefined reference to `pthread_rwlock_destroy' +collect2: error: ld returned 1 exit status +[6/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/include -c core/libutils/FileMap.cpp -o core/libutils/FileMap.cpp.o +[7/177] gcc -I/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -std=gnu11 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/libsparse/include -Icore/base/include -c core/libsparse/output_file.c -o core/libsparse/output_file.c.o +[8/177] gcc -I/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -std=gnu11 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -c extras/ext4_utils/ext4_utils.c -o extras/ext4_utils/ext4_utils.c.o +[9/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/libsparse/include -Icore/base/include -c core/libsparse/sparse_read.cpp -o core/libsparse/sparse_read.cpp.o +[10/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -DFASTBOOT_VERSION="\"9.0.0.r10\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg -c core/fastboot/socket.cpp -o core/fastboot/socket.cpp.o +[11/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -DFASTBOOT_VERSION="\"9.0.0.r10\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg -c core/fastboot/tcp.cpp -o core/fastboot/tcp.cpp.o +[12/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -DFASTBOOT_VERSION="\"9.0.0.r10\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg -c core/fastboot/udp.cpp -o core/fastboot/udp.cpp.o +[13/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -Icore/base/include -Icore/include -Icore/libziparchive/include -c core/libziparchive/zip_archive.cc -o core/libziparchive/zip_archive.cc.o +[14/177] g++ -std=gnu++17 -isystem/OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/recipe-sysroot-native/usr/include -O2 -pipe -DFASTBOOT_VERSION="\"9.0.0.r10\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg -c core/fastboot/fastboot.cpp -o core/fastboot/fastboot.cpp.o +ninja: build stopped: subcommand failed. +WARNING: /OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/temp/run.do_compile.12223:1 exit 1 from 'ninja' +ERROR: Function failed: do_compile (log file is located at /OE/build/owpb/webos-ports/tmp-glibc/work/x86_64-linux/android-tools-native/9.0.0.r10-r0/temp/log.do_compile.12223) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk b/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk deleted file mode 100644 index 519f609fd2..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile for mkbootimg - -SRCDIR ?= $(S) - -VPATH += $(SRCDIR)/system/core/mkbootimg -mkbootimg_SRC_FILES += mkbootimg.c -mkbootimg_OBJS := $(mkbootimg_SRC_FILES:.c=.o) - -VPATH += $(SRCDIR)/system/core/libmincrypt -libmincrypt_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c -libmincrypt_OBJS := $(libmincrypt_SRC_FILES:.c=.o) - -CFLAGS += -DANDROID -CFLAGS += -I$(SRCDIR)/system/core/mkbootimg -CFLAGS += -I$(SRCDIR)/system/core/include -CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h - -LIBS += libmincrypt.a - -all: mkbootimg - -mkbootimg: libmincrypt.a $(mkbootimg_OBJS) - $(CC) -o $@ $(LDFLAGS) $(mkbootimg_OBJS) $(LIBS) - -libmincrypt.a: $(libmincrypt_OBJS) - $(AR) rcs $@ $(libmincrypt_OBJS) - -clean: - $(RM) $(mkbootimg_OBJS) $(libmincrypt_OBJS) mkbootimg *.a diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/stdatomic.patch b/meta-oe/recipes-devtools/android-tools/android-tools/stdatomic.patch new file mode 100644 index 0000000000..07d870ff7f --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/stdatomic.patch @@ -0,0 +1,54 @@ +Description: Fix `stdatomic.h` in g++ + `stdatomic.h` cannot be consumed by g++ because they refuse to implement + keywords like `_Atomic`, while Clang does. +Author: Kai-Chung Yan +Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932 +--- a/adb/adb_trace.h ++++ b/adb/adb_trace.h +@@ -62,7 +62,10 @@ + #include <atomic> + + #define ATRACE_TAG ATRACE_TAG_ADB ++extern "C" { ++using namespace std; + #include <cutils/trace.h> ++} + #include <utils/Trace.h> + + #endif /* __ADB_TRACE_H */ +--- a/libcutils/include/cutils/trace.h ++++ b/libcutils/include/cutils/trace.h +@@ -18,7 +18,9 @@ + #define _LIBS_CUTILS_TRACE_H + + #include <inttypes.h> ++#ifndef __cplusplus + #include <stdatomic.h> ++#endif + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> +--- a/libcutils/include/cutils/atomic.h ++++ b/libcutils/include/cutils/atomic.h +@@ -19,7 +19,9 @@ + + #include <stdint.h> + #include <sys/types.h> ++#ifndef __cplusplus + #include <stdatomic.h> ++#endif + + #ifndef ANDROID_ATOMIC_INLINE + #define ANDROID_ATOMIC_INLINE static inline +--- a/libutils/include/utils/Atomic.h ++++ b/libutils/include/utils/Atomic.h +@@ -17,6 +17,9 @@ + #ifndef ANDROID_UTILS_ATOMIC_H + #define ANDROID_UTILS_ATOMIC_H + ++extern "C" { ++using namespace std; + #include <cutils/atomic.h> ++} + + #endif // ANDROID_UTILS_ATOMIC_H diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb deleted file mode 100644 index 2604f65e1f..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ /dev/null @@ -1,161 +0,0 @@ -DESCRIPTION = "Different utilities from Android" -SECTION = "console/utils" -LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" -LIC_FILES_CHKSUM = " \ - file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ - file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ -" -DEPENDS = "libbsd libpcre zlib libcap" -DEPENDS_append_class-target = " openssl10" - -ANDROID_MIRROR = "android.googlesource.com" - -# matches with android-5.1.1_r37 -SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e" -SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205" -SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b" -SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb" -SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc" - -SRC_URI = " \ - git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \ - git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \ - git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \ - git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \ - git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=git/build \ - file://core/0001-adb-remove-selinux-extensions.patch;patchdir=system/core \ - file://core/0002-adb-Use-local-sockets-where-appropriate.patch;patchdir=system/core \ - file://core/0003-adb-define-shell-command.patch;patchdir=system/core \ - file://core/0004-adb-Fix-build-on-big-endian-systems.patch;patchdir=system/core \ - file://core/0005-adb-add-base64-implementation.patch;patchdir=system/core \ - file://core/0006-adb-Musl-fixes.patch;patchdir=system/core \ - file://core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch;patchdir=system/core \ - file://core/0008-adb-Allow-adbd-to-be-ran-as-root.patch;patchdir=system/core \ - file://core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch;patchdir=system/core \ - file://core/0010-Use-linux-capability.h-on-linux-systems-too.patch;patchdir=system/core \ - file://core/0011-Remove-bionic-specific-calls.patch;patchdir=system/core \ - file://core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch;patchdir=system/core \ - file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \ - file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \ - file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \ - file://android-tools-adbd.service \ - file://gitignore \ - file://adb.mk;subdir=${BPN} \ - file://adbd.mk;subdir=${BPN} \ - file://ext4_utils.mk;subdir=${BPN} \ - file://fastboot.mk;subdir=${BPN} \ - file://mkbootimg.mk;subdir=${BPN} \ -" - - -S = "${WORKDIR}/git" -B = "${WORKDIR}/${BPN}" - -# http://errors.yoctoproject.org/Errors/Details/133881/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -inherit systemd - -SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" - -# Find libbsd headers during native builds -CC_append_class-native = " -I${STAGING_INCDIR}" -CC_append_class-nativesdk = " -I${STAGING_INCDIR}" - -TOOLS = "adb fastboot ext4_utils mkbootimg adbd" - -# Adb needs sys/capability.h, which is not available for native* -TOOLS_class-native = "fastboot ext4_utils mkbootimg" -TOOLS_class-nativesdk = "fastboot ext4_utils mkbootimg" - -do_compile() { - cp ${WORKDIR}/gitignore ${S}/.gitignore - - # Setting both variables below causing our makefiles to not work with - # implicit make rules - unset CFLAGS - unset CPPFLAGS - - export SRCDIR=${S} - - case "${HOST_ARCH}" in - arm) - export android_arch=linux-arm - ;; - aarch64) - export android_arch=linux-arm64 - ;; - mips|mipsel) - export android_arch=linux-mips - ;; - powerpc|powerpc64) - export android_arch=linux-ppc - ;; - i586|x86_64) - export android_arch=linux-x86 - ;; - esac - - for tool in ${TOOLS}; do - mkdir -p ${B}/${tool} - oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} - done -} - -do_install() { - if echo ${TOOLS} | grep -q "ext4_utils" ; then - install -D -p -m0755 ${S}/system/core/libsparse/simg_dump.py ${D}${bindir}/simg_dump - install -D -p -m0755 ${S}/system/extras/ext4_utils/mkuserimg.sh ${D}${bindir}/mkuserimg - - install -m0755 ${B}/ext4_utils/ext2simg ${D}${bindir} - install -m0755 ${B}/ext4_utils/ext4fixup ${D}${bindir} - install -m0755 ${B}/ext4_utils/img2simg ${D}${bindir} - install -m0755 ${B}/ext4_utils/make_ext4fs ${D}${bindir} - install -m0755 ${B}/ext4_utils/simg2img ${D}${bindir} - install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir} - fi - - if echo ${TOOLS} | grep -q "adb " ; then - install -d ${D}${bindir} - install -m0755 ${B}/adb/adb ${D}${bindir} - fi - - if echo ${TOOLS} | grep -q "adbd" ; then - install -d ${D}${bindir} - install -m0755 ${B}/adbd/adbd ${D}${bindir} - fi - - # Outside the if statement to avoid errors during do_package - install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ - ${D}${systemd_unitdir}/system/android-tools-adbd.service - - if echo ${TOOLS} | grep -q "fastboot" ; then - install -d ${D}${bindir} - install -m0755 ${B}/fastboot/fastboot ${D}${bindir} - fi - - if echo ${TOOLS} | grep -q "mkbootimg" ; then - install -d ${D}${bindir} - install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir} - fi -} - -PACKAGES += "${PN}-fstools" - -RDEPENDS_${BPN} = "${BPN}-conf bash" - -FILES_${PN}-fstools = "\ - ${bindir}/ext2simg \ - ${bindir}/ext4fixup \ - ${bindir}/img2simg \ - ${bindir}/make_ext4fs \ - ${bindir}/simg2img \ - ${bindir}/simg2simg \ - ${bindir}/simg_dump \ - ${bindir}/mkuserimg \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_9.0.0.r10.bb b/meta-oe/recipes-devtools/android-tools/android-tools_9.0.0.r10.bb new file mode 100644 index 0000000000..7b06234b87 --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools_9.0.0.r10.bb @@ -0,0 +1,117 @@ +SUMMARY = "Different utilities from Android" +SECTION = "console/utils" +LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" +LIC_FILES_CHKSUM = " \ + file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ + file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=8bef8e6712b1be5aa76af1ebde9d6378 \ + file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ +" +DEPENDS = "libbsd libpcre zlib libcap ruby-native cmake-native ninja-native go-native libusb1 gtest" + +# matches with android-9.0.0_r10 +SRCREV_core = "c8a633cd4782fd594af3f06b80ba7ee780ce65d6" +SRCREV_extras = "740a3c436188f9ad615f830e599f15506962cbcd" +SRCREV_selinux = "c679e266062e711dcf892dacd9c0cb978fde5a8a" +SRCREV_f2fs-tools = "23f82306bb2ca2553afe6791be10f93e68111da9" +SRCREV_e2fsprogs = "f63aeea08e882dad0520a1df0c57e6578d738bfe" +# instead of platfrom/external/boringssl from: +# git://${ANDROID_MIRROR}/platform/external/boringssl;name=boringssl;protocol=https;nobranch=1;destsuffix=git/boringssl \ +# SRCREV_boringssl = "8c2f177d0c90eac12f6bb9a264d383e8302148f1" +# we use the standalone one (because it has cmake support) with matching SRCREV from: +# https://android.googlesource.com/platform/external/boringssl/+/android-9.0.0_r10/BORINGSSL_REVISION +SRCREV_boringssl = "45210dd4e21ace9d28cb76b3f83303fcdd2efcce" +ANDROID_MIRROR = "android.googlesource.com" + +SRC_URI = " \ + git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/core \ + git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/extras \ + git://${ANDROID_MIRROR}/platform/external/selinux;name=selinux;protocol=https;nobranch=1;destsuffix=git/selinux \ + git://${ANDROID_MIRROR}/platform/external/f2fs-tools;name=f2fs-tools;protocol=https;nobranch=1;destsuffix=git/f2fs-tools \ + git://${ANDROID_MIRROR}/platform/external/e2fsprogs;name=e2fsprogs;protocol=https;nobranch=1;destsuffix=git/e2fsprogs \ + git://boringssl.googlesource.com/boringssl;name=boringssl;protocol=https;nobranch=1;destsuffix=git/boringssl \ + file://fix_build_core.patch;patchdir=core \ + file://stdatomic.patch;patchdir=core \ + file://Nonnull.patch;patchdir=core \ + file://fix_build_e2fsprogs.patch;patchdir=e2fsprogs \ + file://fix_build_selinux.patch;patchdir=selinux \ + file://generate_build.rb \ +" + +S = "${WORKDIR}/git" + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "android-tools-adbd.service" + +# Find libbsd headers during native builds +CC_append_class-native = " -I${STAGING_INCDIR}" +CC_append_class-nativesdk = " -I${STAGING_INCDIR}" + +TOOLS = "adb mke2fs.android fastboot e2fsdroid ext2simg ext4_utils mkbootimg adbd" + +# Adb needs sys/capability.h, which is not available for native* +TOOLS_class-native = "fastboot ext4_utils mkbootimg" +TOOLS_class-nativesdk = "fastboot ext4_utils mkbootimg" + +do_compile() { + PKGVER=${PV} ruby ${WORKDIR}/generate_build.rb > build.ninja + [ -d ${S}/boringssl/build ] && rm -rf ${S}/boringssl/build + mkdir ${S}/boringssl/build && cd ${S}/boringssl/build && cmake -G Ninja -DCMAKE_MAKE_PROGRAM=ninja ..; ninja; cd - + ninja +} + +do_install() { + if echo ${TOOLS} | grep -q "ext4_utils" ; then + install -D -p -m0755 ${S}/system/core/libsparse/simg_dump.py ${D}${bindir}/simg_dump + install -D -p -m0755 ${S}/system/extras/ext4_utils/mkuserimg.sh ${D}${bindir}/mkuserimg + + install -m0755 ${B}/ext4_utils/ext2simg ${D}${bindir} + install -m0755 ${B}/ext4_utils/ext4fixup ${D}${bindir} + install -m0755 ${B}/ext4_utils/img2simg ${D}${bindir} + install -m0755 ${B}/ext4_utils/make_ext4fs ${D}${bindir} + install -m0755 ${B}/ext4_utils/simg2img ${D}${bindir} + install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir} + fi + + if echo ${TOOLS} | grep -q "adb " ; then + install -d ${D}${bindir} + install -m0755 ${B}/adb/adb ${D}${bindir} + fi + + if echo ${TOOLS} | grep -q "adbd" ; then + install -d ${D}${bindir} + install -m0755 ${B}/adbd/adbd ${D}${bindir} + fi + + # Outside the if statement to avoid errors during do_package + install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ + ${D}${systemd_unitdir}/system/android-tools-adbd.service + + if echo ${TOOLS} | grep -q "fastboot" ; then + install -d ${D}${bindir} + install -m0755 ${B}/fastboot/fastboot ${D}${bindir} + fi + + if echo ${TOOLS} | grep -q "mkbootimg" ; then + install -d ${D}${bindir} + install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir} + fi +} + +PACKAGES += "${PN}-fstools" + +RDEPENDS_${BPN} = "${BPN}-conf bash" + +FILES_${PN}-fstools = "\ + ${bindir}/ext2simg \ + ${bindir}/ext4fixup \ + ${bindir}/img2simg \ + ${bindir}/make_ext4fs \ + ${bindir}/simg2img \ + ${bindir}/simg2simg \ + ${bindir}/simg_dump \ + ${bindir}/mkuserimg \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch deleted file mode 100644 index 07cb8a366e..0000000000 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch +++ /dev/null @@ -1,242 +0,0 @@ -From b90c8f3b60bfe5dbed2823620242e9d30b9eb28f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 28 Jun 2017 19:01:18 -0700 -Subject: [PATCH] Replace use of struct ucontext with ucontext_t - -glibc 2.26 would not expose struct ucontext anymore - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - .../linux/dump_writer_common/ucontext_reader.cc | 32 +++++++++++----------- - .../linux/dump_writer_common/ucontext_reader.h | 14 +++++----- - src/client/linux/handler/exception_handler.cc | 10 +++---- - src/client/linux/handler/exception_handler.h | 4 +-- - .../linux/microdump_writer/microdump_writer.cc | 2 +- - .../linux/minidump_writer/minidump_writer.cc | 2 +- - 6 files changed, 32 insertions(+), 32 deletions(-) - -diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc -index c80724dd..052ce37c 100644 ---- a/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 -diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4b..2de80b70 100644 ---- a/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index 586d84e9..05936d28 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); -@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h -index daba57e0..25598a29 100644 ---- a/src/client/linux/handler/exception_handler.h -+++ b/src/client/linux/handler/exception_handler.h -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // ucontext_t so 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff --git a/src/client/linux/microdump_writer/microdump_writer.cc b/src/client/linux/microdump_writer/microdump_writer.cc -index 3764eec2..80ad5c46 100644 ---- a/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/src/client/linux/microdump_writer/microdump_writer.cc -@@ -593,7 +593,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc -index d11ba6e5..c7161434 100644 ---- a/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1323,7 +1323,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif --- -2.13.2 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch deleted file mode 100644 index bc62829811..0000000000 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 806964f852773e427fea82a7716d44ce3be4498c Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Sun, 1 Feb 2015 14:27:32 +0100 -Subject: [PATCH 2/3] Avoid using basename - ---- - src/common/linux/dump_symbols.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc -index d029ca14..6ac4a17b 100644 ---- a/src/common/linux/dump_symbols.cc -+++ b/src/common/linux/dump_symbols.cc -@@ -881,9 +881,9 @@ const char* ElfArchitecture(const typename ElfClass::Ehdr* elf_header) { - // last slash, or the whole filename if there are no slashes. - string BaseFileName(const string &filename) { - // Lots of copies! basename's behavior is less than ideal. -- char* c_filename = strdup(filename.c_str()); -- string base = basename(c_filename); -- free(c_filename); -+ const char *c_filename = filename.c_str(); -+ const char *p = strrchr(c_filename, '/'); -+ string base = p ? p+1 : c_filename; - return base; - } - --- -2.14.1 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch deleted file mode 100644 index 852c1ed2ca..0000000000 --- a/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bbf2b5ed5d93b227df8aea5726727b48e29f6790 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 14 Sep 2017 23:35:40 -0700 -Subject: [PATCH 5/5] md2core: Replace basename() - -musl does not provide it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/tools/linux/md2core/minidump-2-core.cc | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc -index 6a9e28eb..52b81c22 100644 ---- a/src/tools/linux/md2core/minidump-2-core.cc -+++ b/src/tools/linux/md2core/minidump-2-core.cc -@@ -107,6 +107,9 @@ struct Options { - - static void - Usage(int argc, const char* argv[]) { -+ const char *c_filename = argv[0];; -+ const char *p = strrchr(c_filename, '/'); -+ const char *base = p ? p+1 : c_filename; - fprintf(stderr, - "Usage: %s [options] <minidump file>\n" - "\n" -@@ -133,7 +136,7 @@ Usage(int argc, const char* argv[]) { - " lookups to be done in this directory rather than the filesystem\n" - " layout as it exists in the crashing image. This path should end\n" - " with a slash if it's a directory. e.g. /var/lib/breakpad/\n" -- "", basename(argv[0])); -+ "", base); - } - - static void --- -2.14.1 - diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch b/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch new file mode 100644 index 0000000000..b1c37fc8e9 --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch @@ -0,0 +1,30 @@ +Do not add stack pointer to clobber list + +it was being ignored until gcc 9.0 became capable +of flagging this silent ignoring via [1] + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813<Paste> + +Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/third_party/lss/linux_syscall_support.h ++++ b/src/third_party/lss/linux_syscall_support.h +@@ -1966,7 +1966,7 @@ struct kernel_statfs { + __asm__ volatile(LSS_ENTRYPOINT \ + : "=a" (__res) \ + : "0" (__NR_##name) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + #undef _syscall1 +@@ -2407,7 +2407,7 @@ struct kernel_statfs { + "d"(LSS_SYSCALL_ARG(parent_tidptr)), + "r"(LSS_SYSCALL_ARG(newtls)), + "r"(LSS_SYSCALL_ARG(child_tidptr)) +- : "rsp", "memory", "r8", "r10", "r11", "rcx"); ++ : "memory", "r8", "r10", "r11", "rcx"); + } + LSS_RETURN(int, __res); + } diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index d9773c9a6e..5f9a72e0ac 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -13,16 +13,17 @@ inherit autotools BBCLASSEXTEND = "native" -PE = "1" +PE = "2" -PV = "1.0+git${SRCPV}" +PV = "1.0" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" -SRCREV_breakpad = "dea867e76f24e4a68395684b9d1cf24bcef82f20" +SRCREV_breakpad = "5467393a3d1e7ab929fd01d79971701bf4e2c2c6" +#v1.8.0 SRCREV_gtest = "ec44c6c1675c25b9827aacd08c02433cccde7780" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" -SRCREV_lss = "a91633d172407f6c83dd69af11510b37afebb7f9" +SRCREV_lss = "a89bf7903f3169e6bc7b8efc10a73a7571de21cf" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRC_URI = "git://github.com/google/breakpad;name=breakpad \ @@ -30,26 +31,24 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \ git://github.com/google/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf \ git://chromium.googlesource.com/linux-syscall-support;protocol=https;destsuffix=git/src/third_party/lss;name=lss \ git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp \ - file://0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch \ file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ - file://0002-Avoid-using-basename.patch \ file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ file://0001-Turn-off-sign-compare-for-musl-libc.patch \ file://0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch \ file://0003-Dont-include-stab.h.patch \ file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ - file://0005-md2core-Replace-basename.patch \ file://0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch \ file://mcontext.patch \ file://0001-disable-calls-to-getcontext-with-musl.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ + file://dont-clobber-rsp.patch \ " S = "${WORKDIR}/git" CXXFLAGS += "-D_GNU_SOURCE" -COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" +COMPATIBLE_HOST_powerpc = "null" do_install_append() { install -d ${D}${includedir} @@ -72,7 +71,7 @@ do_install_append() { install -m 0644 ${S}/src/client/linux/minidump_writer/minidump_writer.h ${D}${includedir}/breakpad/client/linux/minidump_writer/minidump_writer.h install -d ${D}${includedir}/breakpad/common - install -m 0644 ${S}/src/common/memory.h ${D}${includedir}/breakpad/common/memory.h + install -m 0644 ${S}/src/common/memory_allocator.h ${D}${includedir}/breakpad/common/memory_allocator.h install -m 0644 ${S}/src/common/scoped_ptr.h ${D}${includedir}/breakpad/common/scoped_ptr.h install -m 0644 ${S}/src/common/using_std_string.h ${D}${includedir}/breakpad/common/using_std_string.h @@ -120,4 +119,5 @@ breakpad_populate_sysroot() { #| {standard input}:2184: Error: Thumb does not support this addressing mode -- `str r6,[r1,#-4]!' #| {standard input}:2191: Error: lo register required -- `ldr pc,[sp]' #| make: *** [src/client/linux/handler/exception_handler.o] Error 1 -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service deleted file mode 100644 index cb9b6e2db9..0000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" standalone='no'?><!--*-nxml-*--> -<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> - -<service-group> - <name replace-wildcards="yes">Cloud9 IDE on %h</name> - <service> - <type>_http._tcp</type> - <port>3000</port> - </service> -</service-group> diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service deleted file mode 100644 index 495b131ffa..0000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Cloud9 IDE -ConditionPathExists=|/var/lib/cloud9 - -[Service] -Restart=always -EnvironmentFile=-/etc/default/node -ExecStart=/usr/bin/node4 /usr/share/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000 - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/index.js b/meta-oe/recipes-devtools/cloud9/cloud9/index.js deleted file mode 100644 index 88c9a19f0e..0000000000 --- a/meta-oe/recipes-devtools/cloud9/cloud9/index.js +++ /dev/null @@ -1,2 +0,0 @@ -var o3 = require('./o3.js') -module.exports = o3.xml; diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb index 5dd1bdd4ee..533a00026e 100644 --- a/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb +++ b/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb @@ -7,17 +7,15 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ - file://0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch" -SRC_URI[md5sum] = "1c46a6662626c5a6eaca626f23a5a7d7" -SRC_URI[sha256sum] = "667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865" + " +SRC_URI[md5sum] = "b3b4e44ef49575043a91def0207dcc76" +SRC_URI[sha256sum] = "967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" # The install rule from the Makefile has hardcoded paths, so we duplicate # the actions to accommodate different paths. do_install () { - install -d -m755 ${D}/${bindir} - install -m755 ${B}/cpuid ${D}/${bindir}/cpuid - install -d -m755 ${D}/${mandir} - install -m444 ${B}/cpuid.man.gz ${D}/${mandir} + install -D -m 0755 ${B}/cpuid ${D}/${bindir}/cpuid + install -D -m 0444 ${B}/cpuid.man.gz ${D}/${mandir} } diff --git a/meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch b/meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch deleted file mode 100644 index 985182e3bd..0000000000 --- a/meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2693a499d4eec4504962e85a9713fa6431d3025f Mon Sep 17 00:00:00 2001 -From: Avinash Reddy Palleti <avinash.reddy.palleti@intel.com> -Date: Thu, 16 Aug 2018 22:36:31 +0530 -Subject: [PATCH] Fix: Add sys/sysmacros.h to fix build issue - ---- - cpuid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cpuid.c b/cpuid.c -index 3c94837..0a98616 100644 ---- a/cpuid.c -+++ b/cpuid.c -@@ -31,6 +31,7 @@ - #include <stdio.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <fcntl.h> - #include <errno.h> - #include <unistd.h> --- -2.7.4 - diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch new file mode 100644 index 0000000000..bbebc4dc74 --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch @@ -0,0 +1,94 @@ +From 81b213b98f51ec3eed5774f6f797c074ac35db3e Mon Sep 17 00:00:00 2001 +From: Ton van den Heuvel <tonvandenheuvel@gmail.com> +Date: Mon, 6 May 2019 15:17:28 +0200 +Subject: [PATCH] Fix #6906 + +Generate configvalues.h only as a dependency for the VHDL parser. Fixes +a problem in combination with Ninja v1.9.0 because of duplicate rules +for generating configvalues.h. + +Upstream-Status: Backport +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- + addon/doxyapp/CMakeLists.txt | 8 -------- + addon/doxyparse/CMakeLists.txt | 8 -------- + src/CMakeLists.txt | 4 ++++ + vhdlparser/CMakeLists.txt | 12 +++--------- + 4 files changed, 7 insertions(+), 25 deletions(-) + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index a7377112..0aaf4655 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,11 +1,3 @@ +-# configvalues.h +-add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h +- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py +- OUTPUT ${GENERATED_SRC}/configvalues.h +-) +-set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +- + find_package(Iconv) + + include_directories( +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index ff198fb4..1620c72e 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,11 +1,3 @@ +-# configvalues.h +-add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h +- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py +- OUTPUT ${GENERATED_SRC}/configvalues.h +-) +-set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +- + find_package(Iconv) + + include_directories( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 92a302ab..37a21ff6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -43,6 +43,10 @@ add_custom_command( + OUTPUT ${GENERATED_SRC}/configvalues.h + ) + set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) ++add_custom_target( ++ generate_configvalues_header ++ DEPENDS ${GENERATED_SRC}/configvalues.h ++) + + # configvalues.cpp + add_custom_command( +diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt +index 71e97df5..f89008c5 100644 +--- a/vhdlparser/CMakeLists.txt ++++ b/vhdlparser/CMakeLists.txt +@@ -1,14 +1,5 @@ +-# configvalues.h +-add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h +- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py +- OUTPUT ${GENERATED_SRC}/configvalues.h +-) +-set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +- + include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) + add_library(vhdlparser STATIC +-${GENERATED_SRC}/configvalues.h + CharStream.cc + ParseException.cc + Token.cc +@@ -17,3 +8,6 @@ VhdlParser.cc + VhdlParserTokenManager.cc + VhdlParserIF.cpp + ) ++add_dependencies(vhdlparser ++ generate_configvalues_header ++) +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch new file mode 100644 index 0000000000..c86dc1691e --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch @@ -0,0 +1,36 @@ +From 24650b0c7db6b213a2eaa5061b75b9f1b43f1ce9 Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski <brgl@bgdev.pl> +Date: Fri, 23 Nov 2018 11:44:56 +0100 +Subject: [PATCH] build: don't look for Iconv + +Drop the find_package() for Iconv. CMake is unable to find iconv.h in +native build but all modern systems supply it as part of the standard +C library. We don't need this check in meta-openembedded. + +Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> + +Upstream-status: Inappropriate +- upstream doxygen must build on many architectures, this change is + too intrusive for upstream +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45c2f2c1..22cf0144 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,10 +92,6 @@ if (sqlite3) + endif() + endif() + +-find_package(Iconv REQUIRED) +-include_directories(${ICONV_INCLUDE_DIR}) +- +- + #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") + set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) + set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb new file mode 100644 index 0000000000..b49fbd4d02 --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." +HOMEPAGE = "http://www.doxygen.org/" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ + file://0001-build-don-t-look-for-Iconv.patch \ + file://0001-Fix-6906.patch" +SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3" +SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d" + +inherit cmake python3native + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch b/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch deleted file mode 100644 index a7a42f9814..0000000000 --- a/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8b44dc65d98d50b462843ac9dab6fe3fc25abe36 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@siemens.com> -Date: Fri, 12 May 2017 13:54:49 +0200 -Subject: [PATCH] correct version for so lib - -Upstream-Status: Pending - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3670afe..f4fcd2c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -172,6 +172,7 @@ endif() - if(FLATBUFFERS_BUILD_SHAREDLIB) - add_library(flatbuffers_shared SHARED ${FlatBuffers_Library_SRCS}) - set_target_properties(flatbuffers_shared PROPERTIES OUTPUT_NAME flatbuffers) -+ set_target_properties(flatbuffers_shared PROPERTIES VERSION "${PV}") - endif() - - function(compile_flatbuffers_schema_to_cpp SRC_FBS) --- -2.1.4 - diff --git a/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch b/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch deleted file mode 100644 index d736f012bb..0000000000 --- a/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch +++ /dev/null @@ -1,113 +0,0 @@ -From a614d8e20fa9e4fd16b699d581ddac2956c120f5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Sep 2017 10:04:02 -0700 -Subject: [PATCH 1/2] flatbuffers: Move EndianSwap template to - flatbuffers/base.h - -Clang complains -call to function 'EndianSwap' that is neither visible in the template definition nor found by argument-dependent lookup - return EndianSwap(t); - -This seems to be due to limitation of two-phase lookup of dependent names in template definitions - -Its not being found using associated namespaces therefore -it has to be made visible at the template definition site as well - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - include/flatbuffers/base.h | 33 +++++++++++++++++++++++++++++++++ - include/flatbuffers/flatbuffers.h | 32 -------------------------------- - 2 files changed, 33 insertions(+), 32 deletions(-) - -diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h -index f051755..c73fb2d 100644 ---- a/include/flatbuffers/base.h -+++ b/include/flatbuffers/base.h -@@ -150,6 +150,39 @@ typedef uintmax_t largest_scalar_t; - // We support aligning the contents of buffers up to this size. - #define FLATBUFFERS_MAX_ALIGNMENT 16 - -+template<typename T> T EndianSwap(T t) { -+ #if defined(_MSC_VER) -+ #define FLATBUFFERS_BYTESWAP16 _byteswap_ushort -+ #define FLATBUFFERS_BYTESWAP32 _byteswap_ulong -+ #define FLATBUFFERS_BYTESWAP64 _byteswap_uint64 -+ #else -+ #if defined(__GNUC__) && __GNUC__ * 100 + __GNUC_MINOR__ < 408 -+ // __builtin_bswap16 was missing prior to GCC 4.8. -+ #define FLATBUFFERS_BYTESWAP16(x) \ -+ static_cast<uint16_t>(__builtin_bswap32(static_cast<uint32_t>(x) << 16)) -+ #else -+ #define FLATBUFFERS_BYTESWAP16 __builtin_bswap16 -+ #endif -+ #define FLATBUFFERS_BYTESWAP32 __builtin_bswap32 -+ #define FLATBUFFERS_BYTESWAP64 __builtin_bswap64 -+ #endif -+ if (sizeof(T) == 1) { // Compile-time if-then's. -+ return t; -+ } else if (sizeof(T) == 2) { -+ auto r = FLATBUFFERS_BYTESWAP16(*reinterpret_cast<uint16_t *>(&t)); -+ return *reinterpret_cast<T *>(&r); -+ } else if (sizeof(T) == 4) { -+ auto r = FLATBUFFERS_BYTESWAP32(*reinterpret_cast<uint32_t *>(&t)); -+ return *reinterpret_cast<T *>(&r); -+ } else if (sizeof(T) == 8) { -+ auto r = FLATBUFFERS_BYTESWAP64(*reinterpret_cast<uint64_t *>(&t)); -+ return *reinterpret_cast<T *>(&r); -+ } else { -+ assert(0); -+ } -+} -+ -+ - template<typename T> T EndianScalar(T t) { - #if FLATBUFFERS_LITTLEENDIAN - return t; -diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h -index 9216cf4..f749dcb 100644 ---- a/include/flatbuffers/flatbuffers.h -+++ b/include/flatbuffers/flatbuffers.h -@@ -37,38 +37,6 @@ inline void EndianCheck() { - (void)endiantest; - } - --template<typename T> T EndianSwap(T t) { -- #if defined(_MSC_VER) -- #define FLATBUFFERS_BYTESWAP16 _byteswap_ushort -- #define FLATBUFFERS_BYTESWAP32 _byteswap_ulong -- #define FLATBUFFERS_BYTESWAP64 _byteswap_uint64 -- #else -- #if defined(__GNUC__) && __GNUC__ * 100 + __GNUC_MINOR__ < 408 -- // __builtin_bswap16 was missing prior to GCC 4.8. -- #define FLATBUFFERS_BYTESWAP16(x) \ -- static_cast<uint16_t>(__builtin_bswap32(static_cast<uint32_t>(x) << 16)) -- #else -- #define FLATBUFFERS_BYTESWAP16 __builtin_bswap16 -- #endif -- #define FLATBUFFERS_BYTESWAP32 __builtin_bswap32 -- #define FLATBUFFERS_BYTESWAP64 __builtin_bswap64 -- #endif -- if (sizeof(T) == 1) { // Compile-time if-then's. -- return t; -- } else if (sizeof(T) == 2) { -- auto r = FLATBUFFERS_BYTESWAP16(*reinterpret_cast<uint16_t *>(&t)); -- return *reinterpret_cast<T *>(&r); -- } else if (sizeof(T) == 4) { -- auto r = FLATBUFFERS_BYTESWAP32(*reinterpret_cast<uint32_t *>(&t)); -- return *reinterpret_cast<T *>(&r); -- } else if (sizeof(T) == 8) { -- auto r = FLATBUFFERS_BYTESWAP64(*reinterpret_cast<uint64_t *>(&t)); -- return *reinterpret_cast<T *>(&r); -- } else { -- assert(0); -- } --} -- - template<typename T> FLATBUFFERS_CONSTEXPR size_t AlignOf() { - #ifdef _MSC_VER - return __alignof(T); --- -2.14.1 - diff --git a/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch b/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch deleted file mode 100644 index 460159f275..0000000000 --- a/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 626fe5e043de25e970ebdf061b88c646fa689113 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Sep 2017 10:09:31 -0700 -Subject: [PATCH 2/2] use __builtin_bswap16 when building with clang - -clang pretends to be gcc 4.2.0 and therefore the code does -not use __builtin_bswap16 but tries to synthesize it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - include/flatbuffers/base.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h -index c73fb2d..13e8fac 100644 ---- a/include/flatbuffers/base.h -+++ b/include/flatbuffers/base.h -@@ -156,7 +156,7 @@ template<typename T> T EndianSwap(T t) { - #define FLATBUFFERS_BYTESWAP32 _byteswap_ulong - #define FLATBUFFERS_BYTESWAP64 _byteswap_uint64 - #else -- #if defined(__GNUC__) && __GNUC__ * 100 + __GNUC_MINOR__ < 408 -+ #if defined(__GNUC__) && __GNUC__ * 100 + __GNUC_MINOR__ < 408 && !defined(__clang__) - // __builtin_bswap16 was missing prior to GCC 4.8. - #define FLATBUFFERS_BYTESWAP16(x) \ - static_cast<uint16_t>(__builtin_bswap32(static_cast<uint32_t>(x) << 16)) --- -2.14.1 - diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb index a8df444858..452e1e65ab 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb @@ -10,22 +10,19 @@ RDEPENDS_${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559" -SRCREV = "25a15950f5a24d7217689739ed8f6dac64912d62" +SRCREV = "c0698cc33f1e534bb59c455909b88cc2726089af" -SRC_URI = "git://github.com/google/flatbuffers.git \ - file://0001-correct-version-for-so-lib.patch \ - file://0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch \ - file://0002-use-__builtin_bswap16-when-building-with-clang.patch \ - " +SRC_URI = "git://github.com/google/flatbuffers.git" # Make sure C++11 is used, required for example for GCC 4.9 CXXFLAGS += "-std=c++11" BUILD_CXXFLAGS += "-std=c++11" +# BUILD_TYPE=Release is required, otherwise flatc is not installed EXTRA_OECMAKE += "\ - -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ - -DPV=${PV} \ " inherit cmake diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-Use-pkg-config-to-find-gpgme.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-Use-pkg-config-to-find-gpgme.patch new file mode 100644 index 0000000000..9030f36d44 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-Use-pkg-config-to-find-gpgme.patch @@ -0,0 +1,31 @@ +From 0c24f99ca4d4f64ea8584347ca6ae0d638d625a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 18 Feb 2019 16:13:17 +0100 +Subject: [PATCH] Use pkg-config to find gpgme +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + build/bundled/gpgme.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/bundled/gpgme.m4 b/build/bundled/gpgme.m4 +index 44bf43c..c9a8ae6 100644 +--- a/build/bundled/gpgme.m4 ++++ b/build/bundled/gpgme.m4 +@@ -18,7 +18,7 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + if test "x$gpgme_config_prefix" != x ; then + GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" + fi +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) ++ GPGME_CONFIG="pkg-config gpgme" + + if test "$GPGME_CONFIG" != "no" ; then + gpgme_version=`$GPGME_CONFIG --version` +-- +2.20.1 + diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb index d8f2f894bb..6c1c1535e0 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb @@ -11,6 +11,7 @@ python () { } DEPENDS = " \ + vala-native \ fribidi \ geany \ libxml2 \ @@ -19,7 +20,7 @@ DEPENDS = " \ intltool-native \ libassuan \ gpgme \ - vte9 \ + vte \ libgit2 \ " @@ -27,9 +28,12 @@ inherit distro_features_check autotools pkgconfig gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://plugins.geany.org/${PN}/${PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "808f9048b77fd9704569ed2ba12a56e9" -SRC_URI[sha256sum] = "76bd9e803db5a626b86669f08330cf95b8cc35057a1cdf65759bc00aef120e25" +SRC_URI = " \ + http://plugins.geany.org/${PN}/${PN}-${PV}.tar.bz2 \ + file://0001-Use-pkg-config-to-find-gpgme.patch \ +" +SRC_URI[md5sum] = "bf5fdd50727ad8bbbfe00027ccf2dac5" +SRC_URI[sha256sum] = "244417c681636e82a63cf6f9901b5b7f3889168f7d9b5ba9b45601767a589c3b" do_configure_prepend() { rm -f ${S}/build/cache/glib-gettext.m4 @@ -41,38 +45,33 @@ FILES_${PN}-dev += "${libdir}/geany/*.la ${libdir}/${PN}/*/*.la" PLUGINS += "${PN}-addons" LIC_FILES_CHKSUM += "file://addons/COPYING;md5=4325afd396febcb659c36b49533135d4" FILES_${PN}-addons = "${libdir}/geany/addons.so" -RDEPENDS_${PN}-addons = "${PN}" PLUGINS += "${PN}-autoclose" LIC_FILES_CHKSUM += "file://autoclose/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES_${PN}-autoclose = "${libdir}/geany/autoclose.so" -RDEPENDS_${PN}-autoclose = "${PN}" PLUGINS += "${PN}-automark" LIC_FILES_CHKSUM += "file://automark/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES_${PN}-automark = "${libdir}/geany/automark.so" -RDEPENDS_${PN}-automark = "${PN}" PLUGINS += "${PN}-codenav" LIC_FILES_CHKSUM += "file://codenav/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES_${PN}-codenav = "${libdir}/geany/codenav.so" -RDEPENDS_${PN}-codenav = "${PN}" PLUGINS += "${PN}-commander" LIC_FILES_CHKSUM += "file://commander/COPYING;md5=d32239bcb673463ab874e80d47fae504" LICENSE_${PN}-commander = "GPLv3" FILES_${PN}-commander = "${libdir}/geany/commander.so" -RDEPENDS_${PN}-commander = "${PN}" -PLUGINS += "${PN}-debugger" -LIC_FILES_CHKSUM += "file://debugger/COPYING;md5=4325afd396febcb659c36b49533135d4" -FILES_${PN}-debugger = "${libdir}/geany/debugger.so ${datadir}/${PN}/debugger" -RDEPENDS_${PN}-debugger = "${PN}" +# | checking whether the GTK version in use is compatible with plugin Debugger... no +EXTRA_OECONF += "--disable-debugger" +#PLUGINS += "${PN}-debugger" +#LIC_FILES_CHKSUM += "file://debugger/COPYING;md5=4325afd396febcb659c36b49533135d4" +#FILES_${PN}-debugger = "${libdir}/geany/debugger.so ${datadir}/${PN}/debugger" PLUGINS += "${PN}-defineformat" LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES_${PN}-defineformat = "${libdir}/geany/defineformat.so" -RDEPENDS_${PN}-defineformat = "${PN}" # no gnome devhelp in some common layer EXTRA_OECONF += "--disable-devhelp" @@ -80,178 +79,149 @@ EXTRA_OECONF += "--disable-devhelp" #LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504" #LICENSE_${PN}-devhelp = "GPLv3" #FILES_${PN}-devhelp = "${libdir}/geany/devhelp.so" -#RDEPENDS_${PN}-devhelp = "${PN}" PLUGINS += "${PN}-geanyctags" LIC_FILES_CHKSUM += "file://geanyctags/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-geanyctags = "${libdir}/geany/geanyctags.so" -RDEPENDS_${PN}-geanyctags = "${PN}" PLUGINS += "${PN}-geanydoc" LIC_FILES_CHKSUM += "file://geanydoc/COPYING;md5=d32239bcb673463ab874e80d47fae504" LICENSE_${PN}-geanydoc = "GPLv3" FILES_${PN}-geanydoc = "${libdir}/geany/geanydoc.so" -RDEPENDS_${PN}-geanydoc = "${PN}" PLUGINS += "${PN}-geanyextrasel" LIC_FILES_CHKSUM += "file://geanyextrasel/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-geanyextrasel = "${libdir}/geany/geanyextrasel.so" -RDEPENDS_${PN}-geanyextrasel = "${PN}" PLUGINS += "${PN}-geanyinsertnum" LIC_FILES_CHKSUM += "file://geanyinsertnum/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-geanyinsertnum = "${libdir}/geany/geanyinsertnum.so" -RDEPENDS_${PN}-geanyinsertnum = "${PN}" - -PLUGINS += "${PN}-geanylatex" -LIC_FILES_CHKSUM += "file://geanylatex/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" -FILES_${PN}-geanylatex = "${libdir}/geany/geanylatex.so" -RDEPENDS_${PN}-geanylatex = "${PN}" - -PLUGINS += "${PN}-geanylipsum" -LIC_FILES_CHKSUM += "file://lipsum/COPYING;md5=4325afd396febcb659c36b49533135d4" -FILES_${PN}-geanylipsum = "${libdir}/geany/lipsum.so" -RDEPENDS_${PN}-geanylipsum = "${PN}" # no lua: max supported version is 5.2 EXTRA_OECONF += "--disable-geanylua" #PLUGINS += "${PN}-geanylua" #LIC_FILES_CHKSUM += "file://geanylua/COPYING;md5=4325afd396febcb659c36b49533135d4" #FILES_${PN}-geanylua = "${libdir}/geany/geanylua.so ${libdir}/${PN}/geanylua/*.so" -#RDEPENDS_${PN}-geanylua = "${PN}" PLUGINS += "${PN}-geanymacro" LIC_FILES_CHKSUM += "file://geanymacro/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-geanymacro = "${libdir}/geany/geanymacro.so" -RDEPENDS_${PN}-geanymacro = "${PN}" PLUGINS += "${PN}-geanyminiscript" LIC_FILES_CHKSUM += "file://geanyminiscript/COPYING;md5=4325afd396febcb659c36b49533135d4" FILES_${PN}-geanyminiscript = "${libdir}/geany/geanyminiscript.so" -RDEPENDS_${PN}-geanyminiscript = "${PN}" PLUGINS += "${PN}-geanynumberedbookmarks" LIC_FILES_CHKSUM += "file://geanynumberedbookmarks/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-geanynumberedbookmarks = "${libdir}/geany/geanynumberedbookmarks.so" -RDEPENDS_${PN}-geanynumberedbookmarks = "${PN}" PLUGINS += "${PN}-geanypg" LIC_FILES_CHKSUM += "file://geanypg/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" FILES_${PN}-geanypg = "${libdir}/geany/geanypg.so" -RDEPENDS_${PN}-geanypg = "${PN}" PLUGINS += "${PN}-geanyprj" LIC_FILES_CHKSUM += "file://geanyprj/COPYING;md5=d32239bcb673463ab874e80d47fae504" LICENSE_${PN}-geanyprj = "GPLv3" FILES_${PN}-geanyprj = "${libdir}/geany/geanyprj.so" -RDEPENDS_${PN}-geanyprj = "${PN}" -# no gnome pygtk -EXTRA_OECONF += "--disable-geanypy" #PLUGINS += "${PN}-geanypy" #LIC_FILES_CHKSUM += "file://geanypy/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" #FILES_${PN}-geanypy = "${libdir}/geany/geanypy.so" -#RDEPENDS_${PN}-geanypy = "${PN}" PLUGINS += "${PN}-geanyvc" LIC_FILES_CHKSUM += "file://geanyvc/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-geanyvc = "${libdir}/geany/geanyvc.so" -RDEPENDS_${PN}-geanyvc = "${PN}" PLUGINS += "${PN}-geniuspaste" LIC_FILES_CHKSUM += "file://geniuspaste/COPYING;md5=bfc203269f8862ebfc1198cdc809a95a" FILES_${PN}-geniuspaste = "${libdir}/geany/geniuspaste.so ${datadir}/${PN}/geniuspaste" -RDEPENDS_${PN}-geniuspaste = "${PN}" PLUGINS += "${PN}-git-changebar" LIC_FILES_CHKSUM += "file://git-changebar/COPYING;md5=d32239bcb673463ab874e80d47fae504" LICENSE_${PN}-git-changebar = "GPLv3" -FILES_${PN}-git-changebar = "${libdir}/geany/git-changebar.so" -RDEPENDS_${PN}-git-changebar = "${PN}" +FILES_${PN}-git-changebar = "${datadir}/${BPN}/git-changebar ${libdir}/geany/git-changebar.so" PLUGINS += "${PN}-keyrecord" LIC_FILES_CHKSUM += "file://keyrecord/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES_${PN}-keyrecord = "${libdir}/geany/keyrecord.so" -RDEPENDS_${PN}-keyrecord = "${PN}" + +PLUGINS += "${PN}-latex" +LIC_FILES_CHKSUM += "file://latex/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-latex = "${libdir}/geany/latex.so" PLUGINS += "${PN}-lineoperations" LIC_FILES_CHKSUM += "file://lineoperations/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-lineoperations = "${libdir}/geany/lineoperations.so" -RDEPENDS_${PN}-lineoperations = "${PN}" + +PLUGINS += "${PN}-lipsum" +LIC_FILES_CHKSUM += "file://lipsum/COPYING;md5=4325afd396febcb659c36b49533135d4" +FILES_${PN}-lipsum = "${libdir}/geany/lipsum.so" # no markdown - avoid floating dependencies -EXTRA_OECONF += " --disable-peg-markdown" +EXTRA_OECONF += "--disable-peg-markdown" #PLUGINS += "${PN}-markdown" #LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" #FILES_${PN}-markdown = "${libdir}/geany/markdown.so" -#RDEPENDS_${PN}-markdown = "${PN}" -PLUGINS += "${PN}-multiterm" -LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -FILES_${PN}-multiterm = "${libdir}/geany/multiterm.so" -RDEPENDS_${PN}-multiterm = "${PN}" +# | checking whether the GTK version in use is compatible with plugin multiterm... no +EXTRA_OECONF += "--disable-multiterm" +#PLUGINS += "${PN}-multiterm" +#LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +#FILES_${PN}-multiterm = "${libdir}/geany/multiterm.so" PLUGINS += "${PN}-overview" LIC_FILES_CHKSUM += "file://overview/overview/overviewplugin.c;beginline=4;endline=20;md5=1aa33522916cdeb46cccac0c629da0d0" FILES_${PN}-overview = "${libdir}/geany/overview.so ${datadir}/${PN}/overview" -RDEPENDS_${PN}-overview = "${PN}" PLUGINS += "${PN}-pairtaghighlighter" LICENSE_${PN}-pairtaghighlighter = "BSD-2-Clause" LIC_FILES_CHKSUM += "file://pairtaghighlighter/COPYING;md5=d6d927525a612b3a8dbebc4b2e9b47c1" FILES_${PN}-pairtaghighlighter = "${libdir}/geany/pairtaghighlighter.so" -RDEPENDS_${PN}-pairtaghighlighter = "${PN}" PLUGINS += "${PN}-pohelper" LICENSE_${PN}-pohelper = "GPLv3" LIC_FILES_CHKSUM += "file://pohelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" -FILES_${PN}-pohelper = "${libdir}/geany/pohelper.so" -RDEPENDS_${PN}-pohelper = "${PN}" +FILES_${PN}-pohelper = "${datadir}/${BPN}/pohelper ${libdir}/geany/pohelper.so" PLUGINS += "${PN}-pretty-printer" LIC_FILES_CHKSUM += "file://pretty-printer/src/PrettyPrinter.c;beginline=1;endline=17;md5=1665115c2fadb17c1b53cdb4e43b2440" FILES_${PN}-pretty-printer = "${libdir}/geany/pretty-printer.so" -RDEPENDS_${PN}-pretty-printer = "${PN}" PLUGINS += "${PN}-projectorganizer" LIC_FILES_CHKSUM += "file://projectorganizer/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-projectorganizer = "${libdir}/geany/projectorganizer.so" -RDEPENDS_${PN}-projectorganizer = "${PN}" PLUGINS += "${PN}-scope" LIC_FILES_CHKSUM += "file://scope/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" -FILES_${PN}-scope = "${libdir}/geany/scope.so" -RDEPENDS_${PN}-scope = "${PN}" +FILES_${PN}-scope = "${datadir}/${BPN}/scope ${libdir}/geany/scope.so" PLUGINS += "${PN}-sendmail" LIC_FILES_CHKSUM += "file://sendmail/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" FILES_${PN}-sendmail = "${libdir}/geany/sendmail.so" -RDEPENDS_${PN}-sendmail = "${PN}" PLUGINS += "${PN}-shiftcolumn" LIC_FILES_CHKSUM += "file://shiftcolumn/COPYING;md5=751419260aa954499f7abaabaa882bbe" FILES_${PN}-shiftcolumn = "${libdir}/geany/shiftcolumn.so" -RDEPENDS_${PN}-shiftcolumn = "${PN}" PLUGINS += "${PN}-spellcheck" LIC_FILES_CHKSUM += "file://spellcheck/COPYING;md5=4325afd396febcb659c36b49533135d4" FILES_${PN}-spellcheck = "${libdir}/geany/spellcheck.so" -RDEPENDS_${PN}-spellcheck = "${PN}" PLUGINS += "${PN}-tableconvert" LIC_FILES_CHKSUM += "file://tableconvert/COPYING;md5=6753686878d090a1f3f9445661d3dfbc" FILES_${PN}-tableconvert = "${libdir}/geany/tableconvert.so" -RDEPENDS_${PN}-tableconvert = "${PN}" PLUGINS += "${PN}-treebrowser" -LIC_FILES_CHKSUM += "file://treebrowser/README;beginline=67;endline=67;md5=52f90857fd1a9672111e472dd056a0d8" +LIC_FILES_CHKSUM += "file://treebrowser/README;beginline=67;endline=67;md5=1f17f0f2abb88e0fa0f1b342112d871c" FILES_${PN}-treebrowser = "${libdir}/geany/treebrowser.so" -RDEPENDS_${PN}-treebrowser = "${PN}" PLUGINS += "${PN}-updatechecker" LIC_FILES_CHKSUM += "file://updatechecker/COPYING;md5=4325afd396febcb659c36b49533135d4" FILES_${PN}-updatechecker = "${libdir}/geany/updatechecker.so" -RDEPENDS_${PN}-updatechecker = "${PN}" + +PLUGINS += "${PN}-vimode" +LIC_FILES_CHKSUM += "file://vimode/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-vimode = "${libdir}/geany/vimode.so" # no webkit - lasts ages and is not properly detected EXTRA_OECONF += " --disable-webhelper" @@ -259,13 +229,18 @@ EXTRA_OECONF += " --disable-webhelper" #LIC_FILES_CHKSUM += "file://webhelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" #LICENSE_${PN}-webhelper = "GPLv3" #FILES_${PN}-webhelper = "${libdir}/geany/webhelper.so" -#RDEPENDS_${PN}-webhelper = "${PN}" + +PLUGINS += "${PN}-workbench" +LIC_FILES_CHKSUM += "file://workbench/COPYING;md5=c107cf754550e65755c42985a5d4e9c9" +FILES_${PN}-workbench = "${libdir}/geany/workbench.so" PLUGINS += "${PN}-xmlsnippets" LIC_FILES_CHKSUM += "file://xmlsnippets/COPYING;md5=4325afd396febcb659c36b49533135d4" FILES_${PN}-xmlsnippets = "${libdir}/geany/xmlsnippets.so" -RDEPENDS_${PN}-xmlsnippets = "${PN}" -PACKAGES =+ "${PLUGINS}" +PACKAGES =+ "${PN}-common ${PLUGINS}" +FILES_${PN}-common = "${libdir}/libgeanypluginutils${SOLIBS}" + +# geany-plugins is meta package for all plugins RDEPENDS_${PN} = "${PLUGINS}" ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-devtools/geany/geany_1.31.bb b/meta-oe/recipes-devtools/geany/geany_1.34.1.bb index bb9d8bc298..aab535d85b 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.31.bb +++ b/meta-oe/recipes-devtools/geany/geany_1.34.1.bb @@ -3,15 +3,15 @@ HOMEPAGE = "http://www.geany.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" -DEPENDS = "gtk+ libxml-parser-perl-native python3-docutils-native intltool-native" +DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" inherit distro_features_check autotools pkgconfig perlnative pythonnative gettext REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://download.geany.org/${BP}.tar.bz2" -SRC_URI[md5sum] = "386000be6b26972c6a699939c37cda34" -SRC_URI[sha256sum] = "30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5" +SRC_URI[md5sum] = "87220f4a0e03623ab9d86820f6be7b5d" +SRC_URI[sha256sum] = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11" FILES_${PN} += "${datadir}/icons" diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.4.bb b/meta-oe/recipes-devtools/guider/guider_3.9.4.bb new file mode 100644 index 0000000000..1a413452a3 --- /dev/null +++ b/meta-oe/recipes-devtools/guider/guider_3.9.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "runtime performance analyzer" +HOMEPAGE = "https://github.com/iipeace/guider" +BUGTRACKER = "https://github.com/iipeace/guider/issues" +AUTHOR = "Peace Lee <ipeace5@gmail.com>" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" + +PV = "3.9.4+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://github.com/iipeace/${BPN}" +#SRCREV = "${AUTOREV}" +SRCREV = "b433f3805674ef4588c1a161986c74eeac6a48e7" + +S = "${WORKDIR}/git" +R = "${RECIPE_SYSROOT}" + +inherit distutils + +GUIDER_OBJ = "guider.pyc" +GUIDER_SCRIPT = "guider" + +do_install() { + python ${S}/setup.py install + + install -d ${D}${bindir} + install -v -m 0755 ${STAGING_BINDIR_NATIVE}/${GUIDER_SCRIPT} ${D}${bindir}/${GUIDER_SCRIPT} + + install -d ${D}${datadir}/${BPN} + install -v -m 0755 ${STAGING_LIBDIR_NATIVE}/python${PYTHON_BASEVERSION}/site-packages/${BPN}/${GUIDER_OBJ} ${D}${datadir}/${BPN}/${GUIDER_OBJ} +} + +RDEPENDS_${PN} = "python-ctypes python-shell \ + python-json python-subprocess" diff --git a/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch b/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch deleted file mode 100644 index 1dfd955f0d..0000000000 --- a/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2 Mon Sep 17 00:00:00 2001 -From: David Tolnay <dtolnay@gmail.com> -Date: Sat, 21 Nov 2015 10:05:37 -0800 -Subject: [PATCH] Support --without-oniguruma - -Upstream-Status: Backport - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> - ---- - configure.ac | 41 ++++++++++++++++++++--------------------- - 1 file changed, 20 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9e2c8cf..7f6be34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,27 +52,26 @@ fi - AC_ARG_WITH([oniguruma], - [AS_HELP_STRING([--with-oniguruma=prefix], - [try this for a non-standard install prefix of the oniguruma library])], -- [ONIGURUMAPATHSET=1], -- [ONIGURUMAPATHSET=0]) -- --if test $ONIGURUMAPATHSET = 1; then -- CFLAGS="$CFLAGS -I${with_oniguruma}/include" -- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" --fi -- --# check for ONIGURUMA library --HAVE_ONIGURUMA=0 --AC_CHECK_HEADER("oniguruma.h", -- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;])) -- --# handle check results --if test $HAVE_ONIGURUMA != 1; then -- AC_MSG_NOTICE([Oniguruma was not found.]) -- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ]) --else -- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed]) --fi -- -+ [], -+ [with_oniguruma=yes]) -+ -+AS_IF([test "x$with_oniguruma" != xno], [ -+ AS_IF([test "x$with_oniguruma" != xyes], [ -+ CFLAGS="$CFLAGS -I${with_oniguruma}/include" -+ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" -+ ]) -+ # check for ONIGURUMA library -+ have_oniguruma=0 -+ AC_CHECK_HEADER("oniguruma.h", -+ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;])) -+ # handle check results -+ AS_IF([test $have_oniguruma = 1], [ -+ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed]) -+ ], [ -+ AC_MSG_NOTICE([Oniguruma was not found.]) -+ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX']) -+ ]) -+]) - - dnl Check for valgrind - AC_CHECK_PROGS(valgrind_cmd, valgrind) --- -1.9.1 - diff --git a/meta-oe/recipes-devtools/jq/jq_1.5.bb b/meta-oe/recipes-devtools/jq/jq_1.6.bb index 0f40815ccd..0086eae5c3 100644 --- a/meta-oe/recipes-devtools/jq/jq_1.5.bb +++ b/meta-oe/recipes-devtools/jq/jq_1.6.bb @@ -6,16 +6,15 @@ HOMEPAGE = "https://stedolan.github.io/jq/" BUGTRACKER = "https://github.com/stedolan/jq/issues" SECTION = "utils" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=29dd0c35d7e391bb8d515eacf7592e00" +LIC_FILES_CHKSUM = "file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf" SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz \ - file://Support-without-oniguruma.patch \ " -SRC_URI[md5sum] = "0933532b086bd8b6a41c1b162b1731f9" -SRC_URI[sha256sum] = "c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c" +SRC_URI[md5sum] = "e68fbd6a992e36f1ac48c99bbf825d6b" +SRC_URI[sha256sum] = "5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72" -inherit autotools +inherit autotools-brokensep PACKAGECONFIG ?= "oniguruma" diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb index 88e3320324..97fc6c73b2 100644 --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb @@ -19,3 +19,5 @@ S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch deleted file mode 100644 index 748e4da1a6..0000000000 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch +++ /dev/null @@ -1,77 +0,0 @@ -From ac61124df17ab76527508bbb9a3115d4d6cc1af6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 21 Nov 2016 11:26:26 -0800 -Subject: [PATCH] cmake: replace hardcoded lib/${CMAKE_LIBRARY_PATH} with - {CMAKE_INSTALL_LIBDIR} - -Fixes -| CMake Error at src/jsonrpccpp/CMakeLists.txt:207 (install): -| install TARGETS given unknown argument "/lib". - -and - -Wrong install paths during cross compile - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/jsonrpccpp/CMakeLists.txt | 8 ++++---- - src/stubgenerator/CMakeLists.txt | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/jsonrpccpp/CMakeLists.txt b/src/jsonrpccpp/CMakeLists.txt -index e4a1eb5..13f9056 100644 ---- a/src/jsonrpccpp/CMakeLists.txt -+++ b/src/jsonrpccpp/CMakeLists.txt -@@ -205,15 +205,15 @@ if (WIN32) - endif() - - install(TARGETS ${ALL_LIBS} -- LIBRARY DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH} -- ARCHIVE DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION bin - ) - - #set pkg-config - get_filename_component(FULL_PATH_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ABSOLUTE) - set(FULL_PATH_INCLUDEDIR "${FULL_PATH_INSTALL_PREFIX}/include") --set(FULL_PATH_LIBDIR "${FULL_PATH_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_PATH}") -+set(FULL_PATH_LIBDIR "${FULL_PATH_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/libjsonrpccpp-client.pc.cmake ${CMAKE_BINARY_DIR}/libjsonrpccpp-client.pc) - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/libjsonrpccpp-server.pc.cmake ${CMAKE_BINARY_DIR}/libjsonrpccpp-server.pc) -@@ -223,6 +223,6 @@ INSTALL(FILES - "${CMAKE_BINARY_DIR}/libjsonrpccpp-server.pc" - "${CMAKE_BINARY_DIR}/libjsonrpccpp-client.pc" - "${CMAKE_BINARY_DIR}/libjsonrpccpp-common.pc" -- DESTINATION "lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH}/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - - -diff --git a/src/stubgenerator/CMakeLists.txt b/src/stubgenerator/CMakeLists.txt -index f9dbe4c..b57b0fe 100644 ---- a/src/stubgenerator/CMakeLists.txt -+++ b/src/stubgenerator/CMakeLists.txt -@@ -58,15 +58,15 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/libjsonrpccpp-stub.pc.cmake ${CMAKE_BIN - - INSTALL(FILES - "${CMAKE_BINARY_DIR}/libjsonrpccpp-stub.pc" -- DESTINATION "lib/${CMAKE_LIBRARY_PATH}/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - - install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/stubgenerator/ - DESTINATION include/jsonrpccpp/stubgen - FILES_MATCHING PATTERN "*.h") - - install(TARGETS ${ALL_LIBS} jsonrpcstub -- LIBRARY DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH} -- ARCHIVE DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION bin - ) - --- -2.10.2 - diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch deleted file mode 100644 index d21e97950c..0000000000 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9500f12f5d827840634311d6ca972d9551211e4d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 21 Nov 2016 01:00:51 -0800 -Subject: [PATCH] filedescriptorclient: Typecast min() arguments correctly - -Fixes - -| /mnt/a/build/tmp-glibc/work/cortexa7hf-neon-vfpv4-oe-linux-gnueabi/jsonrpc/0.7.0-r0/git/src/jsonrpccp -p/client/connectors/filedescriptorclient.cpp:47:92: note: deduced conflicting types for parameter 'co -nst _Tp' ('unsigned int' and 'long unsigned int') -| ssize_t byteWritten = write(outputfd, toSend.c_str(), min(toSend.size(), MAX_WRITE_SIZE)); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/jsonrpccpp/client/connectors/filedescriptorclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jsonrpccpp/client/connectors/filedescriptorclient.cpp b/src/jsonrpccpp/client/connectors/filedescriptorclient.cpp -index 77aac7e..6325b5c 100644 ---- a/src/jsonrpccpp/client/connectors/filedescriptorclient.cpp -+++ b/src/jsonrpccpp/client/connectors/filedescriptorclient.cpp -@@ -43,7 +43,7 @@ void FileDescriptorClient::SendRPCMessage(const std::string& message, - string toSend = message; - do - { -- ssize_t byteWritten = write(outputfd, toSend.c_str(), min(toSend.size(), MAX_WRITE_SIZE)); -+ ssize_t byteWritten = write(outputfd, toSend.c_str(), min((long unsigned int)toSend.size(), MAX_WRITE_SIZE)); - if (byteWritten < 1) - throw JsonRpcException(Errors::ERROR_CLIENT_CONNECTOR, - "Unknown error occured while writing to the output file descriptor"); --- -2.10.2 - diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch deleted file mode 100644 index 3b9068a7d8..0000000000 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c7aad10628949e126f50e3264b5bc7eb417347c6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 21 Nov 2016 01:25:10 -0800 -Subject: [PATCH] filedescriptorserver: Include sys/select.h before other - headers - -Fixes errors e.g. -| /mnt/a/build/tmp-glibc/work/cortexa7hf-neon-vfpv4-oe-linux-gnueabi/jsonrpc/0.7.0-r0/git/src/jsonrpccp -p/server/connectors/filedescriptorserver.h:63:7: error: unknown type name 'fd_set' -| fd_set read_fds; -| ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp -index 9d74223..8e019ca 100644 ---- a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp -+++ b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp -@@ -7,8 +7,8 @@ - * @license See attached LICENSE.txt - ************************************************************************/ - --#include "filedescriptorserver.h" - #include <sys/select.h> -+#include "filedescriptorserver.h" - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> --- -2.10.2 - diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch deleted file mode 100644 index 21ef98bf5a..0000000000 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f5416f1c2b2989f94163a2ae4b91c9b9fa13c620 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 13:32:31 -0700 -Subject: [PATCH 1/2] memset() and family needs to include string.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp -index 9fca57b..e63c49e 100644 ---- a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp -+++ b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp -@@ -16,7 +16,7 @@ - #include <cstdio> - #include <fcntl.h> - #include <unistd.h> --#include <string> -+#include <cstring> - - using namespace jsonrpc; - using namespace std; --- -2.12.1 - diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch deleted file mode 100644 index aece45b020..0000000000 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 79050ef9607f242e0d509969b19e9390220c3411 Mon Sep 17 00:00:00 2001 -From: Yongwei Wu <wuyongwei@gmail.com> -Date: Sat, 31 Dec 2016 11:57:11 +0800 -Subject: [PATCH 2/2] Fix build problem on Mac. - -__suseconds_t is not defined on Mac/BSD; use the POSIX-conformant -suseconds_t. ---- - src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp -index 8e019ca..68107f2 100644 ---- a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp -+++ b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp -@@ -122,7 +122,7 @@ int FileDescriptorServer::WaitForRead() { - FD_ZERO(&except_fds); - FD_SET(inputfd, &read_fds); - timeout.tv_sec = 0; -- timeout.tv_usec = (__suseconds_t) (READ_TIMEOUT * 1000000); -+ timeout.tv_usec = (suseconds_t) (READ_TIMEOUT * 1000000); - // Wait for something to read - return select(inputfd + 1, &read_fds, &write_fds, &except_fds, &timeout); - } --- -2.12.1 - diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_git.bb index eb1ff65b63..aea11b0828 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_git.bb @@ -5,22 +5,16 @@ DESCRIPTION = "JsonRpc-Cpp is an OpenSource implementation of JSON-RPC \ HOMEPAGE = "https://github.com/cinemast/libjson-rpc-cpp" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee72d601854d5d2a065cf642883c489b" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4e728c5b36018f6c383b4b9efd9c8840" +SECTION = "libs" +DEPENDS = "curl jsoncpp libmicrohttpd hiredis" -PV = "0.7.0+git${SRCPV}" +PV = "1.1.1+git${SRCPV}" +# v1.1.1 +SRCREV = "319783c635cf8cabcc1a980495c99a88f9ebbd97" SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ - file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \ - file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \ - file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \ - file://0001-memset-and-family-needs-to-include-string.h.patch \ - file://0002-Fix-build-problem-on-Mac.patch \ " -SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e" - -SECTION = "libs" - -DEPENDS = "curl jsoncpp libmicrohttpd" S = "${WORKDIR}/git" @@ -30,3 +24,5 @@ EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO -DBUILD_SHARED_LIBS=YES -DBUILD_STATIC_LIBS=YES \ -DCMAKE_LIBRARY_PATH=${libdir} \ " + +FILES_${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake" diff --git a/meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb b/meta-oe/recipes-devtools/libedit/libedit_20190324-3.1.bb index 8cc0e959e0..9d333e7aa1 100644 --- a/meta-oe/recipes-devtools/libedit/libedit_20180525-3.1.bb +++ b/meta-oe/recipes-devtools/libedit/libedit_20190324-3.1.bb @@ -15,7 +15,9 @@ FETCHCMD_wget += "-U bitbake" SRC_URI = "http://www.thrysoee.dk/editline/${BPN}-${PV}.tar.gz \ file://stdc-predef.patch \ " -SRC_URI[md5sum] = "97679319742f45d6cdcd6075511b14ac" -SRC_URI[sha256sum] = "c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116" +SRC_URI[md5sum] = "bec755c8044ad84b752dfe49a0b371d8" +SRC_URI[sha256sum] = "ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae" S = "${WORKDIR}/${BPN}-${PV}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.1.bb index 6386f1ffb7..190e5dd4e6 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.1.bb @@ -20,5 +20,5 @@ do_configure_prepend() { SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" -SRC_URI[md5sum] = "29ea6125e653d7e60b49a9a9544abc96" -SRC_URI[sha256sum] = "4ad99ef937d071b4883c061df40bfe233f7649d50c354cf81235f180b4244399" +SRC_URI[md5sum] = "d224dca55bb909f6730f40cc267337be" +SRC_URI[sha256sum] = "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630" diff --git a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.1.bb b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.3.bb index aef5978bde..56c62f1f2e 100644 --- a/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.1.bb +++ b/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.3.bb @@ -7,8 +7,8 @@ LICENSE = "Apache-2.0 & BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "2b4054b2d66c0ef0e4091df26ce8aad4" -SRC_URI[sha256sum] = "772b268142e1c02dd346880fff06f38f693e9458d6390ce0b493395d0ca01714" +SRC_URI[md5sum] = "20a87090cd8ec34ea11b3e59954234cb" +SRC_URI[sha256sum] = "2d8f627aa6417e6c6a100bc09dc407684ca4605c929defc1690ee7d6a575ce6a" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/" diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.18.bb b/meta-oe/recipes-devtools/lshw/lshw_02.18.bb index b344fbf326..d1a7334248 100644 --- a/meta-oe/recipes-devtools/lshw/lshw_02.18.bb +++ b/meta-oe/recipes-devtools/lshw/lshw_02.18.bb @@ -30,3 +30,5 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} } + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch new file mode 100644 index 0000000000..8f1c4b9b9b --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch @@ -0,0 +1,33 @@ +From 8321f8b3befbaa355cfed988fdd8494133989676 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 4 Feb 2019 00:38:16 -0800 +Subject: [PATCH] hook: Do not append int to std::string + +Clang find this error + +| ../../../git/sysdeps/linux-gnu/hooks.c:205:51: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus +-int] +| || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0) +| ~~~^~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/hooks.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sysdeps/linux-gnu/hooks.c ++++ b/sysdeps/linux-gnu/hooks.c +@@ -200,9 +200,10 @@ os_get_ltrace_conf_filenames(struct vect + const char *sysconfdir = SYSCONFDIR; + if (sysconfdir != NULL && *sysconfdir != '\0') { + /* No +1, we skip the initial period. */ +- syspath = malloc(strlen(sysconfdir) + sizeof FN); ++ syspath = malloc(strlen(sysconfdir) + sizeof FN + 1); ++ syspath[strlen(sysconfdir) + sizeof FN + 1] = '\0'; + if (syspath == NULL +- || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0) ++ || sprintf(syspath, "%s/%s", sysconfdir, FN) < 0) + goto fail; + } + diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch new file mode 100644 index 0000000000..54acaace1a --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-move-fprintf-into-same-block-where-modname-and-symna.patch @@ -0,0 +1,37 @@ +From 0cad025f80cf090dc16a5b70e21477f5b08a67fd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 20 Dec 2018 11:27:45 -0800 +Subject: [PATCH] move fprintf into same block where modname and symname are + computed + +In its current state if mod turns out to be NULL then modname and +symname will also turn out to be NULL and fprinting them as strings will +be problematic + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + output.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/output.c b/output.c +index b63befe..5aada7b 100644 +--- a/output.c ++++ b/output.c +@@ -654,12 +654,11 @@ frame_callback (Dwfl_Frame *state, void *arg) + NULL, NULL, NULL); + symname = dwfl_module_addrinfo(mod, pc, &off, &sym, + NULL, NULL, NULL); ++ /* This mimics the output produced by libunwind below. */ ++ fprintf(options.output, " > %s(%s+0x%" PRIx64 ") [%" PRIx64 "]\n", ++ modname, symname, off, pc); + } + +- /* This mimics the output produced by libunwind below. */ +- fprintf(options.output, " > %s(%s+0x%" PRIx64 ") [%" PRIx64 "]\n", +- modname, symname, off, pc); +- + /* See if we can extract the source line too and print it on + the next line if we can find it. */ + if (mod != NULL) { diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index f4033f7c27..3dc269c80e 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -25,6 +25,8 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-Add-support-for-mips64-n32-n64.patch \ file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \ file://0001-mips-plt.c-Delete-include-error.h.patch \ + file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ + file://0001-hook-Do-not-append-int-to-std-string.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/lua/lua_5.3.4.bb b/meta-oe/recipes-devtools/lua/lua_5.3.5.bb index 8f4e8fe68c..265e2519e0 100644 --- a/meta-oe/recipes-devtools/lua/lua_5.3.4.bb +++ b/meta-oe/recipes-devtools/lua/lua_5.3.5.bb @@ -8,13 +8,17 @@ DEPENDS = "readline" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ " + +# if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. +PV_testsuites = "5.3.4" + SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ - 'http://www.lua.org/tests/lua-${PV}-tests.tar.gz;name=tarballtest \ + 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest \ file://run-ptest \ ', '', d)}" -SRC_URI[tarballsrc.md5sum] = "53a9c68bcc0eda58bdc2095ad5cdfc63" -SRC_URI[tarballsrc.sha256sum] = "f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c" +SRC_URI[tarballsrc.md5sum] = "4f4b4f323fd3514a68e0ab3da8ce3455" +SRC_URI[tarballsrc.sha256sum] = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac" SRC_URI[tarballtest.md5sum] = "b14fe3748c1cb2d74e3acd1943629ba3" SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f" @@ -53,7 +57,7 @@ do_install () { } do_install_ptest () { - cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV}-tests ${D}${PTEST_PATH}/test + cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index 3052eb0484..c2d2180bae 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -22,7 +22,7 @@ BBCLASSEXTEND = "native" # you need to install the multilib development package (e.g. # libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part # (HOST_CC="gcc -m32"). -BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS', True) != '32']}" +BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}" # The lua makefiles expect the TARGET_SYS to be from uname -s # Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD @@ -90,5 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64 is not supported in this release -COMPATIBLE_HOST = "^(?!aarch64).*" +# Aarch64/mips64 is not supported in this release +COMPATIBLE_HOST_aarch64 = "null" +COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch deleted file mode 100644 index b0d772d937..0000000000 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a05d92ae85024d0648f69f95307a1d3e8e51109c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Apr 2018 19:55:38 -0700 -Subject: [PATCH] Fix -Werror=class-memaccess - -Casting to void* make gcc happy since its upset about -object types and rightly so - -Fixes - -'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'struct msgpack::v2::object' from an array of 'const msgpack_object' {aka 'const struct msgpack_object'} [-Werror=class-memaccess] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://github.com/msgpack/msgpack-c/pull/659] - - include/msgpack/v1/object.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/msgpack/v1/object.hpp b/include/msgpack/v1/object.hpp -index 64da8c53..9721f705 100644 ---- a/include/msgpack/v1/object.hpp -+++ b/include/msgpack/v1/object.hpp -@@ -661,7 +661,7 @@ inline object::object(const msgpack_object& o) - inline void operator<< (msgpack::object& o, const msgpack_object& v) - { - // FIXME beter way? -- std::memcpy(&o, &v, sizeof(v)); -+ std::memcpy(static_cast<void*>(&o), &v, sizeof(v)); - } - - inline object::operator msgpack_object() const --- -2.16.3 - diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb index 690a7f444b..90fd44e607 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ PV .= "+git${SRCPV}" SRC_URI = "git://github.com/msgpack/msgpack-c \ - file://0001-Fix-Werror-class-memaccess.patch \ " -SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449" +# cpp-3.1.1 +SRCREV = "83a82e3eb512b18d4149cabb7eb43c7e8bc081af" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb index a89b659ae8..65e49bc95b 100644 --- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=9a8ae1c2d606c432a2aa2e2de15be22a" SRC_URI = "git://github.com/nlohmann/json.git" -PV = "3.2.0+git${SRCPV}" +PV = "3.3.0+git${SRCPV}" -SRCREV = "8c20571136f2d5351b379a06ad6591bd980880fe" +SRCREV = "aafad2be1f3cd259a1e79d2f6fcf267d1ede9ec7" S = "${WORKDIR}/git" @@ -21,3 +21,9 @@ EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" + +# other packages commonly reference the file directly as "json.hpp" +# create symlink to allow this usage +do_install_append() { + ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp +} diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch index 324a4683d6..5d0dc03b66 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch @@ -4,26 +4,23 @@ Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH] Disable running gyp on shared deps --- - Makefile | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 0a217bd893..e1229ad07f 100644 +index a98772f..f5663e2 100644 --- a/Makefile +++ b/Makefile -@@ -79,10 +79,9 @@ $(NODE_G_EXE): config.gypi out/Makefile - $(MAKE) -C out BUILDTYPE=Debug V=$(V) - if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi +@@ -123,8 +123,8 @@ with-code-cache: + test-code-cache: with-code-cache + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache -out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \ - deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \ -- deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \ -- config.gypi +out/Makefile: common.gypi deps/http_parser/http_parser.gyp \ -+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \ -+ deps/v8/src/v8.gyp node.gyp config.gypi ++ deps/v8/gypfiles/toolchain.gypi \ + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \ + config.gypi $(PYTHON) tools/gyp_node.py -f make - - config.gypi: configure -- -2.12.2 +2.19.2 diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch new file mode 100644 index 0000000000..e9035f9eb3 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch @@ -0,0 +1,36 @@ +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001 +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com> +Date: Tue, 11 Dec 2018 10:44:29 +0100 +Subject: [PATCH] Using native torque + +--- + deps/v8/gypfiles/v8.gyp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp +index 8c78f02255..434168844e 100644 +--- a/deps/v8/gypfiles/v8.gyp ++++ b/deps/v8/gypfiles/v8.gyp +@@ -2831,7 +2831,6 @@ + { + 'action_name': 'run_torque', + 'inputs': [ # Order matters. +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', + '../src/builtins/base.tq', + '../src/builtins/array.tq', + '../src/builtins/typed-array.tq', +@@ -2845,7 +2844,10 @@ + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h', + ], +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'], ++ 'action': [ ++ 'torque', ++ '<@(_inputs)', ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'], + }, + ], + }, # torque +-- +2.19.2 + diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch new file mode 100644 index 0000000000..ed3bac39bd --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch @@ -0,0 +1,122 @@ +From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001 +From: Anna Henningsen <anna@addaleax.net> +Date: Sat, 20 Oct 2018 05:24:54 +0200 +Subject: [PATCH] src: use more explicit return type in Sign::SignFinal() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Using the non-indexed variant of `std::get<>` broke Travis CI. +Also, this allows us to be a bit more concise when returning +from `SignFinal()` due to some error condition. + +Refs: https://github.com/nodejs/node/pull/23427 + +PR-URL: https://github.com/nodejs/node/pull/23779 +Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> +Reviewed-By: Tobias Nießen <tniessen@tnie.de> +Reviewed-By: Refael Ackermann <refack@gmail.com> +Reviewed-By: Colin Ihrig <cjihrig@gmail.com> +--- + src/node_crypto.cc | 23 +++++++++++------------ + src/node_crypto.h | 12 +++++++++++- + 2 files changed, 22 insertions(+), 13 deletions(-) + +diff --git a/src/node_crypto.cc b/src/node_crypto.cc +index bd8d9e032554..ec7d4f2bb5be 100644 +--- a/src/node_crypto.cc ++++ b/src/node_crypto.cc +@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx, + return MallocedBuffer<unsigned char>(); + } + +-std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal( ++Sign::SignResult Sign::SignFinal( + const char* key_pem, + int key_pem_len, + const char* passphrase, + int padding, + int salt_len) { +- MallocedBuffer<unsigned char> buffer; +- + if (!mdctx_) +- return std::make_pair(kSignNotInitialised, std::move(buffer)); ++ return SignResult(kSignNotInitialised); + + EVPMDPointer mdctx = std::move(mdctx_); + + BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len)); + if (!bp) +- return std::make_pair(kSignPrivateKey, std::move(buffer)); ++ return SignResult(kSignPrivateKey); + + EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(), + nullptr, +@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal( + // without `pkey` being set to nullptr; + // cf. the test of `test_bad_rsa_privkey.pem` for an example. + if (!pkey || 0 != ERR_peek_error()) +- return std::make_pair(kSignPrivateKey, std::move(buffer)); ++ return SignResult(kSignPrivateKey); + + #ifdef NODE_FIPS_MODE + /* Validate DSA2 parameters from FIPS 186-4 */ +@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal( + } + #endif // NODE_FIPS_MODE + +- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len); ++ MallocedBuffer<unsigned char> buffer = ++ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len); + Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk; +- return std::make_pair(error, std::move(buffer)); ++ return SignResult(error, std::move(buffer)); + } + + +@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) { + + ClearErrorOnReturn clear_error_on_return; + +- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal( ++ SignResult ret = sign->SignFinal( + buf, + buf_len, + len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr, + padding, + salt_len); + +- if (std::get<Error>(ret) != kSignOk) +- return sign->CheckThrow(std::get<Error>(ret)); ++ if (ret.error != kSignOk) ++ return sign->CheckThrow(ret.error); + + MallocedBuffer<unsigned char> sig = +- std::move(std::get<MallocedBuffer<unsigned char>>(ret)); ++ std::move(ret.signature); + + Local<Object> rc = + Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size) +diff --git a/src/node_crypto.h b/src/node_crypto.h +index 6fcf737f6c43..0c26c1f6ff1d 100644 +--- a/src/node_crypto.h ++++ b/src/node_crypto.h +@@ -518,7 +518,17 @@ class Sign : public SignBase { + public: + static void Initialize(Environment* env, v8::Local<v8::Object> target); + +- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal( ++ struct SignResult { ++ Error error; ++ MallocedBuffer<unsigned char> signature; ++ ++ explicit SignResult( ++ Error err, ++ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>()) ++ : error(err), signature(std::move(sig)) {} ++ }; ++ ++ SignResult SignFinal( + const char* key_pem, + int key_pem_len, + const char* passphrase, diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch new file mode 100644 index 0000000000..925c085e9b --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch @@ -0,0 +1,69 @@ +Implement function as wrapper for std::make_unique +method to be compatible with gcc < 4.9 . +"error::make_unique is not a member of 'std'" + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> + +diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc +--- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100 ++++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100 +@@ -52,6 +52,16 @@ + # define AI_V4MAPPED 0 + #endif + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template<typename T, typename... Args> ++ std::unique_ptr<T> make_unique(Args&&... args) { ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace cares_wrap { + +diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc +--- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100 ++++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100 +@@ -24,6 +24,16 @@ + #include <pthread.h> + #endif // __POSIX__ + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template<typename T, typename... Args> ++ std::unique_ptr<T> make_unique(Args&&... args) { ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace inspector { + namespace { + +diff --git a/src/inspector/main_thread_interface.cc b/src/inspector/main_thread_interface.cc +index e374c0fd70..05d7d8c60f 100644 +--- a/src/inspector/main_thread_interface.cc ++++ b/src/inspector/main_thread_interface.cc +@@ -6,6 +6,16 @@ + #include <functional> + #include <unicode/unistr.h> + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template<typename T, typename... Args> ++ std::unique_ptr<T> make_unique(Args&&... args) { ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace inspector { + namespace { diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch new file mode 100644 index 0000000000..66ff18b4a3 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch @@ -0,0 +1,20 @@ +Link atomic library to fix missing undefined referrences +like "undefined reference to `__atomic_fetch_add_8'" + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> + +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100 ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100 +@@ -452,6 +452,11 @@ + '<(DEPTH)', + '<(SHARED_INTERMEDIATE_DIR)' + ], ++ 'link_settings': { ++ 'libraries': [ ++ '-latomic' ++ ], ++ }, + 'sources': [ + '<@(inspector_all_sources)', + '../include//v8-inspector-protocol.h', diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch new file mode 100644 index 0000000000..f6569cd57a --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch @@ -0,0 +1,24 @@ +The target LDFLAGS have been ignored. Tools like torque +have been loaded from system libraries, even if a native +one was the target. +|$ ldd torque +| libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 +| libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 +| libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1 +| libicui18n.so.63 => not found +| libicuuc.so.63 => not found +... + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> + +diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi node-v10.15.1/deps/v8/gypfiles/toolchain.gypi +--- node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:01:39.000000000 +0100 ++++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:04:08.628361308 +0100 +@@ -1106,6 +1106,7 @@ + 'cflags': [ '-fno-strict-aliasing' ], + }], + ], # conditions ++ 'ldflags+': [ '$(LDFLAGS)' ], + }], + ['OS=="solaris"', { + 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.3.bb index e3b46bc2c8..d2e77ea0df 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.3.bb @@ -1,9 +1,12 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab" -DEPENDS = "openssl zlib" +DEPENDS = "openssl zlib icu" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -11,9 +14,17 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ -" -SRC_URI[md5sum] = "8b3abd033dae96b6fadcb6a872a44d3c" -SRC_URI[sha256sum] = "5a9dff58016c18fb4bf902d963b124ff058a550ebcd9840c677757387bce419a" + file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ + file://0004-Make-compatibility-with-gcc-4.8.patch \ + file://0005-Link-atomic-library.patch \ + file://0006-Use-target-ldflags.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-torque.patch \ + " + +SRC_URI[md5sum] = "d76210a6ae1ea73d10254947684836fb" +SRC_URI[sha256sum] = "4e22d926f054150002055474e452ed6cbb85860aa7dc5422213a2002ed9791d5" S = "${WORKDIR}/node-v${PV}" @@ -44,7 +55,7 @@ do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - ./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \ + ./configure --prefix=${prefix} --with-intl=system-icu --without-snapshot --shared-openssl --shared-zlib \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ ${ARCHFLAGS} @@ -72,6 +83,10 @@ do_install_append_class-native() { # use sed on npm-cli.js because otherwise symlink is replaced with normal file and # npm-cli.js continues to use old shebang sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js + + # Install the native torque to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque } do_install_append_class-target() { diff --git a/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch b/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch new file mode 100644 index 0000000000..e89d7d3466 --- /dev/null +++ b/meta-oe/recipes-devtools/octave/files/fix-blas-library-integer-size.patch @@ -0,0 +1,16 @@ +diff -Naur octave-4.4.1.orig/configure.ac octave-4.4.1/configure.ac +--- octave-4.4.1.orig/configure.ac 2019-02-23 10:46:24.287240571 +0000 ++++ octave-4.4.1/configure.ac 2019-02-23 10:46:42.255249333 +0000 +@@ -762,6 +762,12 @@ + AC_MSG_ERROR([BLAS and LAPACK libraries are required]) + fi + ++if ac_fn_f77_try_run "$LINENO"; then : ++ ax_blas_integer_size=8 ++else ++ ax_blas_integer_size=4 ++fi ++ + case $ax_blas_integer_size in + 4) + HAVE_64_BIT_BLAS=no diff --git a/meta-oe/recipes-devtools/octave/octave_4.4.1.bb b/meta-oe/recipes-devtools/octave/octave_4.4.1.bb new file mode 100644 index 0000000000..1ec32ce89a --- /dev/null +++ b/meta-oe/recipes-devtools/octave/octave_4.4.1.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "High-level language, primarily intended for numerical computations" +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "math" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "gperf-native texinfo lapack pcre readline" + +inherit autotools pkgconfig texinfo gettext + +EXTRA_OECONF = "--disable-java --disable-docs" + +SRC_URI = "https://ftp.gnu.org/gnu/octave/${PN}-${PV}.tar.gz \ + file://fix-blas-library-integer-size.patch \ +" + +SRC_URI[md5sum] = "b43bd5f4309a0c048c91af10cf8e8674" +SRC_URI[sha256sum] = "09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97" + +do_compile_prepend() { + for folder in "liboctave/operators liboctave/numeric liboctave/array liboctave/util"; do + mkdir -p ${B}/${folder} + done +} + +PACKAGES =+ " octave-common liboctave liboctave-dev liboctave-dbg" + +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${datadir}/${PN} \ + ${libdir}/${PN}/${PV}/oct ${libdir}/${PN}/${PV}/site \ + ${libdir}/${PN}/site ${datadir}/applications ${datadir}/metainfo" +FILES_${PN}-common = "${datadir}/icons" + +FILES_liboctave = "${libdir}/${PN}/${PV}/lib*${SOLIBS}" +FILES_liboctave-dev = "${libdir}/${PN}/${PV}/lib*${SOLIBSDEV}" +FILES_liboctave-dbg = "${libdir}/${PN}/${PV}/.debug" + +FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch deleted file mode 100644 index c5b9083dca..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 May 2018 21:06:46 -0700 -Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with - libusb_set_option - -libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace -with equivalent libusb_set_option() API - -see libusb commit for more details - -https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] - src/jtag/drivers/xds110.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c -index 90b699027..9bfe02ea8 100644 ---- a/src/jtag/drivers/xds110.c -+++ b/src/jtag/drivers/xds110.c -@@ -367,8 +367,11 @@ static bool usb_connect(void) - - /* Set libusb to auto detach kernel and disable debug messages */ - (void)libusb_set_auto_detach_kernel_driver(dev, 1); -+#if LIBUSB_API_VERSION >= 0x01000106 -+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); -+#else - libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); -- -+#endif - /* Claim the debug interface on the XDS110 */ - result = libusb_claim_interface(dev, INTERFACE_DEBUG); - } else { --- -2.17.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 21a86de390..9a8a09a913 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,11 +9,10 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "cdf1e826eb23c29de1019ce64125f644f01b0afe" +SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" @@ -29,6 +28,8 @@ EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html" do_configure() { ./bootstrap nosubmodule + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/jimtcl/autosetup + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/jimtcl/autosetup oe_runconf ${EXTRA_OECONF} } diff --git a/meta-oe/recipes-devtools/perl/ipc-run_0.99.bb b/meta-oe/recipes-devtools/perl/ipc-run_20180523.0.bb index 3e9a2a9858..c812ae1374 100644 --- a/meta-oe/recipes-devtools/perl/ipc-run_0.99.bb +++ b/meta-oe/recipes-devtools/perl/ipc-run_20180523.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" DEPENDS = "perl" SRC_URI = "git://github.com/toddr/IPC-Run.git" -SRCREV = "5b990b641a73eb0bc1e2b4c19daeef390d4d797a" +SRCREV = "0b409702490729eeb97ae65f5b94d949ec083134" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index bd8ba780ae..049dc665dd 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb @@ -6,20 +6,17 @@ with the MySQL relational database management system. Most functions \ provided by this programming API are supported. Some rarely used \ functions are missing, mainly because no-one ever requested them. \ " -HOMEPAGE = "http://search.cpan.org/~michielb/DBD-mysql-4.036/lib/DBD/mysql.pm" +HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" -DEPENDS += "libdbi-perl-native libmysqlclient" +DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" -SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "4a00dd7f1c057931147c65dfc4901c36" -SRC_URI[sha256sum] = "629f865e8317f52602b2f2efd2b688002903d2e4bbcba5427cb6188b043d6f99" +SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" +SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https" -S = "${WORKDIR}/DBD-mysql-${PV}" +S = "${WORKDIR}/git" inherit cpan diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb index 24a1245fc0..ff4a9d0610 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.642.bb @@ -7,17 +7,18 @@ database interface independent of the actual database being used. \ HOMEPAGE = "http://search.cpan.org/dist/DBI/" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" -RDEPENDS_${PN} = " perl-module-carp \ - perl-module-exporter \ - perl-module-exporter-heavy \ - perl-module-dynaloader \ +RDEPENDS_${PN}_class-target = " \ + perl-module-carp \ + perl-module-exporter \ + perl-module-exporter-heavy \ + perl-module-dynaloader \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz" -SRC_URI[md5sum] = "e77fd37fcf77fc88fde029c1b75ded54" -SRC_URI[sha256sum] = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1" +SRC_URI[md5sum] = "f2ba18b5cea1c8cb322a62be0a847f3d" +SRC_URI[sha256sum] = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d" S = "${WORKDIR}/DBI-${PV}" diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch new file mode 100644 index 0000000000..78a7e63b9e --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl/0001-CheckLib.pm-don-t-execute-the-binary.patch @@ -0,0 +1,46 @@ +From d111fd85b25466f7829ccee34493aa0e3b551308 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 23 Apr 2019 19:13:19 -0700 +Subject: [PATCH] CheckLib.pm: don't execute the binary + +Don't execute the binary in build env as the +binary which is generated in cross compile env +may fail when executed in build env. + +And it's enough to verify the libs via successully +generate the binary which links the libs as below. + $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc \ + -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ + -Werror=format-security --sysroot=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot \ + -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/perl/5.28.1-r1=/usr/src/debug/perl/5.28.1-r1 \ + -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/perl/5.28.1-r1=/usr/src/debug/perl/5.28.1-r1 \ + -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot= -fdebug-prefix-map=/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot-native= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 assertlibEhx19yuY.c -L/yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/recipe-sysroot/usr/lib -lcrypto -fstack-protector-strong -o assertlibCOw_eujb + +Execute the binary in cross compile env as below +and use the return status to determine the lib's +checking status is not appropriate in cross compile env. + $ /yocto/builds/upgrade1/tmp/work/core2-64-poky-linux/libdbd-mysql-perl/4.050-r0/git/assertlibCOw_eujb + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + lib/Devel/CheckLib.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Devel/CheckLib.pm b/lib/Devel/CheckLib.pm +index e45cfb4..d228bb5 100644 +--- a/lib/Devel/CheckLib.pm ++++ b/lib/Devel/CheckLib.pm +@@ -424,7 +424,7 @@ sub assert_lib { + my $absexefile = File::Spec->rel2abs($exefile); + $absexefile = '"'.$absexefile.'"' if $absexefile =~ m/\s/; + if (!$not_execute && system($absexefile) != 0) { +- push @wrongresult, $lib; ++ print "Checking the lib $lib\n"; + } + else { + if ($analyze_binary) { +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb new file mode 100644 index 0000000000..f5bdb2087f --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb @@ -0,0 +1,21 @@ +SUMMARY = "A Perl module that checks whether a particular C library and its headers are available" +DESCRIPTION = "This module provides a way of checking whether a particular library \ +and its headers are available, by attempting to compile a simple program and \ +link against it." +HOMEPAGE = "https://metacpan.org/pod/Devel::CheckLib" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://README;md5=7911cdbb572d25c5f2e2ea17f669efc2" + +SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV}.tar.gz \ + file://0001-CheckLib.pm-don-t-execute-the-binary.patch \ +" +SRC_URI[md5sum] = "930216c5abc0f016df8a7539d48c891a" +SRC_URI[sha256sum] = "24adfd908705dfac4bb320711763f37126b75cf54b3566c2c27c7cdef9c429a8" + +S = "${WORKDIR}/Devel-CheckLib-${PV}" + +inherit cpan + +BBCLASSEXTEND="native" diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index bfd0ddfb86..785c2f5acc 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -8,7 +8,7 @@ BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" DEPENDS_class-native = "zlib-native libxml2-native" -PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}" +PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ @@ -20,7 +20,6 @@ SRC_URI_append_class-target = " \ file://php_exec_native.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ - file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ file://php-fpm.service \ " @@ -46,10 +45,9 @@ COMMON_EXTRA_OECONF = "--enable-sockets \ EXTRA_OECONF = "--enable-mbstring \ --enable-wddx \ --enable-fpm \ - --enable-zip \ --with-libdir=${baselib} \ --with-gettext=${STAGING_LIBDIR}/.. \ - --with-zlib=${STAGING_LIBDIR}/.. \ + --with-libzip=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ @@ -104,7 +102,7 @@ acpaths = "" do_configure_prepend () { rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 - find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!' + find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' } do_configure_append() { diff --git a/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch new file mode 100644 index 0000000000..ccc6d4ede1 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0001-Use-pkg-config-for-libxml2-detection.patch @@ -0,0 +1,23 @@ +Use pkg-config for libxml2 detection. + +xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2481,8 +2481,8 @@ AC_DEFUN([PHP_SETUP_LIBXML], [ + LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` + if test "$LIBXML_VERSION" -ge "2006011"; then + found_libxml=yes +- LIBXML_LIBS=`$XML2_CONFIG --libs` +- LIBXML_INCS=`$XML2_CONFIG --cflags` ++ LIBXML_LIBS=`pkg-config --libs libxml-2.0` ++ LIBXML_INCS=`pkg-config --cflags libxml-2.0` + else + AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) + fi diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch index a250cac83a..51dbe269cb 100644 --- a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch +++ b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch @@ -1,6 +1,6 @@ -From dfebe81f946a83fe2499fc84d4f3dbdc5612276c Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Tue, 3 Apr 2018 11:35:03 +0800 +From d2679c89c0b15b90e5360b4863258a7955e5f4e5 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 12 Feb 2019 15:59:19 +0800 Subject: [PATCH] acinclude.m4: don't unset cache variables Unsetting prevents cache variable from being passed to configure. @@ -8,15 +8,18 @@ Unsetting prevents cache variable from being passed to configure. Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +update patch to version 7.3.2 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- acinclude.m4 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 -index f6a55ec..d3346df 100644 +index 25f900d..2641969 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) +@@ -1921,8 +1921,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -25,14 +28,14 @@ index f6a55ec..d3346df 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library. +@@ -1954,8 +1952,6 @@ dnl in the default libraries and as a fall back in the specified library. dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ - unset ac_cv_func_$1 - unset ac_cv_func___$1 unset found - + AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) -- 2.7.4 diff --git a/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch b/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch deleted file mode 100644 index 6ab101b410..0000000000 --- a/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0d88d735887c6f2fa00a743c27124c7a52006a41 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sun, 15 Apr 2018 19:17:27 -0700 -Subject: [PATCH] fix error caused by a new variable is declared after the - label - -There is a build failure on mips: -... -|sljitNativeMIPS_common.c: In function 'sljit_has_cpu_feature': -|sljitNativeMIPS_common.c:506:3: error: a label can only be part -of a statement and a declaration is not a statement -| sljit_sw fir; -| ^~~~~~~~ -... - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c -index ee207fe..adfd342 100644 ---- a/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c -+++ b/ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c -@@ -498,12 +498,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil - - SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type) - { -+#if defined(__GNUC__) -+ sljit_sw fir; -+#endif - switch (feature_type) { - case SLJIT_HAS_FPU: - #ifdef SLJIT_IS_FPU_AVAILABLE - return SLJIT_IS_FPU_AVAILABLE; - #elif defined(__GNUC__) -- sljit_sw fir; - asm ("cfc1 %0, $0" : "=r"(fir)); - return (fir >> 22) & 0x1; - #else --- -2.10.2 - diff --git a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch index 0d24d34f2b..34f433f40a 100644 --- a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch +++ b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch @@ -1,7 +1,9 @@ -From b2fb725dc404d471371731b663234e87cb0fca84 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <anuj.mittal@intel.com> -Date: Mon, 2 Apr 2018 17:54:52 +0800 -Subject: [PATCH] opcache/config.m4: enable opcache +From 8de5ba69d20d049b8ca983a9470c7303142ec0b3 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Sun, 28 Apr 2019 16:55:13 +0800 +Subject: [PATCH] From fb139d9707dabe1684b472a08a6eb5761ede4a3a Mon Sep 17 + 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 12 + Feb 2019 14:56:16 +0800 Subject: [PATCH] opcache/config.m4: enable opcache We can't use AC_TRY_RUN to run programs in a cross compile environment. Set the variables directly instead since we know that we'd be running on latest @@ -10,42 +12,41 @@ enough linux kernel. Upstream-Status: Inappropriate [Configuration] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +update patch to version 7.3.4 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - ext/opcache/config.m4 | 349 ++------------------------------------------------ - 1 file changed, 8 insertions(+), 341 deletions(-) + ext/opcache/config.m4 | 312 +------------------------------------------------- + 1 file changed, 6 insertions(+), 306 deletions(-) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 7b500f0..10bb99a 100644 +index 4810217..22c3d61 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -28,353 +28,20 @@ if test "$PHP_OPCACHE" != "no"; then - +@@ -27,319 +27,19 @@ if test "$PHP_OPCACHE" != "no"; then AC_CHECK_HEADERS([unistd.h sys/uio.h]) -- AC_MSG_CHECKING(for sysvipc shared memory support) -- AC_TRY_RUN([ + AC_MSG_CHECKING(for sysvipc shared memory support) +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/ipc.h> -#include <sys/shm.h> -#include <unistd.h> -#include <string.h> -+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) - +- -int main() { - pid_t pid; - int status; - int ipc_id; - char *shm; - struct shmid_ds shmbuf; -+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) - +- - ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W)); - if (ipc_id == -1) { - return 1; - } -+ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) - +- - shm = shmat(ipc_id, NULL, 0); - if (shm == (void *)-1) { - shmctl(ipc_id, IPC_RMID, NULL); @@ -90,13 +91,15 @@ index 7b500f0..10bb99a 100644 - } - return 0; -} --],dnl +-]])],[dnl - AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) -- msg=yes,msg=no,msg=no) +- msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) - -- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) -- AC_TRY_RUN([ ++ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) ++ + AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/mman.h> @@ -142,13 +145,14 @@ index 7b500f0..10bb99a 100644 - } - return 0; -} --],dnl +-]])],[dnl - AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) -- msg=yes,msg=no,msg=no) +- msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) -- -- AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) -- AC_TRY_RUN([ ++ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) + + AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support) +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/mman.h> @@ -197,13 +201,14 @@ index 7b500f0..10bb99a 100644 - } - return 0; -} --],dnl +-]])],[dnl - AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) -- msg=yes,msg=no,msg=no) +- msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) -- -- AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) -- AC_TRY_RUN([ ++ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support]) + + AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/mman.h> @@ -266,14 +271,14 @@ index 7b500f0..10bb99a 100644 - } - return 0; -} --],dnl +-]])],[dnl - AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) -- msg=yes,msg=no,msg=no) +- msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) + AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) AC_MSG_CHECKING(for mmap() using regular file shared memory support) -- AC_TRY_RUN([ +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#include <sys/wait.h> -#include <sys/mman.h> @@ -336,50 +341,14 @@ index 7b500f0..10bb99a 100644 - } - return 0; -} --],dnl +-]])],[dnl - AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) -- msg=yes,msg=no,msg=no) +- msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) -- --flock_type=unknown --AC_MSG_CHECKING("whether flock struct is linux ordered") --AC_TRY_RUN([ -- #include <fcntl.h> -- struct flock lock = { 1, 2, 3, 4, 5 }; -- int main() { -- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { -- return 0; -- } -- return 1; -- } --], [ -- flock_type=linux -- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -- AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+ + AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support]) --AC_MSG_CHECKING("whether flock struct is BSD ordered") --AC_TRY_RUN([ -- #include <fcntl.h> -- struct flock lock = { 1, 2, 3, 4, 5 }; -- int main() { -- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { -- return 0; -- } -- return 1; -- } --], [ -- flock_type=bsd -- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) -- AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+ flock_type=linux -+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) - - if test "$flock_type" = "unknown"; then - AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) + PHP_NEW_EXTENSION(opcache, + ZendAccelerator.c \ -- 2.7.4 diff --git a/meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch b/meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch new file mode 100644 index 0000000000..f36ddac262 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0048-Use-pkg-config-for-FreeType2-detection.patch @@ -0,0 +1,53 @@ +From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org> +Date: Mon, 22 Oct 2018 06:54:31 +0000 +Subject: Use pkg-config for FreeType2 detection + +--- + ext/gd/config.m4 | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index 498d870..d28c6ae 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -184,21 +184,29 @@ AC_DEFUN([PHP_GD_XPM],[ + AC_DEFUN([PHP_GD_FREETYPE2],[ + if test "$PHP_FREETYPE_DIR" != "no"; then + +- for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/bin/freetype-config"; then +- FREETYPE2_DIR=$i +- FREETYPE2_CONFIG="$i/bin/freetype-config" +- break ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists freetype2 ; then ++ FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags freetype2` ++ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` ++ else ++ for i in $PHP_FREETYPE_DIR /usr/local /usr; do ++ if test -f "$i/bin/freetype-config"; then ++ FREETYPE2_DIR=$i ++ FREETYPE2_CONFIG="$i/bin/freetype-config" ++ break ++ fi ++ done ++ ++ if test -z "$FREETYPE2_DIR"; then ++ AC_MSG_ERROR([freetype-config not found.]) + fi +- done + +- if test -z "$FREETYPE2_DIR"; then +- AC_MSG_ERROR([freetype-config not found.]) ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` + fi + +- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` +- + PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) + PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) + AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) diff --git a/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch b/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch new file mode 100644 index 0000000000..2258c4c7fa --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch @@ -0,0 +1,161 @@ +From 03fecab78f9fa747ad8ab3484e7ca00c0148321d Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Sun, 28 Apr 2019 16:45:02 +0800 +Subject: [PATCH] From: Hugh McMaster <hugh.mcmaster@outlook.com> Date: Wed, 5 + Dec 2018 23:27:30 +1100 Subject: ext/intl: Use pkg-config to detect icu + +The developers of icu recommend using pkg-config to detect icu, +because icu-config is deprecated. + +Upstream-Status: Pending + +update to version 7.3.4 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + acinclude.m4 | 95 ++++++------------------------------------------------ + ext/intl/config.m4 | 16 ++++----- + 2 files changed, 15 insertions(+), 96 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 7d77c33..86b0ecc 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2158,92 +2158,15 @@ dnl + dnl Common setup macro for ICU + dnl + AC_DEFUN([PHP_SETUP_ICU],[ +- PHP_ARG_WITH(icu-dir,, +- [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) +- +- if test "$PHP_ICU_DIR" = "no"; then +- PHP_ICU_DIR=DEFAULT +- fi +- +- AC_MSG_CHECKING([for location of ICU headers and libraries]) +- found_icu=no +- +- dnl First try to find pkg-config +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- fi +- +- dnl If pkg-config is found try using it +- if test "$PHP_ICU_DIR" = "DEFAULT" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then +- if $PKG_CONFIG --atleast-version=40 icu-uc; then +- found_icu=yes +- icu_version_full=`$PKG_CONFIG --modversion icu-uc` +- ac_IFS=$IFS +- IFS="." +- set $icu_version_full +- IFS=$ac_IFS +- icu_version=`expr [$]1 \* 1000 + [$]2` +- AC_MSG_RESULT([found $icu_version_full]) +- +- ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io icu-i18n` +- ICU_INCS=`$PKG_CONFIG --cflags-only-I icu-uc icu-io icu-i18n` +- ICU_CXXFLAGS="-DU_USING_ICU_NAMESPACE=1" +- +- AC_MSG_RESULT([found $ICU_VERSION]) +- +- PHP_EVAL_LIBLINE($ICU_LIBS, $1) +- PHP_EVAL_INCLINE($ICU_INCS) +- else +- AC_MSG_ERROR([ICU version 4.0 or later required.]) +- fi +- fi +- +- dnl If pkg-config fails for some reason, revert to the old method +- if test "$found_icu" = "no"; then +- if test "$PHP_ICU_DIR" = "DEFAULT"; then +- dnl Try to find icu-config +- AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) +- else +- ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" +- fi +- +- dnl Trust icu-config to know better what the install prefix is.. +- icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` +- if test "$?" != "0" || test -z "$icu_install_prefix"; then +- AC_MSG_RESULT([not found]) +- AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) +- else +- AC_MSG_RESULT([$icu_install_prefix]) +- +- dnl Check ICU version +- AC_MSG_CHECKING([for ICU 4.0 or greater]) +- icu_version_full=`$ICU_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $icu_version_full +- IFS=$ac_IFS +- icu_version=`expr [$]1 \* 1000 + [$]2` +- AC_MSG_RESULT([found $icu_version_full]) +- +- if test "$icu_version" -lt "4000"; then +- AC_MSG_ERROR([ICU version 4.0 or later is required]) +- fi +- +- ICU_VERSION=$icu_version +- ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` +- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` +- PHP_EVAL_INCLINE($ICU_INCS) +- PHP_EVAL_LIBLINE($ICU_LIBS, $1) +- +- ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` +- if test "$icu_version" -ge "49000"; then +- ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" +- ICU_CFLAGS="-DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" +- fi +- if test "$icu_version" -ge "60000"; then +- ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" +- fi +- fi ++ PKG_CHECK_MODULES([ICU], [icu-io >= 50.1]) ++ PHP_EVAL_INCLINE($ICU_CFLAGS) ++ PHP_EVAL_LIBLINE($ICU_LIBS, $1) ++ ++ ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" ++ ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" ++ ++ if $PKG_CONFIG icu-io --atleast-version=60; then ++ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" + fi + ]) + +diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 +index 4b9f469..fdae88a 100644 +--- a/ext/intl/config.m4 ++++ b/ext/intl/config.m4 +@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then + PHP_SETUP_ICU(INTL_SHARED_LIBADD) + PHP_SUBST(INTL_SHARED_LIBADD) + PHP_REQUIRE_CXX() +- INTL_COMMON_FLAGS="$ICU_INCS $ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" +- if test "$icu_version" -ge "4002"; then +- icu_spoof_src=" spoofchecker/spoofchecker_class.c \ +- spoofchecker/spoofchecker.c\ +- spoofchecker/spoofchecker_create.c\ +- spoofchecker/spoofchecker_main.c" +- else +- icu_spoof_src="" +- fi ++ INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" + PHP_NEW_EXTENSION(intl, php_intl.c \ + intl_error.c \ + intl_convert.c \ +@@ -68,7 +60,11 @@ if test "$PHP_INTL" != "no"; then + transliterator/transliterator_methods.c \ + uchar/uchar.c \ + idn/idn.c \ +- $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx) ++ spoofchecker/spoofchecker_class.c \ ++ spoofchecker/spoofchecker.c\ ++ spoofchecker/spoofchecker_create.c\ ++ spoofchecker/spoofchecker_main.c \ ++ , $ext_shared,,$INTL_COMMON_FLAGS,cxx) + + PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \ + common/common_enum.cpp \ +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch b/meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch deleted file mode 100644 index 728f25bb6e..0000000000 --- a/meta-oe/recipes-devtools/php/php/CVE-2017-9120.patch +++ /dev/null @@ -1,21 +0,0 @@ -php: patch for CVE-2017-9120 - -Upstream-Status: Backport [https://bugs.php.net/bug.php?id=74544] - -CVE: CVE-2017-9120 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c -index 03a39d7..7b88731 100644 ---- a/ext/mysqli/mysqli_api.c -+++ b/ext/mysqli/mysqli_api.c -@@ -1965,7 +1965,7 @@ PHP_FUNCTION(mysqli_real_escape_string) { - } - MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); - -- newstr = zend_string_alloc(2 * escapestr_len, 0); -+ newstr = zend_string_safe_alloc(2, escapestr_len, 0, 0); - ZSTR_LEN(newstr) = mysql_real_escape_string(mysql->mysql, ZSTR_VAL(newstr), escapestr, escapestr_len); - newstr = zend_string_truncate(newstr, ZSTR_LEN(newstr), 0); - diff --git a/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch deleted file mode 100644 index 3e901841be..0000000000 --- a/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3bfcc7fdd22261eaed10949714de0a90d31e10ab Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Thu, 20 Aug 2015 16:29:35 +0800 -Subject: [PATCH] [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK - -Upstream-Status: Pending - -AC_TRY_RUN is not suitable for cross-compile - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - -%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch ---- - ext/fileinfo/config.m4 | 31 ++++++------------------------- - 1 file changed, 6 insertions(+), 25 deletions(-) - -diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 -index 523b4fd..0aaa4c8 100644 ---- a/ext/fileinfo/config.m4 -+++ b/ext/fileinfo/config.m4 -@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then - libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c" - - AC_MSG_CHECKING([for strcasestr]) -- AC_TRY_RUN([ --#include <string.h> --#include <strings.h> --#include <stdlib.h> -- --int main(void) --{ -- char *s0, *s1, *ret; -- -- s0 = (char *) malloc(42); -- s1 = (char *) malloc(8); -- -- memset(s0, 'X', 42); -- s0[24] = 'Y'; -- s0[26] = 'Z'; -- s0[41] = '\0'; -- memset(s1, 'x', 8); -- s1[0] = 'y'; -- s1[2] = 'Z'; -- s1[7] = '\0'; -- -- ret = strcasestr(s0, s1); -- -- return !(NULL != ret); --} -+ AC_TRY_COMPILE([ -+ #include <string.h> -+ #include <strings.h> -+ #include <stdlib.h> -+ ],[ -+ strcasestr(NULL, NULL); - ],[ - dnl using the platform implementation - AC_MSG_RESULT(yes) --- -2.7.4 - diff --git a/meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch new file mode 100644 index 0000000000..72ad554a17 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/php5-0001-acinclude.m4-don-t-unset-cache-variables.patch @@ -0,0 +1,42 @@ +From 1fb5a3b3e6c9cf0002ff76988de72f011b642005 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 12 Feb 2019 16:25:37 +0800 +Subject: [PATCH] acinclude.m4: don't unset cache variables + +Unsetting prevents cache variable from being passed to configure. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +update patch to version 5.6.40 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + acinclude.m4 | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index b188eee..ed32fc5 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1897,8 +1897,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) + dnl + AC_DEFUN([PHP_CHECK_FUNC_LIB],[ + ifelse($2,,:,[ +- unset ac_cv_lib_$2[]_$1 +- unset ac_cv_lib_$2[]___$1 + unset found + AC_CHECK_LIB($2, $1, [found=yes], [ + AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) +@@ -1930,8 +1928,6 @@ dnl in the default libraries and as a fall back in the specified library. + dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. + dnl + AC_DEFUN([PHP_CHECK_FUNC],[ +- unset ac_cv_func_$1 +- unset ac_cv_func___$1 + unset found + + AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) +-- +2.7.4 + diff --git a/meta-oe/recipes-devtools/php/php_5.6.38.bb b/meta-oe/recipes-devtools/php/php_5.6.40.bb index d6f51454f4..9f5bac7e21 100644 --- a/meta-oe/recipes-devtools/php/php_5.6.38.bb +++ b/meta-oe/recipes-devtools/php/php_5.6.40.bb @@ -8,6 +8,7 @@ SRC_URI += "file://php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ file://acinclude-xml2-config.patch \ file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ file://0001-PHP-5.6-LibSSL-1.1-compatibility.patch \ + file://php5-0001-acinclude.m4-don-t-unset-cache-variables.patch \ " SRC_URI_append_class-target = " \ @@ -16,8 +17,8 @@ SRC_URI_append_class-target = " \ file://php5-0001-opcache-config.m4-enable-opcache.patch \ " -SRC_URI[md5sum] = "5b98aa066567eca8e5738b8ef4a3545c" -SRC_URI[sha256sum] = "d65b231bbdd63be4439ef5ced965cfd63e62983429dbd4dfcfb49981593ebc03" +SRC_URI[md5sum] = "44633604d2fece1f53f508bc16751b74" +SRC_URI[sha256sum] = "ffd025d34623553ab2f7fd8fb21d0c9e6f9fa30dc565ca03a1d7b763023fba00" DEPENDS += "libmcrypt" EXTRA_OECONF += "--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ diff --git a/meta-oe/recipes-devtools/php/php_7.2.10.bb b/meta-oe/recipes-devtools/php/php_7.2.10.bb deleted file mode 100644 index 8dc64bb89b..0000000000 --- a/meta-oe/recipes-devtools/php/php_7.2.10.bb +++ /dev/null @@ -1,25 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ - file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ - file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ - file://CVE-2017-9120.patch \ - " -SRC_URI_append_class-target = " \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - " - -SRC_URI[md5sum] = "0ce8ff615bfb9de7a89bab8d742c11c0" -SRC_URI[sha256sum] = "01b6129a0921a1636b07da9bc598a876669e45a462cef4b5844fc26862dbda9d" - -PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ - --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-oe/recipes-devtools/php/php_7.3.4.bb b/meta-oe/recipes-devtools/php/php_7.3.4.bb new file mode 100644 index 0000000000..1a5c9760de --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_7.3.4.bb @@ -0,0 +1,25 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" + +SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ + file://0048-Use-pkg-config-for-FreeType2-detection.patch \ + file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ + file://0001-Use-pkg-config-for-libxml2-detection.patch \ + " +SRC_URI_append_class-target = " \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + " + +SRC_URI[md5sum] = "efb58aea95a66738d871f83ec55fec6f" +SRC_URI[sha256sum] = "2e2c3d8212c83649e443b61efffbd03df4b9edd0f9c7a679081fe4cb2da12b78" + +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" + +FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 8491fc904d..9afcbbb7f5 100644 --- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb +++ b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "acpixtract" +ALTERNATIVE_${PN} = "acpixtract acpidump" do_configure[noexec] = "1" do_compile() { diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest b/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest index 7c3a8d1b3a..b3b2278c47 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest +++ b/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest @@ -8,7 +8,7 @@ for write_exe_full_path in ${DIR}/add_person_*; do if [ -x "${write_exe_full_path}" ]; then write_exe=`basename ${write_exe_full_path}` echo "Generating new test file using ${write_exe}..." - ${write_exe_full_path} "${TEST_FILE}" + printf "1234\nname\nname@example.com\n" | ${write_exe_full_path} "${TEST_FILE}" RETVAL=$? [ $RETVAL -eq 0 ] || exit $RETVAL diff --git a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch deleted file mode 100644 index 9a11442f1c..0000000000 --- a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 23 Oct 2015 12:40:34 +0300 -Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set - introspection scanner and compiler paths - -Upstream-Status: Pending [review on oe-core maillist] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2c0cfbd..cfcb3bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, - - GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - --GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) -+GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) - AC_SUBST(GI_DATADIR) - - if test "$enable_cairo" != no; then --- -2.1.4 - diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index c444fbf05f..348a0398f3 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -4,17 +4,13 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools pkgconfig gnomebase distutils-base gobject-introspection +inherit gnomebase gobject-introspection distutils-base upstream-version-is-even -PYTHON_BASEVERSION = "2.7" -PYTHON_PN = "python" +DEPENDS += "python glib-2.0" -DEPENDS += "gnome-common-native python glib-2.0" - -SRCNAME="pygobject" +SRCNAME = "pygobject" SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ - file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ " SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" @@ -24,12 +20,12 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}" +EXTRA_OECONF = "--disable-cairo" RDEPENDS_${PN} += "python-setuptools" RDEPENDS_${PN}_class-native = "" do_install_append() { # Remove files that clash with python3-pygobject; their content is same - rm -rf ${D}${includedir}/pygobject-3.0//pygobject.h ${D}${libdir}/pkgconfig + rm -r ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig } diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch new file mode 100644 index 0000000000..745f5d0132 --- /dev/null +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch @@ -0,0 +1,36 @@ +From 8d272e53a4d1dc405e08ce2dd50159c58f4451e9 Mon Sep 17 00:00:00 2001 +From: Ruslan Bilovol <rbilovol@cisco.com> +Date: Thu, 24 Jan 2019 18:11:39 +0200 +Subject: [PATCH] CMake: remove hardcoded CMAKECONFIG_INSTALL_DIR path + +Currently this path is hardcoded to lib/cmake. +Some distributions have different library path (like lib64). +So reuse LIB_INSTALL_DIR for that to make CMAKECONFIG_INSTALL_DIR +configurable and usable in such distros. + +Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/8d272e53a4d1dc405e08ce2dd50159c58f4451e9] + +Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c60407..0275672 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -199,9 +199,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake @ONLY) + + # ... for the install tree +-SET( CMAKECONFIG_INSTALL_DIR lib/cmake/${PROJECT_NAME} ) ++SET( CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) + FILE( RELATIVE_PATH REL_INCLUDE_DIR +- "${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR}" ++ "${CMAKECONFIG_INSTALL_DIR}" + "${CMAKE_INSTALL_PREFIX}/include" ) + + SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_CMAKE_DIR}/${REL_INCLUDE_DIR}" ) +-- +1.9.1 + diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 069385d5b0..e3ed9c6a17 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -5,10 +5,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ - file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \ -" + file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch" -SRCREV = "e5635fb27feab7f6e8d7b916aa20ad799045a641" +SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c" PV = "1.1.0+git${SRCPV}" @@ -16,10 +15,10 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" # RapidJSON is a header-only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" +ALLOW_EMPTY_${PN} = "1" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/sip/sip.inc b/meta-oe/recipes-devtools/sip/sip.inc index d0795454eb..092531b322 100644 --- a/meta-oe/recipes-devtools/sip/sip.inc +++ b/meta-oe/recipes-devtools/sip/sip.inc @@ -4,10 +4,10 @@ SECTION = "devel" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz \ +SRC_URI = "https://www.riverbankcomputing.com/static/Downloads/sip/${PV}/sip-${PV}.tar.gz \ " -SRC_URI[md5sum] = "9124cb8978742685747a5415179a9890" -SRC_URI[sha256sum] = "e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e" +SRC_URI[md5sum] = "7e854b0da395ddc8fb5da82d0321994d" +SRC_URI[sha256sum] = "184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620" S = "${WORKDIR}/sip-${PV}" @@ -15,19 +15,19 @@ BBCLASSEXTEND = "native" do_configure_prepend_class-target() { echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = %(sysroot)/${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg + echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> sip.cfg + echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}" } do_configure_prepend_class-native() { echo "py_platform = linux" > sip.cfg - echo "py_inc_dir = ${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg + echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)${PYTHON_ABI}" >> sip.cfg echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg - echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}/site-packages" >> sip.cfg + echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg ${PYTHON} configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE} } diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.13.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.13.bb deleted file mode 100644 index dc15bc2e27..0000000000 --- a/meta-oe/recipes-devtools/sip/sip3_4.19.13.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sip.inc - -DEPENDS = "python3" - -inherit python3-dir python3native - -PACKAGES += "python3-sip3" - -FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}${PYTHON_ABI}/site-packages/.debug" - diff --git a/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb b/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb new file mode 100644 index 0000000000..010fa30fe3 --- /dev/null +++ b/meta-oe/recipes-devtools/sip/sip3_4.19.16.bb @@ -0,0 +1,11 @@ +require sip.inc + +DEPENDS = "python3" + +inherit python3-dir python3native + +PACKAGES += "python3-sip3" + +FILES_python3-sip3 = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" + diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.13.bb b/meta-oe/recipes-devtools/sip/sip_4.19.16.bb index 3da15b842b..3da15b842b 100644 --- a/meta-oe/recipes-devtools/sip/sip_4.19.13.bb +++ b/meta-oe/recipes-devtools/sip/sip_4.19.16.bb diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index 4dbd9a4f16..8cc07bcfac 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -1,35 +1,46 @@ +From 5539442e5f5442606071afc5cf02642314ad13bb Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Wed, 17 Aug 2011 22:52:35 +0200 +Subject: [PATCH] tk 8.5.8: import from OE rev + Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian installation. ---- tk8.5-8.5.8.orig/unix/configure -+++ tk8.5-8.5.8/unix/configure -@@ -1431,7 +1431,8 @@ - `ls -d /usr/contrib/lib 2>/dev/null` \ +--- + unix/configure | 1 + + unix/tcl.m4 | 2 ++ + 2 files changed, 3 insertions(+) + +Index: a/unix/configure +=================================================================== +--- a/unix/configure.orig ++++ b/unix/configure +@@ -1432,6 +1432,7 @@ echo "$as_me: error: ${with_tclconfig} d `ls -d /usr/local/lib 2>/dev/null` \ + `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ -+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ ++ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - ; do - if test -f "$i/tclConfig.sh" ; then ---- tk8.5-8.5.8.orig/unix/tcl.m4 -+++ tk8.5-8.5.8/unix/tcl.m4 -@@ -93,7 +93,8 @@ - `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ +Index: a/unix/tcl.m4 +=================================================================== +--- a/unix/tcl.m4.orig ++++ b/unix/tcl.m4 +@@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ + `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ -+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ ++ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - ; do - if test -f "$i/tclConfig.sh" ; then -@@ -223,7 +224,8 @@ - `ls -d ${prefix}/lib 2>/dev/null` \ + `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ +@@ -227,6 +228,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ -+ `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ + `ls -d /usr/pkg/lib 2>/dev/null` \ ++ `ls -d /usr/share/tcltk/tk8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - ; do - if test -f "$i/tkConfig.sh" ; then + `ls -d /usr/local/lib/tk8.6 2>/dev/null` \ diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb deleted file mode 100644 index 13dc4d7513..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Tool Command Language ToolKit Extension" -HOMEPAGE = "http://tcl.sourceforge.net" -SECTION = "devel/tcltk" - -# http://www.tcl.tk/software/tcltk/license.html -LICENSE = "tcl" -LIC_FILES_CHKSUM = "file://../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ -" - -DEPENDS = "tcl virtual/libx11 libxt" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ - file://confsearch.diff;striplevel=2 \ - file://non-linux.diff;striplevel=2 \ - file://tklibrary.diff;striplevel=2 \ - file://tkprivate.diff;striplevel=2 \ - file://fix-xft.diff \ - file://configure.use.fontconfig.with.xft.patch \ -" -SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba" -SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" - -S = "${WORKDIR}/${BPN}${PV}/unix" - -# Short version format: "8.6" -VER = "${@os.path.splitext(d.getVar('PV'))[0]}" - -LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = "\ - --enable-threads \ - --with-x \ - --with-tcl=${STAGING_BINDIR_CROSS} \ - --libdir=${libdir} \ -" - -do_install_append() { - ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 - oe_libinstall -so libtk${VER} ${D}${libdir} - ln -sf wish${VER} ${D}${bindir}/wish - - # Even after passing libdir=${libdir} at config, some incorrect dirs are still generated for the multilib build - if [ "$libdir" != "/usr/lib" ]; then - # Move files to correct library directory - mv ${D}/usr/lib/tk${VER}/* ${D}/${libdir}/tk${VER}/ - # Remove unneeded/incorrect dir ('usr/lib/') - rm -rf ${D}/usr/lib - fi -} - -PACKAGECONFIG ??= "xft" -PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" -PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" - -PACKAGES =+ "${PN}-lib" - -FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" -FILES_${PN} += "${libdir}/tk*" - -# isn't getting picked up by shlibs code -RDEPENDS_${PN} += "tk-lib" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native" - -# Fix the path in sstate -SSTATE_SCAN_FILES += "*Config.sh" diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb new file mode 100644 index 0000000000..459ae8253b --- /dev/null +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb @@ -0,0 +1,96 @@ +SUMMARY = "Tool Command Language ToolKit Extension" +HOMEPAGE = "http://tcl.sourceforge.net" +SECTION = "devel/tcltk" + +# http://www.tcl.tk/software/tcltk/license.html +LICENSE = "tcl" +LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ +" + +DEPENDS = "tcl virtual/libx11 libxt" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ + file://confsearch.diff;striplevel=2 \ + file://non-linux.diff;striplevel=2 \ + file://tklibrary.diff;striplevel=2 \ + file://tkprivate.diff;striplevel=2 \ + file://fix-xft.diff \ + file://configure.use.fontconfig.with.xft.patch \ +" +SRC_URI[md5sum] = "e3cf6290999ee30651d75864eccfec63" +SRC_URI[sha256sum] = "d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac" + +S = "${WORKDIR}/${BPN}${PV}/unix" + +# Short version format: "8.6" +VER = "${@os.path.splitext(d.getVar('PV'))[0]}" + +LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" +inherit autotools distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = "\ + --enable-threads \ + --with-x \ + --with-tcl=${STAGING_BINDIR}/crossscripts \ + --libdir=${libdir} \ +" +export TK_LIBRARY='${libdir}/tk${VER}' +do_install_append() { + ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 + oe_libinstall -so libtk${VER} ${D}${libdir} + ln -sf wish${VER} ${D}${bindir}/wish + + sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh + sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh + install -d ${D}${bindir_crossscripts} + install -m 0755 tkConfig.sh ${D}${bindir_crossscripts} +} + +PACKAGECONFIG ??= "xft" +PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" +PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" + +PACKAGES =+ "${PN}-lib" + +FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" +FILES_${PN} += "${libdir}/tk*" + +# isn't getting picked up by shlibs code +RDEPENDS_${PN} += "tk-lib" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native nativesdk" + +# Fix the path in sstate +SSTATE_SCAN_FILES += "*Config.sh" + +inherit binconfig + +SYSROOT_DIRS += "${bindir_crossscripts}" + +# Fix some paths that might be used by Tcl extensions +BINCONFIG_GLOB = "*Config.sh" + +# Cleanup host path from ${libdir}/tclConfig.sh and remove the +# ${bindir_crossscripts}/tclConfig.sh from target +PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" +tcl_package_preprocess() { + sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ + -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ + -e "s;${STAGING_INCDIR};${includedir};g" \ + -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + ${PKGD}${libdir}/tkConfig.sh + + rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh +} diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch deleted file mode 100644 index fe7aac9318..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cdf7f2e394fcfb93a61f509ae3388f29540a6b35 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Sep 2018 11:56:13 -0700 -Subject: [PATCH] include dlfcn.h for RTLD_DEFAULT - -Fixes -plthook.c:128:41: error: use of undeclared identifier 'RTLD_DEFAULT' - -Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/487] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libmcount/plthook.c | 1 + - utils/debug.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libmcount/plthook.c b/libmcount/plthook.c -index d9d84f0..d54f5e8 100644 ---- a/libmcount/plthook.c -+++ b/libmcount/plthook.c -@@ -6,6 +6,7 @@ - #include <sys/mman.h> - #include <pthread.h> - #include <assert.h> -+#include <dlfcn.h> - - /* This should be defined before #include "utils.h" */ - #define PR_FMT "mcount" -diff --git a/utils/debug.c b/utils/debug.c -index 2134b09..5460def 100644 ---- a/utils/debug.c -+++ b/utils/debug.c -@@ -13,6 +13,7 @@ - #include <assert.h> - #include <limits.h> - #include <inttypes.h> -+#include <dlfcn.h> - - #include "utils/utils.h" - diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb index e377a5c9d5..4f4016895d 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb @@ -10,15 +10,25 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -# v0.8.3 -SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88" +# v0.9.2 +SRCREV = "66fc1fb973f4a44aecd216541405ffe05196f11e" SRC_URI = "git://github.com/namhyung/${BPN} \ - file://0001-include-dlfcn.h-for-RTLD_DEFAULT.patch \ " S = "${WORKDIR}/git" LDFLAGS_append_libc-musl = " -largp" -EXTRA_UFTRACE_OECONF = "ARCH=${TARGET_ARCH} \ + +def set_target_arch(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match(r'i.86', arch, re.I): + return 'i386' + elif re.match('armeb', arch, re.I): + return 'arm' + else: + return arch + +EXTRA_UFTRACE_OECONF = "ARCH=${@set_target_arch(d)} \ with_elfutils=/use/libelf/from/sysroot" do_configure() { @@ -28,7 +38,7 @@ do_configure() { FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/*.so" -COMPATIBLE_HOST = "(x86_64|aarch64|arm)" +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" # uftrace supports armv6 and above COMPATIBLE_HOST_armv4 = 'null' diff --git a/meta-oe/recipes-devtools/valijson/valijson_git.bb b/meta-oe/recipes-devtools/valijson/valijson_git.bb new file mode 100644 index 0000000000..c3254d16e7 --- /dev/null +++ b/meta-oe/recipes-devtools/valijson/valijson_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Header-only C++ library for JSON Schema validation" +HOMEPAGE = "https://github.com/tristanpenman/valijson" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" + +SRC_URI = "git://github.com/tristanpenman/valijson.git" +PV = "0.1+git${SRCPV}" + +SRCREV = "c2f22fddf599d04dc33fcd7ed257c698a05345d9" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" + +# valijson is a header only C++ library, so the main package will be empty. +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch deleted file mode 100644 index 234d696f19..0000000000 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 950b27f8320b841490cafcb3e6e3b818c7174c0d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 20 Jul 2017 22:32:50 -0400 -Subject: [PATCH] fix compile failure against musl C library - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - test/cpp/server_abyss.cpp | 2 +- - tools/xmlrpc_pstream/xmlrpc_pstream.cpp | 10 +++++++--- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp -index 2458a8f..82f91da 100644 ---- a/test/cpp/server_abyss.cpp -+++ b/test/cpp/server_abyss.cpp -@@ -18,7 +18,7 @@ - #ifdef WIN32 - #include <winsock2.h> - #else -- #include <sys/unistd.h> -+ #include <unistd.h> - #include <sys/socket.h> - #include <arpa/inet.h> - #include <netinet/in.h> -diff --git a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp -index d39e105..1fd8900 100644 ---- a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp -+++ b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp -@@ -15,11 +15,15 @@ - #include "xmlrpc-c/girerr.hpp" - using girerr::throwf; - --#include <features.h> // for __BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - --__BEGIN_DECLS - #include "dumpvalue.h" /* An internal Xmlrpc-c header file ! */ --__END_DECLS -+ -+#ifdef __cplusplus -+} -+#endif - - - #include <xmlrpc-c/base.hpp> --- -2.8.1 - diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch new file mode 100644 index 0000000000..be83b0166c --- /dev/null +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch @@ -0,0 +1,27 @@ +From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 13:31:39 -0800 +Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++ + +/mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int +&, sockaddr *, unsigned int>' + rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/cpp/server_abyss.cpp | 56 +++++++++++++++++++-------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +--- a/test/cpp/server_abyss.cpp ++++ b/test/cpp/server_abyss.cpp +@@ -85,7 +85,7 @@ public: + sockAddr.sin_port = htons(portNumber); + sockAddr.sin_addr.s_addr = 0; + +- rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr)); ++ rc = ::bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr)); + + if (rc != 0) { + closesock(this->fd); diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb deleted file mode 100644 index efa58f1986..0000000000 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ -write an XML-RPC server or client in C or C++." - -HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" -LICENSE = "BSD & MIT" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" - -SRC_URI = "git://github.com/ensc/xmlrpc-c.git;branch=master \ - file://0001-fix-compile-failure-against-musl-C-library.patch \ - file://0002-fix-formatting-issues.patch \ -" -SRCREV = "81443a9dc234cc275449dbc17867ad77ae189124" -S = "${WORKDIR}/git" - -DEPENDS = "curl libxml2" -RDEPENDS_${PN} = "curl perl" - -inherit cmake - -EXTRA_OECMAKE = "-D_lib:STRING=${baselib}" - -BBCLASSEXTEND = "native" - -TARGET_CFLAGS += "-Wno-narrowing" diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb new file mode 100644 index 0000000000..524263760c --- /dev/null +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ +write an XML-RPC server or client in C or C++." + +HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" + +SRC_URI = "git://github.com/mirror/xmlrpc-c.git \ + file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ + file://0002-fix-formatting-issues.patch \ + " +#Release 1.51.03 +SRCREV = "343a3b98e54999d67edb644bcd395aa9784fb16e" + +S = "${WORKDIR}/git/stable" + +DEPENDS = "libxml2" +RDEPENDS_${PN} = "perl" + +inherit autotools-brokensep binconfig pkgconfig + +TARGET_CFLAGS += "-Wno-narrowing" + +EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \ + LD_FOR_BUILD='${BUILD_LD}' \ + CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \ + LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \ + " + +EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client" + +PACKAGECONFIG ??= "curl cplusplus" + +PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl," +PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus,," +PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl,curl" + +do_configure() { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + autoconf + oe_runconf + # license is incompatible with lib/util/getoptx.* + rm -fv ${S}/tools/turbocharger/mod_gzip.c +} + +BBCLASSEXTEND = "native" + +CLEANBROKEN = "1" |