[gperf] Fix error in cpp17 mode (#32980)

* fix gperf in cpp17 mode * update version * update version #2 * remove unused header patch file * update version 3 --------- Co-authored-by: rdh <[email protected]>
microsoft · Aug 7, 2023 · 56a44f3 · 56a44f3
1 parent 3ee6678
commit 56a44f3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/ports/gperf/portfile.cmake b/ports/gperf/portfile.cmake
@@ -9,6 +9,8 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE ${ARCHIVE}
+    PATCHES 
+    	remove_register_keyword_cpp17.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

diff --git a/ports/gperf/remove_register_keyword_cpp17.patch b/ports/gperf/remove_register_keyword_cpp17.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/getline.cc b/lib/getline.cc
+index c57c633..0984a7c 100644
+--- a/lib/getline.cc
++++ b/lib/getline.cc
+@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
+
+   for (;;)
+     {
+-      register int c = getc (stream);
++      int c = getc (stream);
+
+       /* We always want at least one char left in the buffer, since we
+          always (unless we get an error while reading the first char)
diff --git a/ports/gperf/vcpkg.json b/ports/gperf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gperf",
   "version": "3.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "GNU perfect hash function generator",
   "homepage": "https://www.gnu.org/software/gperf/",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2974,7 +2974,7 @@
     },
     "gperf": {
       "baseline": "3.1",
-      "port-version": 5
+      "port-version": 6
     },
     "gperftools": {
       "baseline": "2.10",

diff --git a/versions/g-/gperf.json b/versions/g-/gperf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "590e19515bff5b0abc6d9f73ba20a19a71555a32",
+      "version": "3.1",
+      "port-version": 6
+    },
     {
       "git-tree": "c1dc7145f2a0607798bfdaede7bf064b88e908ac",
       "version": "3.1",