svn commit: r503921 - in head/devel/liblpm: . files

[Mark Linimon]

Author: linimon
Date: Mon Jun 10 18:52:40 2019
New Revision: 503921
URL: https://svnweb.freebsd.org/changeset/ports/503921

Log:
  Patch compiler flags to fix build failures on GCC-based architectures:
  
    cc1: error: unrecognized command line option "-Wno-unknown-warning-option"
    cc1: error: unrecognized command line option "-Wsuggest-attribute=noreturn"
    cc1: error: unrecognized command line option "-Wjump-misses-init"
  
  Approved by:	portmgr (tier-2 blanket)

Added:
  head/devel/liblpm/files/extra-patch-Makefile   (contents, props changed)
Modified:
  head/devel/liblpm/Makefile

Modified: head/devel/liblpm/Makefile
==============================================================================
--- head/devel/liblpm/Makefile	Mon Jun 10 18:08:53 2019	(r503920)
+++ head/devel/liblpm/Makefile	Mon Jun 10 18:52:40 2019	(r503921)
@@ -10,7 +10,7 @@ COMMENT=	Longest Prefix Match library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-USES=		gmake libtool:build
+USES=		compiler gmake libtool:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmind
@@ -29,4 +29,10 @@ PLIST_FILES=	include/lpm.h \
 		lib/liblpm.so.1 \
 		lib/liblpm.so.1.0.0
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile
+.endif
+
+.include <bsd.port.post.mk>

Added: head/devel/liblpm/files/extra-patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/liblpm/files/extra-patch-Makefile	Mon Jun 10 18:52:40 2019	(r503921)
@@ -0,0 +1,16 @@
+--- Makefile.orig	2019-05-18 16:55:32 UTC
++++ Makefile
+@@ -11,13 +11,10 @@ CFLAGS+=	-D_GNU_SOURCE -D_DEFAULT_SOURCE
+ #
+ # Extended warning flags.
+ #
+-CFLAGS+=	-Wno-unknown-warning-option # gcc vs clang
+-
+ CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
+ CFLAGS+=	-Wmissing-declarations -Wredundant-decls -Wnested-externs
+ CFLAGS+=	-Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
+ CFLAGS+=	-Wold-style-definition
+-CFLAGS+=	-Wsuggest-attribute=noreturn -Wjump-misses-init
+ 
+ # New GCC 6/7 flags:
+ #CFLAGS+=	-Wduplicated-cond -Wmisleading-indentation -Wnull-dereference