diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-07-10 20:51:27 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2016-07-12 09:13:57 +0200 |
| commit | 8067852f7e000d6a6bb5ebbbb9e20327b54da37e (patch) | |
| tree | 81bed4af7f9c35f48dbb114914ed9ed6b17389f4 /testing/android-tools/fix-build.patch | |
| parent | b4a92014a6e3e43726905fa2428871a5a1444b9f (diff) | |
| download | aports-8067852f7e000d6a6bb5ebbbb9e20327b54da37e.tar.bz2 aports-8067852f7e000d6a6bb5ebbbb9e20327b54da37e.tar.xz | |
testing/android-tools: upgrade to 6.0.1_p46
Use the ruby hack written by the arch linux folks to build the entire
thing.
Diffstat (limited to 'testing/android-tools/fix-build.patch')
| -rw-r--r-- | testing/android-tools/fix-build.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/testing/android-tools/fix-build.patch b/testing/android-tools/fix-build.patch new file mode 100644 index 0000000000..d86ad54e5e --- /dev/null +++ b/testing/android-tools/fix-build.patch @@ -0,0 +1,69 @@ +--- a/core/base/file.cpp ++++ b/core/base/file.cpp +@@ -20,6 +20,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <string.h> + + #include <string> + +--- a/core/liblog/log_read.c ++++ b/core/liblog/log_read.c +@@ -26,6 +26,7 @@ + #include <string.h> + #include <sys/cdefs.h> + #include <unistd.h> ++#include <sys/user.h> + + #include <cutils/list.h> + #include <cutils/sockets.h> + +--- a/libselinux/src/label_internal.h ++++ b/libselinux/src/label_internal.h +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <stdarg.h> ++#include <stdbool.h> + #include <selinux/selinux.h> + #include <selinux/label.h> + #include "dso.h" +diff -upr core.orig/include/utils/Compat.h core/include/utils/Compat.h +--- a/core/include/utils/Compat.h 2016-07-10 15:30:25.935363345 +0200 ++++ b/core/include/utils/Compat.h 2016-07-10 15:31:01.785149166 +0200 +@@ -35,10 +35,11 @@ static inline ssize_t pread64(int fd, vo + + #endif /* __APPLE__ */ + ++#define DEFFILEMODE 0666 ++ + #if defined(_WIN32) + #define O_CLOEXEC O_NOINHERIT + #define O_NOFOLLOW 0 +-#define DEFFILEMODE 0666 + #endif /* _WIN32 */ + + #if defined(_WIN32) +diff -upr core/adb/adb_auth_host.cpp core.orig/adb/adb_auth_host.cpp +--- a/core/adb/adb_auth_host.cpp 2016-04-22 04:11:37.000000000 +0200 ++++ b/core/adb/adb_auth_host.cpp 2016-07-10 20:28:54.553727489 +0200 +@@ -46,6 +46,7 @@ + #include <base/strings.h> + #include <cutils/list.h> + ++#include <openssl/bn.h> + #include <openssl/evp.h> + #include <openssl/objects.h> + #include <openssl/pem.h> +diff -upr core.orig/include/ziparchive/zip_archive.h core/include/ziparchive/zip_archive.h +--- a/core/include/ziparchive/zip_archive.h 2016-07-10 20:41:30.509065561 +0200 ++++ b/core/include/ziparchive/zip_archive.h 2016-07-10 20:41:47.117424874 +0200 +@@ -23,6 +23,7 @@ + #include <stdint.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/cdefs.h> + #include <utils/Compat.h> + + __BEGIN_DECLS |