diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-29 03:44:05 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-29 03:44:05 +0000 |
| commit | e78331a9633a7ed466ae2d0bd2c29828eb112eae (patch) | |
| tree | b96ac17f4ec6a977031d1dcf40e70ad8aecbcbd2 /devel/android-tools-adb | |
| parent | 3d06e607e50b96cc1d568a1ed15bd407877697a0 (diff) | |
| download | ports-e78331a9633a7ed466ae2d0bd2c29828eb112eae.tar.gz ports-e78331a9633a7ed466ae2d0bd2c29828eb112eae.zip | |
devel/android-tools-{adb,fastboot}-devel: update to n.p.5.3582
Changes: https://android.googlesource.com/platform/system/core/+log/2f21b7cecda2..dfd30c4a169e/adb
Changes: https://android.googlesource.com/platform/system/core/+log/2f21b7cecda2..dfd30c4a169e/fastboot
Notes
Notes:
svn path=/head/; revision=422901
Diffstat (limited to 'devel/android-tools-adb')
| -rw-r--r-- | devel/android-tools-adb/Makefile | 7 | ||||
| -rw-r--r-- | devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h (renamed from devel/android-tools-adb/files/patch-adb_sysdeps_mutex.h) | 0 | ||||
| -rw-r--r-- | devel/android-tools-adb/files/extra-patch-base_file.cpp (renamed from devel/android-tools-adb/files/patch-base_file.cpp) | 0 |
3 files changed, 6 insertions, 1 deletions
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile index c28df87d9faa..e6cd47c814fb 100644 --- a/devel/android-tools-adb/Makefile +++ b/devel/android-tools-adb/Makefile @@ -28,6 +28,11 @@ GH_REVISION= 88f64719d756 # generated by: make update-revision CONFLICTS_INSTALL?= ${PORTNAME}-devel-* +.ifndef EXTRA_PATCHES +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-adb_sysdeps_mutex.h +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file.cpp +.endif + USES= compiler:c++11-lib pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} @@ -56,7 +61,7 @@ BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" -TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest +TEST_BUILD_DEPENDS+= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test pre-install-TEST-on: do-test diff --git a/devel/android-tools-adb/files/patch-adb_sysdeps_mutex.h b/devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h index 792d29f7f738..792d29f7f738 100644 --- a/devel/android-tools-adb/files/patch-adb_sysdeps_mutex.h +++ b/devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h diff --git a/devel/android-tools-adb/files/patch-base_file.cpp b/devel/android-tools-adb/files/extra-patch-base_file.cpp index 754b02594d0c..754b02594d0c 100644 --- a/devel/android-tools-adb/files/patch-base_file.cpp +++ b/devel/android-tools-adb/files/extra-patch-base_file.cpp |