From 82d6d552b35cf9f4ade01f58000b8322d78f35f3 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 12 Sep 2019 14:57:02 +0000 Subject: devel/android-tools-fastboot: replace post-extract via GH_SUBDIR --- devel/android-tools-fastboot/Makefile | 3 -- devel/android-tools-fastboot/files/Makefile | 6 +-- .../files/patch-ext4__utils_ext4__utils.cpp | 47 ---------------------- .../files/patch-extras_ext4__utils_ext4__utils.cpp | 47 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 53 deletions(-) delete mode 100644 devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp create mode 100644 devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp (limited to 'devel/android-tools-fastboot') diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile index 6086c3a50c1d..52ea8c351355 100644 --- a/devel/android-tools-fastboot/Makefile +++ b/devel/android-tools-fastboot/Makefile @@ -51,9 +51,6 @@ DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" post-extract: @${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \ ${BUILD_WRKSRC} -# Adjust paths relative to core - @(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC}) - @(cd ${WRKSRC_mkbootimg} && ${COPYTREE_SHARE} . ${WRKSRC}) post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile index 40c5ea52131c..abbb88e6bfff 100644 --- a/devel/android-tools-fastboot/files/Makefile +++ b/devel/android-tools-fastboot/files/Makefile @@ -35,7 +35,7 @@ SRCS+= threads.cpp SRCS+= diagnose_usb.cpp # required by fs_mgr/liblp -.PATH: ${.CURDIR}/../ext4_utils +.PATH: ${.CURDIR}/../extras/ext4_utils SRCS+= ext4_sb.cpp SRCS+= ext4_utils.cpp @@ -91,10 +91,10 @@ CPPFLAGS+= -Dpread64=pread CPPFLAGS+= -DFAKE_LOG_DEVICE=1 CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../include -CPPFLAGS+= -I${.CURDIR}/../include/bootimg +CPPFLAGS+= -I${.CURDIR}/../mkbootimg/include/bootimg CPPFLAGS+= -I${.CURDIR}/../base/include CPPFLAGS+= -I${.CURDIR}/../diagnose_usb/include -CPPFLAGS+= -I${.CURDIR}/../ext4_utils/include +CPPFLAGS+= -I${.CURDIR}/../extras/ext4_utils/include CPPFLAGS+= -I${.CURDIR}/../fs_mgr/liblp/include CPPFLAGS+= -I${.CURDIR}/../libsparse/include CPPFLAGS+= -I${.CURDIR}/../libziparchive/include diff --git a/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp b/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp deleted file mode 100644 index 5761c768bbe2..000000000000 --- a/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- ext4_utils/ext4_utils.cpp.orig 2019-08-13 02:10:50 UTC -+++ ext4_utils/ext4_utils.cpp -@@ -32,8 +32,16 @@ - - #if defined(__linux__) - #include --#elif defined(__APPLE__) && defined(__MACH__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || (defined(__APPLE__) && defined(__MACH__)) - #include -+#elif defined(__sun) -+#include -+#elif defined(__Bitrig__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include -+#include -+#elif defined(__DragonFly__) -+#include - #endif - - int force = 0; -@@ -206,10 +214,24 @@ u64 get_block_device_size(int fd) - u64 size = 0; - int ret; - --#if defined(__linux__) -+#if defined(BLKGETSIZE64) - ret = ioctl(fd, BLKGETSIZE64, &size); --#elif defined(__APPLE__) && defined(__MACH__) -+#elif defined(DKIOCGETBLOCKCOUNT) - ret = ioctl(fd, DKIOCGETBLOCKCOUNT, &size); -+#elif defined(DIOCGMEDIASIZE) -+ ret = ioctl(fd, DIOCGMEDIASIZE, &size); -+#elif defined(DKIOCGMEDIAINFO) -+ struct dk_minfo minfo; -+ ret = ioctl(fd, DKIOCGMEDIAINFO, &minfo); -+ size = minfo.dki_lbsize * minfo.dki_capacity; -+#elif defined(DIOCGDINFO) -+ struct disklabel dl; -+ ret = ioctl(fd, DIOCGDINFO, &dl); -+ size = dl.d_secsize * dl.d_nsectors * dl.d_ntracks * dl.d_ncylinders; -+#elif defined(DIOCGPART) -+ struct partinfo pi; -+ ret = ioctl(fd, DIOCGPART, &pi); -+ size = pi.media_size; - #else - close(fd); - return 0; diff --git a/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp b/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp new file mode 100644 index 000000000000..802be5e45ca5 --- /dev/null +++ b/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp @@ -0,0 +1,47 @@ +--- extras/ext4_utils/ext4_utils.cpp.orig 2019-08-13 02:10:50 UTC ++++ extras/ext4_utils/ext4_utils.cpp +@@ -32,8 +32,16 @@ + + #if defined(__linux__) + #include +-#elif defined(__APPLE__) && defined(__MACH__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ ++ || (defined(__APPLE__) && defined(__MACH__)) + #include ++#elif defined(__sun) ++#include ++#elif defined(__Bitrig__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#include ++#include ++#elif defined(__DragonFly__) ++#include + #endif + + int force = 0; +@@ -206,10 +214,24 @@ u64 get_block_device_size(int fd) + u64 size = 0; + int ret; + +-#if defined(__linux__) ++#if defined(BLKGETSIZE64) + ret = ioctl(fd, BLKGETSIZE64, &size); +-#elif defined(__APPLE__) && defined(__MACH__) ++#elif defined(DKIOCGETBLOCKCOUNT) + ret = ioctl(fd, DKIOCGETBLOCKCOUNT, &size); ++#elif defined(DIOCGMEDIASIZE) ++ ret = ioctl(fd, DIOCGMEDIASIZE, &size); ++#elif defined(DKIOCGMEDIAINFO) ++ struct dk_minfo minfo; ++ ret = ioctl(fd, DKIOCGMEDIAINFO, &minfo); ++ size = minfo.dki_lbsize * minfo.dki_capacity; ++#elif defined(DIOCGDINFO) ++ struct disklabel dl; ++ ret = ioctl(fd, DIOCGDINFO, &dl); ++ size = dl.d_secsize * dl.d_nsectors * dl.d_ntracks * dl.d_ncylinders; ++#elif defined(DIOCGPART) ++ struct partinfo pi; ++ ret = ioctl(fd, DIOCGPART, &pi); ++ size = pi.media_size; + #else + close(fd); + return 0; -- cgit v1.2.3