aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2025-05-01 18:58:47 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2025-05-01 18:58:47 +0000
commit236e98620aff4ce1f0338e0ac78d16a692f34897 (patch)
treeaa6ef694acce2dde72709ec38eabc4876b97a828
parent09b5cf24cc74334aa4dd6e07261d1ff5978f2112 (diff)
devel/gperf: reenable keyword [[fallthrough]]
fix tests PR: 286084
-rw-r--r--devel/gperf/Makefile6
-rw-r--r--devel/gperf/files/patch-output.cc14
2 files changed, 3 insertions, 17 deletions
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index e1343d1fe0b9..61816d844318 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gperf
PORTVERSION= 3.2.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNU
@@ -19,9 +20,8 @@ USE_CXXSTD= gnu++98
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --docdir=${DOCSDIR}
MAKE_JOBS_UNSAFE= yes
-#TEST_TARGET= check
-
-CONFLICTS= ace+tao
+WITH_TESTING= yes
+TEST_TARGET= check
INFO= gperf
diff --git a/devel/gperf/files/patch-output.cc b/devel/gperf/files/patch-output.cc
deleted file mode 100644
index 171a4b9f49d6..000000000000
--- a/devel/gperf/files/patch-output.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/output.cc.orig 2025-04-09 10:17:59 UTC
-+++ src/output.cc
-@@ -953,11 +953,6 @@ Output::output_hash_function () const
- /* Pseudo-statement or comment that avoids a compiler warning or
- lint warning. */
- const char * const fallthrough_marker =
-- "#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9)))\n"
-- " [[fallthrough]];\n"
-- "#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10)\n"
-- " __attribute__ ((__fallthrough__));\n"
-- "#endif\n"
- " /*FALLTHROUGH*/\n";
- /* It doesn't really matter whether hval is an 'int' or
- 'unsigned int', but 'unsigned int' gives fewer warnings. */