[vcpkg-make] Add new port (#39050)

Co-authored-by: Alexander Neumann <[email protected]> Co-authored-by: Alexander Neumann <[email protected]> Co-authored-by: Kai Pastor <[email protected]> Co-authored-by: Billy O'Neal <[email protected]> Co-authored-by: Javier Matos <[email protected]>
microsoft · Dec 23, 2024 · 80d54ff · 80d54ff
1 parent 1bf27ad
commit 80d54ff
Show file tree

Hide file tree

Showing 32 changed files with 2,027 additions and 62 deletions.
diff --git a/ports/coin-or-cbc/portfile.cmake b/ports/coin-or-cbc/portfile.cmake
@@ -12,10 +12,8 @@ file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SO
 
 set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"")
 
-vcpkg_configure_make(
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DETERMINE_BUILD_TRIPLET
-    USE_WRAPPERS
     OPTIONS
         --with-coinutils
         --with-clp
@@ -29,7 +27,7 @@ vcpkg_configure_make(
         --disable-readline
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 

diff --git a/ports/coin-or-cbc/vcpkg.json b/ports/coin-or-cbc/vcpkg.json
@@ -1,13 +1,18 @@
 {
   "name": "coin-or-cbc",
   "version-date": "2024-06-04",
+  "port-version": 1,
   "description": "Cbc (Coin-or branch and cut) is an open-source mixed integer linear programming solver written in C++.",
   "homepage": "https://github.com/coin-or/Cbc",
   "license": "EPL-2.0",
   "dependencies": [
     "coin-or-cgl",
     "coin-or-clp",
     "coin-or-osi",
-    "coinutils"
+    "coinutils",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
   ]
 }
diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake
@@ -12,14 +12,15 @@ if(VCPKG_TARGET_IS_WINDOWS)
     set(opts "ac_cv_search_log=none required" "--without-private-namespace")
 endif()
 
-vcpkg_configure_make(
+vcpkg_make_configure(
+    AUTORECONF
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
-    NO_WRAPPERS
+    DISABLE_MSVC_WRAPPERS
+    DISABLE_MSVC_TRANSFORMATIONS
     OPTIONS ${opts}
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 
 if(VCPKG_TARGET_IS_WINDOWS)
     file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat")

diff --git a/ports/jemalloc/vcpkg.json b/ports/jemalloc/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "jemalloc",
   "version": "5.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support",
   "homepage": "https://jemalloc.net/",
-  "license": "BSD-2-Clause"
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake
@@ -28,11 +28,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 set(ENV{GTKDOCIZE} true)
-vcpkg_configure_make(
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
+    AUTORECONF
     COPY_SOURCE # include dir order problem
-    USE_WRAPPERS
     OPTIONS
         ${options}
         --disable-gtk-doc
@@ -47,7 +46,7 @@ vcpkg_configure_make(
         "CFLAGS=\$CFLAGS -I${CURRENT_INSTALLED_DIR}/include"
 )
 
-vcpkg_install_make()
+vcpkg_make_install()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
 

diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "libidn2",
   "version": "2.3.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.",
   "homepage": "https://www.gnu.org/software/libidn/",
   "license": null,
   "dependencies": [
     "libiconv",
-    "libunistring"
+    "libunistring",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
   ],
   "features": {
     "nls": {

diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
@@ -0,0 +1,32 @@
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS https://ftp.gnu.org/gnu/automake/automake-1.17.tar.gz
+    FILENAME automake.tar.gz
+    SHA512 11357dfab8cbf4b5d94d9d06e475732ca01df82bef1284888a34bd558afc37b1a239bed1b5eb18a9dbcc326344fb7b1b301f77bb8385131eb8e1e118b677883a
+)
+
+vcpkg_extract_source_archive(
+    automake_source
+    ARCHIVE "${ARCHIVE}"
+)
+
+file(INSTALL 
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg_scripts.cmake" 
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    DESTINATION 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+
+file(INSTALL 
+        "${automake_source}/lib/ar-lib"
+        "${automake_source}/lib/compile"
+    DESTINATION 
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers"
+)
+
+vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
diff --git a/ports/vcpkg-make/vcpkg-port-config.cmake b/ports/vcpkg-make/vcpkg-port-config.cmake
@@ -0,0 +1,6 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_scripts.cmake")
diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "vcpkg-make",
+  "version-date": "2023-05-15",
+  "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-make.html",
+  "license": "MIT",
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "pkgconf",
+      "host": true,
+      "platform": "windows"
+    },
+    "vcpkg-cmake-get-vars"
+  ]
+}