svn commit: r398011 - in head/devel: android-tools-adb-devel android-tools-adb-devel/files android-tools-adb/files android-tools-fastboot android-tools-fastboot-devel android-tools-fastboot-devel/f...
Jan Beich
jbeich at FreeBSD.org
Sat Sep 26 20:26:00 UTC 2015
Author: jbeich
Date: Sat Sep 26 20:25:57 2015
New Revision: 398011
URL: https://svnweb.freebsd.org/changeset/ports/398011
Log:
devel/android-tools-*: restore CPPFLAGS support after r390135
Modified:
head/devel/android-tools-adb-devel/Makefile (contents, props changed)
head/devel/android-tools-adb-devel/files/Makefile (contents, props changed)
head/devel/android-tools-adb/files/Makefile (contents, props changed)
head/devel/android-tools-fastboot-devel/Makefile (contents, props changed)
head/devel/android-tools-fastboot-devel/files/Makefile (contents, props changed)
head/devel/android-tools-fastboot/Makefile (contents, props changed)
head/devel/android-tools-fastboot/files/Makefile (contents, props changed)
head/devel/android-tools-simpleperf/files/Makefile (contents, props changed)
Modified: head/devel/android-tools-adb-devel/Makefile
==============================================================================
--- head/devel/android-tools-adb-devel/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-adb-devel/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -17,7 +17,7 @@ USES= compiler:c++11-lib
BUILD_WRKSRC= ${WRKSRC}/adb
INSTALL_WRKSRC= ${BUILD_WRKSRC}
MAKE_ENV= FILESDIR="${FILESDIR}"
-CFLAGS+= -DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
+CPPFLAGS+= -DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
ALL_TARGET= all
OPTIONS_DEFINE= TEST
Modified: head/devel/android-tools-adb-devel/files/Makefile
==============================================================================
--- head/devel/android-tools-adb-devel/files/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-adb-devel/files/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -62,25 +62,28 @@ SRCS+= threads.c
.PATH: ${.CURDIR}/../liblog
SRCS+= fake_log_device.c
SRCS+= logd_write.c
-CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
-
-CFLAGS+= -DADB_HOST=1
-CFLAGS+= -DHAVE_FORKEXEC=1
-CFLAGS+= -DHAVE_SYMLINKS
-CFLAGS+= -DHAVE_TERMIO_H
-CFLAGS+= -DHAVE_SYS_SOCKET_H
-CFLAGS+= -D_FILE_OFFSET_BITS=64
-CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../include
-CFLAGS+= -I${.CURDIR}/../base/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
+CPPFLAGS+= -DADB_HOST=1
+CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -DHAVE_SYS_SOCKET_H
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -I${.CURDIR}/../base/include
+CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CXXFLAGS+= -std=gnu++11
-CXXFLAGS+= ${CFLAGS:N-std*}
-TEST_CFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+CXXFLAGS+= ${CPPFLAGS}
+.endif
+
+TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
.for f in ${TEST_SRCS}
-CFLAGS.${f}+= ${TEST_CFLAGS}
+CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
.endfor
LDADD+= -lcrypto -lpthread -lusb -lz
@@ -90,6 +93,6 @@ TEST_LDADD+= $$(${GTEST_CONFIG} --libs -
GTEST_CONFIG?= gtest-config
adb_test: ${SRCS:R:S/$/.o/:Nmain.o:Ncommandline.o} ${TEST_SRCS:R:S/$/.o/}
- ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
+ ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
.include <bsd.prog.mk>
Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-adb/files/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -33,14 +33,18 @@ SRCS+= load_file.c
SRCS+= centraldir.c
SRCS+= zipfile.c
-CFLAGS+= -DADB_HOST=1
-CFLAGS+= -DHAVE_FORKEXEC=1
-CFLAGS+= -DHAVE_SYMLINKS
-CFLAGS+= -DHAVE_TERMIO_H
-CFLAGS+= -DHAVE_SYS_SOCKET_H
-CFLAGS+= -D_FILE_OFFSET_BITS=64
-CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -DADB_HOST=1
+CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -DHAVE_SYS_SOCKET_H
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+.endif
LDADD+= -lcrypto -lpthread -lusb -lz
DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
Modified: head/devel/android-tools-fastboot-devel/Makefile
==============================================================================
--- head/devel/android-tools-fastboot-devel/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-fastboot-devel/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -16,6 +16,6 @@ FILESDIR= ${.CURDIR}/files
EXTRA_PATCHES+= ${.CURDIR}/files/patch-*
USES= compiler:c++11-lib
-CFLAGS+= -DFASTBOOT_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
+CPPFLAGS+= -DFASTBOOT_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
.include "${MASTERDIR}/Makefile"
Modified: head/devel/android-tools-fastboot-devel/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot-devel/files/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-fastboot-devel/files/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -36,7 +36,7 @@ SRCS+= wipe.c
.PATH: ${.CURDIR}/../liblog
SRCS+= fake_log_device.c
SRCS+= logd_write.c
-CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
+CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
# required by ext4_utils
.PATH: ${.CURDIR}/../libselinux/src
@@ -48,8 +48,8 @@ SRCS+= label.c
SRCS+= label_android_property.c
SRCS+= label_file.c
SRCS+= label_support.c
-CFLAGS.init.c+= -DDARWIN # statfs
-CFLAGS.label_file.c+= -D_WITH_GETLINE
+CPPFLAGS.init.c+= -DDARWIN # statfs
+CPPFLAGS.label_file.c+= -D_WITH_GETLINE
# required by fastboot and ext4_utils
.PATH: ${.CURDIR}/../libsparse
@@ -68,24 +68,27 @@ SRCS+= FileMap.cpp
.PATH: ${.CURDIR}/../libziparchive
SRCS+= zip_archive.cc
-CFLAGS+=-Doff64_t=off_t
-CFLAGS+=-Dftruncate64=ftruncate
-CFLAGS+=-Dlseek64=lseek
-CFLAGS+=-Dmmap64=mmap
-CFLAGS+=-Dpread64=pread
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../include
-CFLAGS+=-I${.CURDIR}/../mkbootimg
-CFLAGS+=-I${.CURDIR}/../base/include
-CFLAGS+=-I${.CURDIR}/../ext4_utils
-CFLAGS+=-I${.CURDIR}/../f2fs_utils
-CFLAGS+=-I${.CURDIR}/../libselinux/include
-CFLAGS+=-I${.CURDIR}/../libsparse/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
-
-CXXFLAGS+=-D__STDC_LIMIT_MACROS # DragonFly
-CXXFLAGS+=-std=gnu++11
-CXXFLAGS+=${CFLAGS:N-std*}
+CPPFLAGS+= -Doff64_t=off_t
+CPPFLAGS+= -Dftruncate64=ftruncate
+CPPFLAGS+= -Dlseek64=lseek
+CPPFLAGS+= -Dmmap64=mmap
+CPPFLAGS+= -Dpread64=pread
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -I${.CURDIR}/../mkbootimg
+CPPFLAGS+= -I${.CURDIR}/../base/include
+CPPFLAGS+= -I${.CURDIR}/../ext4_utils
+CPPFLAGS+= -I${.CURDIR}/../f2fs_utils
+CPPFLAGS+= -I${.CURDIR}/../libselinux/include
+CPPFLAGS+= -I${.CURDIR}/../libsparse/include
+CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
+CXXFLAGS+= -D__STDC_LIMIT_MACROS # DragonFly
+CXXFLAGS+= -std=gnu++11
+
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+CXXFLAGS+= ${CPPFLAGS}
+.endif
LDADD+= -lpcre -lusb -lz
DPADD+= ${LIBPCRE} ${LIBUSB} ${LIBZ}
Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-fastboot/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -35,7 +35,7 @@ MAKEFILE= ${FILESDIR}/Makefile
MAKE_ENV= FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin" \
MANDIR="${PREFIX}/man/man" \
LIBPCRE="${LOCALBASE}/lib/libpcre.a"
-CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/fastboot \
%%BASH%%etc/bash_completion.d/fastboot \
Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-fastboot/files/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -36,7 +36,7 @@ SRCS+= init.c
SRCS+= label.c
SRCS+= label_android_property.c
SRCS+= label_file.c
-CFLAGS.init.c+= -DDARWIN # statfs
+CPPFLAGS.init.c+= -DDARWIN # statfs
.PATH: ${.CURDIR}/../libsparse
SRCS+= backed_block.c
@@ -49,21 +49,25 @@ SRCS+= sparse_read.c
.PATH: ${.CURDIR}/../libzipfile
SRCS+= centraldir.c
SRCS+= zipfile.c
-CFLAGS.centraldir.c+= -Ulseek64 # utils/Compat.h
+CPPFLAGS.centraldir.c+= -Ulseek64 # utils/Compat.h
-CFLAGS+=-D_FILE_OFFSET_BITS=64 # utils/Compat.h
-CFLAGS+=-Doff64_t=off_t
-CFLAGS+=-Dftruncate64=ftruncate
-CFLAGS+=-Dlseek64=lseek
-CFLAGS+=-Dmmap64=mmap
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../include
-CFLAGS+=-I${.CURDIR}/../mkbootimg
-CFLAGS+=-I${.CURDIR}/../ext4_utils
-CFLAGS+=-I${.CURDIR}/../f2fs_utils
-CFLAGS+=-I${.CURDIR}/../libselinux/include
-CFLAGS+=-I${.CURDIR}/../libsparse/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64 # utils/Compat.h
+CPPFLAGS+= -Doff64_t=off_t
+CPPFLAGS+= -Dftruncate64=ftruncate
+CPPFLAGS+= -Dlseek64=lseek
+CPPFLAGS+= -Dmmap64=mmap
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -I${.CURDIR}/../mkbootimg
+CPPFLAGS+= -I${.CURDIR}/../ext4_utils
+CPPFLAGS+= -I${.CURDIR}/../f2fs_utils
+CPPFLAGS+= -I${.CURDIR}/../libselinux/include
+CPPFLAGS+= -I${.CURDIR}/../libsparse/include
+CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
+
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+.endif
LDADD+= -lpcre -lusb -lz
DPADD+= ${LIBPCRE} ${LIBUSB} ${LIBZ}
Modified: head/devel/android-tools-simpleperf/files/Makefile
==============================================================================
--- head/devel/android-tools-simpleperf/files/Makefile Sat Sep 26 20:25:34 2015 (r398010)
+++ head/devel/android-tools-simpleperf/files/Makefile Sat Sep 26 20:25:57 2015 (r398011)
@@ -45,28 +45,31 @@ TEST_SRCS+= test_utils.cpp
.PATH: ${.CURDIR}/../liblog
SRCS+= fake_log_device.c
SRCS+= logd_write.c
-CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
+CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
# required by base
.PATH: ${.CURDIR}/../libcutils
SRCS+= threads.c
-CFLAGS+=-D_WITH_GETLINE
-CFLAGS+=-DUSE_BIONIC_UAPI_HEADERS
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/darwin_support/include
-CFLAGS+=-I${.CURDIR}/../include
-CFLAGS+=-I${.CURDIR}/../base/include
-CFLAGS+=-I${.CURDIR}/../bionic/libc/kernel
-CFLAGS+=$$(${LLVM_CONFIG} --cppflags)
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS+= -D_WITH_GETLINE
+CPPFLAGS+= -DUSE_BIONIC_UAPI_HEADERS
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/darwin_support/include
+CPPFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -I${.CURDIR}/../base/include
+CPPFLAGS+= -I${.CURDIR}/../bionic/libc/kernel
+CPPFLAGS+= $$(${LLVM_CONFIG} --cppflags)
+CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
+CXXFLAGS+= -std=gnu++11
+
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+CXXFLAGS+= ${CPPFLAGS}
+.endif
-CXXFLAGS+=-std=gnu++11
-CXXFLAGS+=${CFLAGS:N-std*}
-
-TEST_CFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
.for f in ${TEST_SRCS}
-CFLAGS.${f}+= ${TEST_CFLAGS}
+CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
.endfor
LDADD+= $$(${LLVM_CONFIG} --system-libs --libs --ldflags)
@@ -76,6 +79,6 @@ LLVM_CONFIG?= llvm-config
GTEST_CONFIG?= gtest-config
simpleperf_unit_test: ${SRCS:R:S/$/.o/:Nmain.o} ${TEST_SRCS:R:S/$/.o/}
- ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
+ ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
.include <bsd.prog.mk>
More information about the svn-ports-all
mailing list