Date: Sat, 25 Aug 2018 04:43:25 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478000 - head/editors/manedit/files Message-ID: <201808250443.w7P4hPug037154@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sat Aug 25 04:43:25 2018 New Revision: 478000 URL: https://svnweb.freebsd.org/changeset/ports/478000 Log: editors/manedit: Fix build with Clang 6 In file included from <built-in>:375: <command line>:4:9: warning: '__cplusplus' macro redefined [-Wmacro-redefined] #define __cplusplus 1 ^ <built-in>:371:9: note: previous definition is here #define __cplusplus 201402L ^ http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/manedit-1.2.1_3.log Modified: head/editors/manedit/files/patch-Makefile.FreeBSD Modified: head/editors/manedit/files/patch-Makefile.FreeBSD ============================================================================== --- head/editors/manedit/files/patch-Makefile.FreeBSD Sat Aug 25 04:04:01 2018 (r477999) +++ head/editors/manedit/files/patch-Makefile.FreeBSD Sat Aug 25 04:43:25 2018 (r478000) @@ -1,18 +1,19 @@ ---- Makefile.FreeBSD.orig 2013-07-19 16:44:02.000000000 +0200 -+++ Makefile.FreeBSD 2013-07-19 16:44:28.000000000 +0200 -@@ -56,7 +56,10 @@ CFLAGS += $(GTK_CFLAGS) -O2 -Wall \ +--- Makefile.FreeBSD.orig 2008-10-11 23:00:00 UTC ++++ Makefile.FreeBSD +@@ -56,9 +56,10 @@ CFLAGS += $(GTK_CFLAGS) -O2 -Wall \ -DPREFIX=\"$(PREFIX)\" \ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -CPPFLAGS = -D__cplusplus -Dc_plusplus +CPPFLAGS = $(CXXFLAGS) $(GTK_CFLAGS) -O2 -Wall \ + -DPREFIX=\"$(PREFIX)\" \ -+ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" \ -+ -D__cplusplus -Dc_plusplus ++ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" - +- # ######################################################################## -@@ -109,7 +112,7 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o) + # Dependant Libraries: + # +@@ -109,7 +110,7 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o) .c.o: $(CC) -c $*.c $(INC) $(CFLAGS) .cpp.o:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808250443.w7P4hPug037154>