[Gmp] add cflags to build commands for compiletime tools (#17264)

* add cflags for compile time tools

* vcpkg x-add-version gmp

* add yasm-tool as host dependency

* ./vcpkg x-add-version gmp --overwrite-version

* formating

* ./vcpkg x-add-version gmp

* Update ports/gmp/vcpkg.json

* Update versions/baseline.json

* Update versions/g-/gmp.json

* Update versions/g-/gmp.json

Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

5 files changed, 75 insertions, 3 deletions

diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
index e57ec4607..7c04c680f 100644
--- a/ports/gmp/portfile.cmake
+++ b/ports/gmp/portfile.cmake
@@ -98,6 +98,8 @@ else()
         OUT_SOURCE_PATH SOURCE_PATH

         ARCHIVE ${ARCHIVE}

         REF gmp-6.2.1

+        PATCHES

+            tools.patch

     )

 

     vcpkg_configure_make(

@@ -113,4 +115,4 @@ else()
 

     # # Handle copyright

     file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

-endif()
\ No newline at end of file
+endif()

diff --git a/ports/gmp/tools.patch b/ports/gmp/tools.patch
new file mode 100644
index 000000000..193f3835b
--- /dev/null
+++ b/ports/gmp/tools.patch
@@ -0,0 +1,58 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1c24694..656aa3a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -349,7 +349,7 @@ fac_table.h: gen-fac$(EXEEXT_FOR_BUILD)
+ BUILT_SOURCES += fac_table.h
+ 
+ gen-fac$(EXEEXT_FOR_BUILD): gen-fac$(U_FOR_BUILD).c bootstrap.c
+-	$(CC_FOR_BUILD) `test -f 'gen-fac$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac$(U_FOR_BUILD).c -o gen-fac$(EXEEXT_FOR_BUILD)
++	$(CC_FOR_BUILD) `test -f 'gen-fac$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac$(U_FOR_BUILD).c $(CFLAGS) -o gen-fac$(EXEEXT_FOR_BUILD)
+ DISTCLEANFILES += gen-fac$(EXEEXT_FOR_BUILD)
+ EXTRA_DIST += gen-fac.c
+ 
+@@ -363,7 +363,7 @@ mpn/fib_table.c: gen-fib$(EXEEXT_FOR_BUILD)
+ BUILT_SOURCES += mpn/fib_table.c
+ 
+ gen-fib$(EXEEXT_FOR_BUILD): gen-fib$(U_FOR_BUILD).c bootstrap.c
+-	$(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD)
++	$(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c $(CFLAGS) -o gen-fib$(EXEEXT_FOR_BUILD)
+ DISTCLEANFILES += gen-fib$(EXEEXT_FOR_BUILD)
+ EXTRA_DIST += gen-fib.c
+ 
+@@ -377,7 +377,7 @@ mpn/mp_bases.c: gen-bases$(EXEEXT_FOR_BUILD)
+ BUILT_SOURCES += mpn/mp_bases.c
+ 
+ gen-bases$(EXEEXT_FOR_BUILD): gen-bases$(U_FOR_BUILD).c bootstrap.c
+-	$(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
++	$(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c $(CFLAGS) -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ DISTCLEANFILES += gen-bases$(EXEEXT_FOR_BUILD)
+ EXTRA_DIST += gen-bases.c
+ 
+@@ -387,7 +387,7 @@ trialdivtab.h: gen-trialdivtab$(EXEEXT_FOR_BUILD)
+ BUILT_SOURCES += trialdivtab.h
+ 
+ gen-trialdivtab$(EXEEXT_FOR_BUILD): gen-trialdivtab$(U_FOR_BUILD).c bootstrap.c
+-	$(CC_FOR_BUILD) `test -f 'gen-trialdivtab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-trialdivtab$(U_FOR_BUILD).c -o gen-trialdivtab$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
++	$(CC_FOR_BUILD) `test -f 'gen-trialdivtab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-trialdivtab$(U_FOR_BUILD).c $(CFLAGS) -o gen-trialdivtab$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ DISTCLEANFILES += gen-trialdivtab$(EXEEXT_FOR_BUILD)
+ EXTRA_DIST += gen-trialdivtab.c
+ 
+@@ -397,7 +397,7 @@ mpn/jacobitab.h: gen-jacobitab$(EXEEXT_FOR_BUILD)
+ BUILT_SOURCES += mpn/jacobitab.h
+ 
+ gen-jacobitab$(EXEEXT_FOR_BUILD): gen-jacobitab$(U_FOR_BUILD).c
+-	$(CC_FOR_BUILD) `test -f 'gen-jacobitab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-jacobitab$(U_FOR_BUILD).c -o gen-jacobitab$(EXEEXT_FOR_BUILD)
++	$(CC_FOR_BUILD) `test -f 'gen-jacobitab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-jacobitab$(U_FOR_BUILD).c $(CFLAGS) -o gen-jacobitab$(EXEEXT_FOR_BUILD)
+ DISTCLEANFILES += gen-jacobitab$(EXEEXT_FOR_BUILD)
+ EXTRA_DIST += gen-jacobitab.c
+ 
+@@ -407,7 +407,7 @@ mpn/perfsqr.h: gen-psqr$(EXEEXT_FOR_BUILD)
+ BUILT_SOURCES += mpn/perfsqr.h
+ 
+ gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c bootstrap.c
+-	$(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
++	$(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c $(CFLAGS) -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ DISTCLEANFILES += gen-psqr$(EXEEXT_FOR_BUILD)
+ EXTRA_DIST += gen-psqr.c
+ 
diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index 71cedfec5..93a6303a9 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -1,17 +1,24 @@
 {
   "name": "gmp",
   "version-string": "6.2.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "The GNU Multiple Precision Arithmetic Library",
   "homepage": "https://gmplib.org",
   "supports": "!(windows & (arm | arm64))",
   "dependencies": [
     {
       "name": "vs-yasm",
+      "host": true,
+      "platform": "windows"
+    },
+    {
+      "name": "yasm-tool",
+      "host": true,
       "platform": "windows"
     },
     {
       "name": "yasm-tool-helper",
+      "host": true,
       "platform": "windows"
     }
   ]
diff --git a/versions/baseline.json b/versions/baseline.json
index 7ce5678c2..0087dab00 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2306,7 +2306,7 @@
     },
     "gmp": {
       "baseline": "6.2.1",
-      "port-version": 4
+      "port-version": 5
     },
     "google-cloud-cpp": {
       "baseline": "1.26.0",
diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json
index 752fcb448..dcbc75ee8 100644
--- a/versions/g-/gmp.json
+++ b/versions/g-/gmp.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "90eb02f55e96530420b8e83209651a9b91b7b002",
+      "version-string": "6.2.1",
+      "port-version": 5
+    },
+    {
       "git-tree": "f53fd9a3e8e462a592c3811cf6c9dd2aec0f31e1",
       "version-string": "6.2.1",
       "port-version": 4