Date: Mon, 24 Dec 2018 11:44:29 -0500 From: Aryeh Friedman <aryeh.friedman@gmail.com> To: bugzilla-noreply@freebsd.org Cc: ports-bugs@freebsd.org Subject: Re: [Bug 234363] [MAINTAINER UPDATE] devel/aegis: make to work with USE_GCC=any Message-ID: <CAGBxaXmhH%2BOJioiuvFQfcMwXRpPZp_psnaqx28iZAF84U0_cEw@mail.gmail.com> In-Reply-To: <bug-234363-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-234363-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
Forgot to delete the now unnecessary workaround in the Makefile:
Index: Makefile
===================================================================
--- Makefile (revision 488273)
+++ Makefile (working copy)
@@ -4,7 +4,7 @@
PORTNAME= aegis
PORTVERSION= 4.25
DISTVERSIONSUFFIX= .D510
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= SF
@@ -26,10 +26,6 @@
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
-# GCC 6 switched to -std=gnu++14 by default, which breaks the port (bug
-# 219284). Explicitly use the previous default to keep things going.
-USE_CXXSTD= gnu++98
-
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
Index: files/patch-aegrep_main.cc
===================================================================
--- files/patch-aegrep_main.cc (revision 488273)
+++ files/patch-aegrep_main.cc (working copy)
@@ -1,5 +1,5 @@
---- aegrep/main.cc.orig 2014-08-02 11:30:25.351342791 +0000
-+++ aegrep/main.cc 2014-08-02 11:30:52.520341498 +0000
+--- aegrep/main.cc.orig 2012-12-04 02:03:33 UTC
++++ aegrep/main.cc
@@ -32,6 +32,9 @@
#include <aegrep/arglex3.h>
Index: files/patch-common_mem.h
===================================================================
--- files/patch-common_mem.h (nonexistent)
+++ files/patch-common_mem.h (working copy)
@@ -0,0 +1,11 @@
+--- common/mem.h.orig 2012-12-04 02:03:33 UTC
++++ common/mem.h
+@@ -123,7 +123,7 @@ char *dmem_copy_string(const char *file,
+ #endif
+
+ #if HAVE_HEADER_NEW || HAVE_NEW_H
+-#define THROW_BAD_ALLOC throw(std::bad_alloc)
++#define THROW_BAD_ALLOC //throw(std::bad_alloc)
+ #else
+ #define THROW_BAD_ALLOC
+ #endif
Property changes on: files/patch-common_mem.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGBxaXmhH%2BOJioiuvFQfcMwXRpPZp_psnaqx28iZAF84U0_cEw>