diff options
Diffstat (limited to 'devel/android-tools-adb')
| -rw-r--r-- | devel/android-tools-adb/Makefile | 2 | ||||
| -rw-r--r-- | devel/android-tools-adb/distinfo | 10 | ||||
| -rw-r--r-- | devel/android-tools-adb/files/Makefile | 7 | ||||
| -rw-r--r-- | devel/android-tools-adb/files/patch-base_include_android-base_logging.h | 11 | ||||
| -rw-r--r-- | devel/android-tools-adb/files/patch-liblog_logger.h | 16 |
5 files changed, 29 insertions, 17 deletions
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile index e7f615c96730..ed7de25c2051 100644 --- a/devel/android-tools-adb/Makefile +++ b/devel/android-tools-adb/Makefile @@ -2,7 +2,7 @@ PORTNAME= android-tools-adb DISTVERSIONPREFIX= platform-tools- -DISTVERSION?= 29.0.5 +DISTVERSION?= 29.0.6 PORTREVISION?= 0 CATEGORIES= devel comms diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo index b7df5cf9a19a..d34e15abf65e 100644 --- a/devel/android-tools-adb/distinfo +++ b/devel/android-tools-adb/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1571358141 -SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = a89ed6195862578acc01092e8ca390cd7578725bca9eed77b6b730f334b4c255 -SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = 68752941 +TIMESTAMP = 1581453885 +SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.6_GH0.tar.gz) = 3d1898c1ad19f63641090576c60588ab761132b42b306ff4979d30723187d562 +SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.6_GH0.tar.gz) = 72302409 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 -SHA256 (aosp-mirror-platform_development-platform-tools-29.0.5_GH0.tar.gz) = 6975dbe199d76f375a4da5b945be1e389611906420f40b3c5c961a33929d2443 -SIZE (aosp-mirror-platform_development-platform-tools-29.0.5_GH0.tar.gz) = 63881721 +SHA256 (aosp-mirror-platform_development-platform-tools-29.0.6_GH0.tar.gz) = 5560f767082834183e31af0fca9e121996e5e16aac67ce10f9321c4146809a0a +SIZE (aosp-mirror-platform_development-platform-tools-29.0.6_GH0.tar.gz) = 63959966 diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile index 7f1435627c82..515776f7d9c6 100644 --- a/devel/android-tools-adb/files/Makefile +++ b/devel/android-tools-adb/files/Makefile @@ -21,6 +21,7 @@ SRCS+= sysdeps_unix.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp SRCS+= transport_usb.cpp +SRCS+= types.cpp TEST_SRCS+= adb_io_test.cpp TEST_SRCS+= adb_listeners_test.cpp @@ -61,6 +62,7 @@ SRCS+= network.cpp .PATH: ${.CURDIR}/../base SRCS+= chrono_utils.cpp SRCS+= file.cpp +SRCS+= liblog_symbols.cpp SRCS+= logging.cpp SRCS+= parsenetaddress.cpp SRCS+= stringprintf.cpp @@ -92,6 +94,11 @@ SRCS+= threads.cpp # DragonFly, NetBSD, OpenBSD CPPFLAGS.sockets.cpp+= -o ${.TARGET} +# required by base +.PATH: ${.CURDIR}/../liblog +SRCS+= logger_write.cpp +SRCS+= ../liblog/properties.cpp + CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\"" CPPFLAGS+= -DADB_HOST=1 CPPFLAGS+= -Doff64_t=off_t diff --git a/devel/android-tools-adb/files/patch-base_include_android-base_logging.h b/devel/android-tools-adb/files/patch-base_include_android-base_logging.h index 7e536840b840..7bdccd8bad78 100644 --- a/devel/android-tools-adb/files/patch-base_include_android-base_logging.h +++ b/devel/android-tools-adb/files/patch-base_include_android-base_logging.h @@ -9,14 +9,3 @@ static constexpr bool kEnableDChecks = false; #else static constexpr bool kEnableDChecks = true; -@@ -486,8 +486,9 @@ namespace std { // NOLINT(cert-dcl58-cpp) - #pragma clang diagnostic ignored "-Wgcc-compat" - #define OSTREAM_STRING_POINTER_USAGE_WARNING \ - __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning"))) -+OSTREAM_STRING_POINTER_USAGE_WARNING // GCC - inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) -- OSTREAM_STRING_POINTER_USAGE_WARNING { -+{ - return stream << static_cast<const void*>(string_pointer); - } - #pragma clang diagnostic pop diff --git a/devel/android-tools-adb/files/patch-liblog_logger.h b/devel/android-tools-adb/files/patch-liblog_logger.h new file mode 100644 index 000000000000..2bf6f1fe9fa0 --- /dev/null +++ b/devel/android-tools-adb/files/patch-liblog_logger.h @@ -0,0 +1,16 @@ +--- liblog/logger.h.orig 2020-02-11 20:44:45 UTC ++++ liblog/logger.h +@@ -16,7 +16,13 @@ + + #pragma once + ++#ifdef __cplusplus ++#include <atomic> ++using std::atomic_int; ++using std::atomic_uintptr_t; ++#else + #include <stdatomic.h> ++#endif + #include <sys/cdefs.h> + + #include <log/log.h> |