1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

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
This commit is contained in:
Tobias Kortkamp 2018-08-25 04:43:25 +00:00
parent 3887e2088e
commit 12dd761ab2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=478000

View File

@ -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: