diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-09-12 14:57:02 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-09-12 14:57:02 +0000 |
| commit | 82d6d552b35cf9f4ade01f58000b8322d78f35f3 (patch) | |
| tree | bc761d173a8ae92ede014bcd711817646f42e6cd /devel/android-tools-fastboot | |
| parent | devel/android-tools-*: simplify via GH_TUPLE (diff) | |
devel/android-tools-fastboot: replace post-extract via GH_SUBDIR
Notes
Notes:
svn path=/head/; revision=511886
Diffstat (limited to 'devel/android-tools-fastboot')
| -rw-r--r-- | devel/android-tools-fastboot/Makefile | 3 | ||||
| -rw-r--r-- | devel/android-tools-fastboot/files/Makefile | 6 | ||||
| -rw-r--r-- | devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp (renamed from devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp) | 4 |
3 files changed, 5 insertions, 8 deletions
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-extras_ext4__utils_ext4__utils.cpp index 5761c768bbe2..802be5e45ca5 100644 --- a/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp +++ b/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp @@ -1,5 +1,5 @@ ---- ext4_utils/ext4_utils.cpp.orig 2019-08-13 02:10:50 UTC -+++ ext4_utils/ext4_utils.cpp +--- 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__) |