diff options
Diffstat (limited to 'devel/android-tools-adb-devel/files')
8 files changed, 0 insertions, 133 deletions
diff --git a/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp deleted file mode 100644 index 5473120eff45..000000000000 --- a/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/adb_io_test.cpp.orig 2015-09-05 00:01:27 UTC -+++ adb/adb_io_test.cpp -@@ -18,6 +18,7 @@ - - #include <gtest/gtest.h> - -+#include <errno.h> - #include <fcntl.h> - #include <stdio.h> - #include <stdlib.h> diff --git a/devel/android-tools-adb-devel/files/patch-adb_commandline.cpp b/devel/android-tools-adb-devel/files/patch-adb_commandline.cpp deleted file mode 100644 index 20e9bea6545d..000000000000 --- a/devel/android-tools-adb-devel/files/patch-adb_commandline.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- adb/commandline.cpp.orig 2015-06-17 22:20:38 UTC -+++ adb/commandline.cpp -@@ -637,7 +637,7 @@ static int ppp(int argc, const char** ar - - // copy args - ppp_args = (const char **) alloca(sizeof(char *) * argc + 1); -- ppp_args[0] = "pppd"; -+ ppp_args[0] = "ppp"; - for (i = 2 ; i < argc ; i++) { - //argv[2] and beyond become ppp_args[1] and beyond - ppp_args[i - 1] = argv[i]; -@@ -651,10 +651,10 @@ static int ppp(int argc, const char** ar - adb_close(STDERR_FILENO); - adb_close(fd); - -- err = execvp("pppd", (char * const *)ppp_args); -+ err = execvp("ppp", (char * const *)ppp_args); - - if (err < 0) { -- perror("execing pppd"); -+ perror("execing ppp"); - } - exit(-1); - } else { diff --git a/devel/android-tools-adb-devel/files/patch-base_file.cpp b/devel/android-tools-adb-devel/files/patch-base_file.cpp deleted file mode 100644 index 29638851e71d..000000000000 --- a/devel/android-tools-adb-devel/files/patch-base_file.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- base/file.cpp.orig 2015-05-27 20:24:08 UTC -+++ base/file.cpp -@@ -21,6 +21,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - -+#include <cstring> // strerror - #include <string> - - #include "base/macros.h" // For TEMP_FAILURE_RETRY on Darwin. diff --git a/devel/android-tools-adb-devel/files/patch-base_include_base_logging.h b/devel/android-tools-adb-devel/files/patch-base_include_base_logging.h deleted file mode 100644 index 4770e9e0b411..000000000000 --- a/devel/android-tools-adb-devel/files/patch-base_include_base_logging.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/include/base/logging.h.orig 2015-09-29 18:07:07 UTC -+++ base/include/base/logging.h -@@ -25,6 +25,8 @@ - #endif - #endif - -+#include <errno.h> -+ - #include <functional> - #include <memory> - #include <ostream> diff --git a/devel/android-tools-adb-devel/files/patch-base_logging.cpp b/devel/android-tools-adb-devel/files/patch-base_logging.cpp deleted file mode 100644 index 53bf6fdd0537..000000000000 --- a/devel/android-tools-adb-devel/files/patch-base_logging.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- base/logging.cpp.orig 2015-06-17 22:20:38 UTC -+++ base/logging.cpp -@@ -23,12 +23,14 @@ - #include <libgen.h> - - // For getprogname(3) or program_invocation_short_name. --#if defined(__ANDROID__) || defined(__APPLE__) -+#if !defined(_WIN32) && !defined(__GLIBC__) - #include <stdlib.h> - #elif defined(__GLIBC__) - #include <errno.h> - #endif - -+#include <cstring> // strlen -+#include <cstdio> // fprintf - #include <iostream> - #include <limits> - #include <sstream> diff --git a/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp b/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp deleted file mode 100644 index a367b9d5c540..000000000000 --- a/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- base/stringprintf_test.cpp.orig 2015-09-17 22:58:36 UTC -+++ base/stringprintf_test.cpp -@@ -18,6 +18,7 @@ - - #include <gtest/gtest.h> - -+#include <errno.h> - #include <string> - - TEST(StringPrintfTest, HexSizeT) { diff --git a/devel/android-tools-adb-devel/files/patch-libcutils_threads.c b/devel/android-tools-adb-devel/files/patch-libcutils_threads.c deleted file mode 100644 index a275276f095d..000000000000 --- a/devel/android-tools-adb-devel/files/patch-libcutils_threads.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libcutils/threads.c.orig 2015-06-17 22:20:38 UTC -+++ libcutils/threads.c -@@ -29,6 +29,14 @@ - #include <unistd.h> - #elif defined(_WIN32) - #include <windows.h> -+#elif defined(__DragonFly__) -+#include <unistd.h> -+#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> -+#include <pthread_np.h> -+#elif defined(__NetBSD__) -+#include <lwp.h> - #endif - - // No definition needed for Android because we'll just pick up bionic's copy. -@@ -40,6 +48,20 @@ pid_t gettid() { - return syscall(__NR_gettid); - #elif defined(_WIN32) - return GetCurrentThreadId(); -+#elif defined(__DragonFly__) -+ return lwp_gettid(); -+#elif defined(__NetBSD__) -+ return _lwp_self(); -+#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif -+#else -+ return (intptr_t) pthread_self(); - #endif - } - #endif // __ANDROID__ diff --git a/devel/android-tools-adb-devel/files/patch-liblog_logd__write.c b/devel/android-tools-adb-devel/files/patch-liblog_logd__write.c deleted file mode 100644 index d9a8890325d4..000000000000 --- a/devel/android-tools-adb-devel/files/patch-liblog_logd__write.c +++ /dev/null @@ -1,12 +0,0 @@ ---- liblog/logd_write.c.orig 2015-05-27 20:24:08 UTC -+++ liblog/logd_write.c -@@ -22,7 +22,9 @@ - #include <pthread.h> - #endif - #include <stdarg.h> -+#if (FAKE_LOG_DEVICE == 0) - #include <stdatomic.h> -+#endif - #include <stdio.h> - #include <stdlib.h> - #include <string.h> |