From owner-svn-ports-head@FreeBSD.ORG Thu Jun 18 01:46:35 2015 Return-Path: Delivered-To: svn-ports-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF2B8D02; Thu, 18 Jun 2015 01:46:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0078B54; Thu, 18 Jun 2015 01:46:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5I1kZpJ070032; Thu, 18 Jun 2015 01:46:35 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5I1kZib070031; Thu, 18 Jun 2015 01:46:35 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201506180146.t5I1kZib070031@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 18 Jun 2015 01:46:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390008 - head/devel/android-tools-fastboot/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2015 01:46:36 -0000 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}