From owner-svn-ports-all@freebsd.org Thu Aug 17 21:59:40 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE74CDDA3AA; Thu, 17 Aug 2017 21:59:40 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B562B66B47; Thu, 17 Aug 2017 21:59:40 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7HLxdO9061478; Thu, 17 Aug 2017 21:59:39 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7HLxdxD061476; Thu, 17 Aug 2017 21:59:39 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201708172159.v7HLxdxD061476@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 17 Aug 2017 21:59:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448199 - in head/mail/annoyance-filter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: in head/mail/annoyance-filter: . files X-SVN-Commit-Revision: 448199 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2017 21:59:41 -0000 Author: rakuco Date: Thu Aug 17 21:59:39 2017 New Revision: 448199 URL: https://svnweb.freebsd.org/changeset/ports/448199 Log: Explicitly pass -std=gnu++03 to the compiler. This fixes the build with GCC 6, which defaults to -std=gnu++14. The port's code does not work with C++11 or later. Fixing it also requires adjusting Makefile.in so that invoking the C++ compiler uses CXXFLAGS, not CFLAGS. PR: 219275 Modified: head/mail/annoyance-filter/Makefile head/mail/annoyance-filter/files/patch-Makefile.in Modified: head/mail/annoyance-filter/Makefile ============================================================================== --- head/mail/annoyance-filter/Makefile Thu Aug 17 21:53:30 2017 (r448198) +++ head/mail/annoyance-filter/Makefile Thu Aug 17 21:59:39 2017 (r448199) @@ -19,6 +19,9 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.GNU USE_GCC= yes GNU_CONFIGURE= yes +# The port does not build with C++11 or later (GCC 6 defaults to -std=gnu++14). +USE_CXXSTD= gnu++03 + PORTDOCS= INSTALL README *.pdf PLIST_FILES= bin/annoyance-filter \ Modified: head/mail/annoyance-filter/files/patch-Makefile.in ============================================================================== --- head/mail/annoyance-filter/files/patch-Makefile.in Thu Aug 17 21:53:30 2017 (r448198) +++ head/mail/annoyance-filter/files/patch-Makefile.in Thu Aug 17 21:59:39 2017 (r448199) @@ -1,13 +1,22 @@ --- Makefile.in.orig 2004-08-04 14:42:56 UTC +++ Makefile.in -@@ -83,11 +83,11 @@ ipmpar.o: DCDFlib/src/ipmpar.c +@@ -76,18 +76,18 @@ all: $(PROGS) $(DATA) $(DOCUMENTS) + DCDFLIB_OBJS = dcdflib.o ipmpar.o + dcdflib.o: DCDFlib/src/dcdflib.c +- $(CXX) $(CFLAGS) -IDCDFlib/src -c DCDFlib/src/dcdflib.c ++ $(CXX) $(CXXFLAGS) -IDCDFlib/src -c DCDFlib/src/dcdflib.c + + ipmpar.o: DCDFlib/src/ipmpar.c +- $(CXX) $(CFLAGS) -IDCDFlib/src -c DCDFlib/src/ipmpar.c ++ $(CXX) $(CXXFLAGS) -IDCDFlib/src -c DCDFlib/src/ipmpar.c + # Annoyance filter program -$(PRODUCT): $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) getopt.o getopt1.o - $(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) getopt.o getopt1.o -o $(PRODUCT) $(CFLAGS) $(LDFLAGS) +$(PRODUCT): $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) -+ $(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) -o $(PRODUCT) $(CFLAGS) $(LDFLAGS) ++ $(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) -o $(PRODUCT) $(CXXFLAGS) $(LDFLAGS) @rm -f core core.* -$(PRODUCT).o: $(PRODUCT).cc config.h getopt.h @@ -22,7 +31,7 @@ -statlib_test: statlib_test.o statlib.o $(DCDFLIB_OBJS) getopt.o - $(CXX) statlib_test.o statlib.o getopt.o -o statlib_test $(DCDFLIB_OBJS) $(CFLAGS) $(LDFLAGS) +statlib_test: statlib_test.o statlib.o $(DCDFLIB_OBJS) -+ $(CXX) statlib_test.o statlib.o -o statlib_test $(DCDFLIB_OBJS) $(CFLAGS) $(LDFLAGS) ++ $(CXX) statlib_test.o statlib.o -o statlib_test $(DCDFLIB_OBJS) $(CXXFLAGS) $(LDFLAGS) statlib.o: statlib.cc config.h getopt.h statlib.cc: statlib.w @@ -41,3 +50,16 @@ manhtml: $(PRODUCT)_man.html # Test it +@@ -350,10 +342,10 @@ winarch: $(PRODUCT).cc + $(CC) $(CFLAGS) $(INCLUDE_LIBS) $(LDFLAGS) -o $@ $< + + .cc.o: +- $(CXX) $(CFLAGS) $(INCLUDE_LIBS) -c $< ++ $(CXX) $(CXXFLAGS) $(INCLUDE_LIBS) -c $< + + .cc: +- $(CXX) $(CFLAGS) $(INCLUDE_LIBS) $(LDFLAGS) -o $@ $< ++ $(CXX) $(CXXFLAGS) $(INCLUDE_LIBS) $(LDFLAGS) -o $@ $< + + .w.c: + $(CTANGLE) $<