From 3efd21628881f40f27dd72ebc2118f34a0be5f7d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 23 Apr 2016 02:38:11 -0400 Subject: sys-fs/hfsplusutils: fix build w/gcc-5 #580620 --- .../files/hfsplusutils-1.0.4-cflags.patch | 23 ++++++++++++++++++++++ sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild | 3 +++ 2 files changed, 26 insertions(+) create mode 100644 sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-cflags.patch diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-cflags.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-cflags.patch new file mode 100644 index 000000000000..2006c7d711ef --- /dev/null +++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-cflags.patch @@ -0,0 +1,23 @@ +don't clobber the user's settings that configure already put together for us + +--- a/libhfsp/src/Makefile.am ++++ b/libhfsp/src/Makefile.am +@@ -27,7 +27,5 @@ + blockiter.c btree.c btreecheck.c fscheck.c hfstime.c libhfsp.c os.c unicode.c \ + record.c volume.c partitions.c + +-CFLAGS = -O2 -Wall +- + # I need to clean up these headers first before i can distribute them ... + # include_HEADERS = apple.h hfs.h hfsp.h libhfsp.h +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,8 +8,6 @@ + + INCLUDES = -I../libhfsp/src + +-CFLAGS = -O2 -Wall +- + bin_PROGRAMS = hpmount hpumount hpls hpcd hpcopy hppwd hpfsck hprm hpmkdir + + hpmount_SOURCES = hpmount.c hpcache.c hfsputil.c glob.c dstring.c dlist.c diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild index 380d9b293094..fd1d77c39579 100644 --- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild +++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild @@ -26,8 +26,11 @@ src_prepare() { epatch "${FILESDIR}/${P}-gcc4.patch" epatch "${FILESDIR}/${P}-string.patch" epatch "${FILESDIR}/${P}-stdlib.patch" + epatch "${FILESDIR}/${P}-cflags.patch" # let's avoid the Makefile.cvs since isn't working for us eautoreconf + + append-flags -fgnu89-inline } src_install() { -- cgit v1.2.3-18-g5258