commit 2c0b2ed Author: Jan Beich Date: Thu Mar 10 11:50:56 2016 +0000 graphics/devil: unbreak build on 11.x error: invalid argument '-fgnu89-inline' not allowed with 'C++/ObjC++' Reported by: pkg-fallout --- graphics/devil/Makefile | 6 +----- graphics/devil/files/patch-clang | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git graphics/devil/Makefile graphics/devil/Makefile index 105a25c..9f452ac 100644 --- graphics/devil/Makefile +++ graphics/devil/Makefile @@ -12,7 +12,7 @@ DISTNAME= DevIL-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Full featured cross-platform image library -USES= alias autoreconf libtool pkgconfig +USES= alias autoreconf gmake libtool pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-ILU --enable-ILUT \ --disable-allegro --disable-directx8 --disable-directx9 \ @@ -93,10 +93,6 @@ post-patch: @${REINPLACE_CMD} -e 's|||g' \ ${WRKSRC}/src-ILU/ilur/ilur.c -post-configure: - ${REINPLACE_CMD} -e 's,-std=gnu99,,' \ - ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile - post-install: @${RMDIR} ${STAGEDIR}${DATADIR}/examples @${RMDIR} ${STAGEDIR}${DATADIR} diff --git graphics/devil/files/patch-clang graphics/devil/files/patch-clang index ebb5c22..c77f80e 100644 --- graphics/devil/files/patch-clang +++ graphics/devil/files/patch-clang @@ -2,6 +2,15 @@ Submitted upstream as: https://sourceforge.net/p/openil/bugs/212/ +--- lib/Makefile.am.orig 2009-03-08 20:45:36 UTC ++++ lib/Makefile.am +@@ -41,5 +41,5 @@ endif #BUILD_ILUT + + libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include) + libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@ +-libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@ ++libIL_la_CXXFLAGS = $(filter-out -std=% -fgnu89-inline,$(AM_CFLAGS)) @IL_CFLAGS@ + --- src-IL/include/il_internal.h 2009-03-08 03:10:08.000000000 -0400 +++ src-IL/include/il_internal.h 2014-12-20 01:11:39.000000000 -0500 @@ -228,5 +228,5 @@