early-access version 2853

externals/vcpkg/ports/gmp/msvc_symbol.patch

@@ -0,0 +1,28 @@
+diff --git a/configure.ac b/configure.ac
+index cafdb3c71..bd92bc4bb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2703,8 +2703,8 @@ Use "--disable-static --enable-shared" to build just a DLL.])
+     #
+     if test "$enable_shared" = yes; then
+       GMP_LDFLAGS="$GMP_LDFLAGS -no-undefined -Wl,--export-all-symbols"
+-      LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def"
+-      LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def"
++      #LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def"
++      #LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def"
+       LIBGMP_DLL=1
+     fi
+     ;;
+diff --git a/gmp-h.in b/gmp-h.in
+index 3d449d427..18a03b753 100644
+--- a/gmp-h.in
++++ b/gmp-h.in
+@@ -398,7 +398,7 @@ typedef __mpq_struct *mpq_ptr;
+ 
+ /* Microsoft's C compiler accepts __inline */
+ #ifdef _MSC_VER
+-#define __GMP_EXTERN_INLINE  __inline
++#define __GMP_EXTERN_INLINE  static __inline
+ #endif
+ 
+ /* Recent enough Sun C compilers want "inline" */

externals/vcpkg/ports/gmp/portfile.cmake

@@ -0,0 +1,80 @@
+if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/include/gmpxx.h")
+    message(FATAL_ERROR "Can't build ${PORT} if mpir is installed. Please remove mpir, and try install ${PORT} again if you need it.")
+endif()
+
+vcpkg_download_distfile(
+    ARCHIVE
+    URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz
+    FILENAME gmp-6.2.1.tar.xz
+    SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(PATCHES yasm.patch
+                msvc_symbol.patch)
+endif()
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    REF gmp-6.2.1
+    PATCHES
+        ${PATCHES}
+        tools.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        set(asmflag win64)
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        set(asmflag win32)
+    endif()
+    set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw")
+    set(OPTIONS ac_cv_func_memset=yes
+                "gmp_cv_asm_w32=.word"
+                )
+    
+endif()
+
+if(VCPKG_CROSSCOMPILING)
+    # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. 
+    set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true")
+    set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true")
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS
+        ${OPTIONS}
+        --enable-cxx
+        --with-pic
+)
+
+set(tool_names bases fac fib jacobitab psqr trialdivtab)
+list(TRANSFORM tool_names PREPEND "gen-")
+list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+
+if(VCPKG_CROSSCOMPILING)
+    list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/")
+    file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/" )
+    if(NOT VCPKG_BUILD_TYPE)
+        file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/" )
+    endif()
+endif()
+
+vcpkg_install_make()
+
+if(NOT VCPKG_CROSSCOMPILING)
+    list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")
+    file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" )
+endif()
+
+vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+

externals/vcpkg/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
+ 

externals/vcpkg/ports/gmp/vcpkg.json

@@ -0,0 +1,22 @@
+{
+  "name": "gmp",
+  "version": "6.2.1",
+  "port-version": 10,
+  "description": "The GNU Multiple Precision Arithmetic Library",
+  "homepage": "https://gmplib.org",
+  "supports": "!(windows & (arm | arm64))",
+  "dependencies": [
+    {
+      "name": "gmp",
+      "host": true
+    },
+    {
+      "name": "yasm",
+      "host": true,
+      "features": [
+        "tools"
+      ],
+      "platform": "windows"
+    }
+  ]
+}

externals/vcpkg/ports/gmp/yasm.patch

@@ -0,0 +1,83 @@
+diff --git a/acinclude.m4 b/acinclude.m4
+index 86175ce42..8228d20dc 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1649,7 +1649,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE],
+ [cat >conftest.s <<EOF
+ [$1]
+ EOF
+-gmp_assemble="$CCAS $CFLAGS $CPPFLAGS conftest.s >conftest.out 2>&1"
++gmp_assemble="$CCAS $CPPFLAGS $ASMFLAGS conftest.s >conftest.out 2>&1"
+ if AC_TRY_EVAL(gmp_assemble); then
+   cat conftest.out >&AC_FD_CC
+   ifelse([$2],,:,[$2])
+@@ -2382,7 +2382,7 @@ for tmp_underscore in "" "_"; do
+ ${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix
+ 	addl	$ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx
+ EOF
+-  gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
++  gmp_compile="$CCAS $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
+   if AC_TRY_EVAL(gmp_compile); then
+     if test "$tmp_underscore" = "_"; then
+       gmp_cv_asm_x86_got_underscore=yes
+@@ -2556,7 +2556,7 @@ movq-bug)
+   AC_MSG_WARN([+----------------------------------------------------------])
+   AC_MSG_WARN([| WARNING WARNING WARNING])
+   AC_MSG_WARN([| Host CPU has MMX code, but the assembler])
+-  AC_MSG_WARN([|     $CCAS $CFLAGS $CPPFLAGS])
++  AC_MSG_WARN([|     $CCAS $CPPFLAGS $ASMFLAGS])
+   AC_MSG_WARN([| has the Solaris 2.6 and 2.7 bug where register to register])
+   AC_MSG_WARN([| movq operands are reversed.])
+   AC_MSG_WARN([| Non-MMX replacements will be used.])
+diff --git a/mpn/Makeasm.am b/mpn/Makeasm.am
+index 5d7306c22..75692128d 100644
+--- a/mpn/Makeasm.am
++++ b/mpn/Makeasm.am
+@@ -32,7 +32,7 @@
+ # COMPILE minus CC.
+ #
+ COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
++	$(CPPFLAGS) $(ASMFLAGS)
+ 
+ # Flags used for preprocessing (in ansi2knr rules).
+ #
+diff --git a/mpn/Makefile.in b/mpn/Makefile.in
+index 2bc061012..59c805976 100644
+--- a/mpn/Makefile.in
++++ b/mpn/Makefile.in
+@@ -403,7 +403,7 @@ EXTRA_DIST = asm-defs.m4 cpp-ccas m4-ccas $(TARG_DIST)
+ # COMPILE minus CC.
+ #
+ COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
++	$(CPPFLAGS) $(ASMFLAGS)
+ 
+ 
+ # Flags used for preprocessing (in ansi2knr rules).
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 9742a4016..430603cef 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -666,7 +666,7 @@ SUBDIRS = . devel mpn mpz mpq mpf rand misc cxx
+ # COMPILE minus CC.
+ #
+ COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
++	$(CPPFLAGS) $(ASMFLAGS)
+ 
+ 
+ # Flags used for preprocessing (in ansi2knr rules).
+diff --git a/tune/Makefile.in b/tune/Makefile.in
+index f82cd13e2..351bcd9b1 100644
+--- a/tune/Makefile.in
++++ b/tune/Makefile.in
+@@ -549,7 +549,7 @@ TUNE_MPN_SRCS_BASIC = div_qr_2.c bdiv_q.c bdiv_qr.c			\
+ # COMPILE minus CC.
+ #
+ COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
++	$(CPPFLAGS) $(ASMFLAGS)
+ 
+ 
+ # Flags used for preprocessing (in ansi2knr rules).