svn commit: r390008 - head/devel/android-tools-fastboot/files
Jan Beich
jbeich at FreeBSD.org
Thu Jun 18 01:46:36 UTC 2015
Author: jbeich
Date: Thu Jun 18 01:46:34 2015
New Revision: 390008
URL: https://svnweb.freebsd.org/changeset/ports/390008
Log:
devel/android-tools-fastboot: shuffle CFLAGS to unbreak DragonFly
Avoid stepping into OS X platform code with off64_t workaround.
cc ... -D__APPLE__ -D__MACH__ .../ext4_utils/ext4_utils.c
In file included from .../ext4_utils/ext4_utils.c:43:0:
/usr/include/sys/disk.h:49:2: error: #error "This file should not be included by userland programs."
#error "This file should not be included by userland programs."
^
*** [ext4_utils.o] Error code 1
Reported by: DPorts
Modified:
head/devel/android-tools-fastboot/files/Makefile (contents, props changed)
Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile Thu Jun 18 01:25:52 2015 (r390007)
+++ head/devel/android-tools-fastboot/files/Makefile Thu Jun 18 01:46:34 2015 (r390008)
@@ -36,6 +36,7 @@ SRCS+= init.c
SRCS+= label.c
SRCS+= label_android_property.c
SRCS+= label_file.c
+CFLAGS.init.c+= -DDARWIN # statfs
.PATH: ${.CURDIR}/../libsparse
SRCS+= backed_block.c
@@ -48,10 +49,13 @@ SRCS+= sparse_read.c
.PATH: ${.CURDIR}/../libzipfile
SRCS+= centraldir.c
SRCS+= zipfile.c
+CFLAGS.centraldir.c+= -Ulseek64 # utils/Compat.h
CFLAGS+=-D_FILE_OFFSET_BITS=64 # utils/Compat.h
-CFLAGS+=-D__APPLE__ -D__MACH__ # off64_t
-CFLAGS+=-DDARWIN # statfs
+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
@@ -59,6 +63,7 @@ CFLAGS+=-I${.CURDIR}/../ext4_utils
CFLAGS+=-I${.CURDIR}/../f2fs_utils
CFLAGS+=-I${.CURDIR}/../libselinux/include
CFLAGS+=-I${.CURDIR}/../libsparse/include
+CFLAGS+=${CFLAGS.${.IMPSRC:T}}
LDADD+= -lpcre -lusb -lz
DPADD+= ${LIBPCRE} ${LIBUSB} ${LIBZ}
More information about the svn-ports-all
mailing list