Date: Tue, 13 Oct 2015 18:03:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399206 - in head/devel: android-tools-fastboot android-tools-fastboot-devel android-tools-fastboot-devel/files android-tools-fastboot/files Message-ID: <201510131803.t9DI3n1x012659@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Oct 13 18:03:49 2015 New Revision: 399206 URL: https://svnweb.freebsd.org/changeset/ports/399206 Log: devel/android-tools-fastboot: don't search for selinuxfs mountpoint Added: head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c (contents, props changed) Modified: 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) Modified: head/devel/android-tools-fastboot-devel/Makefile ============================================================================== --- head/devel/android-tools-fastboot-devel/Makefile Tue Oct 13 18:03:26 2015 (r399205) +++ head/devel/android-tools-fastboot-devel/Makefile Tue Oct 13 18:03:49 2015 (r399206) @@ -3,7 +3,7 @@ # Hint: git describe --abbrev=12 --match android-m-preview DISTVERSION= m-preview-1212 DISTVERSIONSUFFIX= -g94c617ccbba4 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -devel GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-195-g7434d1f:extras \ Modified: head/devel/android-tools-fastboot-devel/files/Makefile ============================================================================== --- head/devel/android-tools-fastboot-devel/files/Makefile Tue Oct 13 18:03:26 2015 (r399205) +++ head/devel/android-tools-fastboot-devel/files/Makefile Tue Oct 13 18:03:49 2015 (r399206) @@ -51,7 +51,6 @@ SRCS+= label.c SRCS+= label_android_property.c SRCS+= label_file.c SRCS+= label_support.c -CPPFLAGS.init.c+= -DDARWIN # statfs CPPFLAGS.label_file.c+= -D_WITH_GETLINE # required by fastboot and ext4_utils Modified: head/devel/android-tools-fastboot/Makefile ============================================================================== --- head/devel/android-tools-fastboot/Makefile Tue Oct 13 18:03:26 2015 (r399205) +++ head/devel/android-tools-fastboot/Makefile Tue Oct 13 18:03:49 2015 (r399206) @@ -3,7 +3,7 @@ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- DISTVERSION?= 6.0.0_r1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp,manpage DISTFILES= bash_completion.d/fastboot?id=2b8cfec:bashcomp \ Modified: head/devel/android-tools-fastboot/files/Makefile ============================================================================== --- head/devel/android-tools-fastboot/files/Makefile Tue Oct 13 18:03:26 2015 (r399205) +++ head/devel/android-tools-fastboot/files/Makefile Tue Oct 13 18:03:49 2015 (r399206) @@ -50,7 +50,6 @@ SRCS+= init.c SRCS+= label.c SRCS+= label_android_property.c SRCS+= label_file.c -CPPFLAGS.init.c+= -DDARWIN # statfs # required by fastboot and ext4_utils .PATH: ${.CURDIR}/../libsparse Added: head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c Tue Oct 13 18:03:49 2015 (r399206) @@ -0,0 +1,30 @@ +--- libselinux/src/init.c.orig 2015-06-15 21:40:06 UTC ++++ libselinux/src/init.c +@@ -7,10 +7,7 @@ + #include <stdio.h> + #include <dlfcn.h> + +-#ifdef DARWIN +-#include <sys/param.h> +-#include <sys/mount.h> +-#else ++#if defined(__linux__) + #include <sys/vfs.h> + #endif + +@@ -26,6 +23,7 @@ int selinux_page_size = 0; + + static void init_selinuxmnt(void) + { ++#if defined(__linux__) + char buf[BUFSIZ], *p; + FILE *fp=NULL; + struct statfs sfbuf; +@@ -94,6 +92,7 @@ static void init_selinuxmnt(void) + if (fp) + fclose(fp); + return; ++#endif + } + + void fini_selinuxmnt(void)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510131803.t9DI3n1x012659>