diff options
Diffstat (limited to 'devel/android-tools-fastboot-devel/files')
4 files changed, 29 insertions, 6 deletions
diff --git a/devel/android-tools-fastboot-devel/files/Makefile b/devel/android-tools-fastboot-devel/files/Makefile index cbb33acca054..e798e9acaec7 100644 --- a/devel/android-tools-fastboot-devel/files/Makefile +++ b/devel/android-tools-fastboot-devel/files/Makefile @@ -56,9 +56,13 @@ CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980 # required by base and libutils .PATH: ${.CURDIR}/../liblog +SRCS+= config_write.c SRCS+= fake_log_device.c -SRCS+= logd_write.c -CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1 +SRCS+= fake_writer.c +SRCS+= logger_lock.c +SRCS+= logger_name.c +SRCS+= logger_write.c +CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1 # required by ext4_utils .PATH: ${.CURDIR}/../libselinux/src @@ -70,6 +74,7 @@ SRCS+= label.c SRCS+= label_android_property.c SRCS+= label_file.c SRCS+= label_support.c +SRCS+= regex.c CPPFLAGS.label_file.c+= -D_WITH_GETLINE # required by fastboot and ext4_utils diff --git a/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c b/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c new file mode 100644 index 000000000000..481e87407296 --- /dev/null +++ b/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c @@ -0,0 +1,16 @@ +--- liblog/logger_write.c.orig 2016-04-16 00:01:39 UTC ++++ liblog/logger_write.c +@@ -15,12 +15,12 @@ + */ + + #include <errno.h> +-#include <stdatomic.h> + #include <stdlib.h> + #include <string.h> + #include <sys/time.h> + + #ifdef __BIONIC__ ++#include <stdatomic.h> + #include <android/set_abort_message.h> + #endif + diff --git a/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp b/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp index 3780489b4fea..1eb0ca809ee6 100644 --- a/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp +++ b/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp @@ -44,7 +44,7 @@ struct usb_handle { class LibusbUsbTransport : public Transport { public: - LibusbUsbTransport(std::unique_ptr<usb_handle> handle): + explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle): h(std::move(handle)) {} ~LibusbUsbTransport() override = default; diff --git a/devel/android-tools-fastboot-devel/files/util_freebsd.cpp b/devel/android-tools-fastboot-devel/files/util_freebsd.cpp index e962993e35a9..0734454a9c85 100644 --- a/devel/android-tools-fastboot-devel/files/util_freebsd.cpp +++ b/devel/android-tools-fastboot-devel/files/util_freebsd.cpp @@ -30,8 +30,10 @@ #include <unistd.h> #include <limits.h> -void -get_my_path(char *path) +std::string +get_my_path() { - getcwd(path, PATH_MAX - 1); + char path[PATH_MAX + 1]; + getcwd(path, sizeof(path) - 1); + return path; } |