Skip to content

Commit 80d54ff

Browse files
JavierMatosDNeumann-Adg0ytBillyONealJavier Matos
authored
[vcpkg-make] Add new port (microsoft#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]>
1 parent 1bf27ad commit 80d54ff

32 files changed

+2027
-62
lines changed

ports/coin-or-cbc/portfile.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SO
1212

1313
set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"")
1414

15-
vcpkg_configure_make(
15+
vcpkg_make_configure(
1616
SOURCE_PATH "${SOURCE_PATH}"
17-
DETERMINE_BUILD_TRIPLET
18-
USE_WRAPPERS
1917
OPTIONS
2018
--with-coinutils
2119
--with-clp
@@ -29,7 +27,7 @@ vcpkg_configure_make(
2927
--disable-readline
3028
)
3129

32-
vcpkg_install_make()
30+
vcpkg_make_install()
3331
vcpkg_copy_pdbs()
3432
vcpkg_fixup_pkgconfig()
3533

ports/coin-or-cbc/vcpkg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
{
22
"name": "coin-or-cbc",
33
"version-date": "2024-06-04",
4+
"port-version": 1,
45
"description": "Cbc (Coin-or branch and cut) is an open-source mixed integer linear programming solver written in C++.",
56
"homepage": "https://github.com/coin-or/Cbc",
67
"license": "EPL-2.0",
78
"dependencies": [
89
"coin-or-cgl",
910
"coin-or-clp",
1011
"coin-or-osi",
11-
"coinutils"
12+
"coinutils",
13+
{
14+
"name": "vcpkg-make",
15+
"host": true
16+
}
1217
]
1318
}

ports/jemalloc/portfile.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ if(VCPKG_TARGET_IS_WINDOWS)
1212
set(opts "ac_cv_search_log=none required" "--without-private-namespace")
1313
endif()
1414

15-
vcpkg_configure_make(
15+
vcpkg_make_configure(
16+
AUTORECONF
1617
SOURCE_PATH "${SOURCE_PATH}"
17-
AUTOCONFIG
18-
NO_WRAPPERS
18+
DISABLE_MSVC_WRAPPERS
19+
DISABLE_MSVC_TRANSFORMATIONS
1920
OPTIONS ${opts}
2021
)
2122

22-
vcpkg_install_make()
23+
vcpkg_make_install()
2324

2425
if(VCPKG_TARGET_IS_WINDOWS)
2526
file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat")

ports/jemalloc/vcpkg.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
{
22
"name": "jemalloc",
33
"version": "5.3.0",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support",
66
"homepage": "https://jemalloc.net/",
7-
"license": "BSD-2-Clause"
7+
"license": "BSD-2-Clause",
8+
"dependencies": [
9+
{
10+
"name": "vcpkg-make",
11+
"host": true
12+
}
13+
]
814
}

ports/libidn2/portfile.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
2828
endif()
2929

3030
set(ENV{GTKDOCIZE} true)
31-
vcpkg_configure_make(
31+
vcpkg_make_configure(
3232
SOURCE_PATH "${SOURCE_PATH}"
33-
AUTOCONFIG
33+
AUTORECONF
3434
COPY_SOURCE # include dir order problem
35-
USE_WRAPPERS
3635
OPTIONS
3736
${options}
3837
--disable-gtk-doc
@@ -47,7 +46,7 @@ vcpkg_configure_make(
4746
"CFLAGS=\$CFLAGS -I${CURRENT_INSTALLED_DIR}/include"
4847
)
4948

50-
vcpkg_install_make()
49+
vcpkg_make_install()
5150
vcpkg_fixup_pkgconfig()
5251
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
5352

ports/libidn2/vcpkg.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
{
22
"name": "libidn2",
33
"version": "2.3.7",
4-
"port-version": 1,
4+
"port-version": 2,
55
"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.",
66
"homepage": "https://www.gnu.org/software/libidn/",
77
"license": null,
88
"dependencies": [
99
"libiconv",
10-
"libunistring"
10+
"libunistring",
11+
{
12+
"name": "vcpkg-make",
13+
"host": true
14+
}
1115
],
1216
"features": {
1317
"nls": {

ports/vcpkg-make/portfile.cmake

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
2+
3+
vcpkg_download_distfile(ARCHIVE
4+
URLS https://ftp.gnu.org/gnu/automake/automake-1.17.tar.gz
5+
FILENAME automake.tar.gz
6+
SHA512 11357dfab8cbf4b5d94d9d06e475732ca01df82bef1284888a34bd558afc37b1a239bed1b5eb18a9dbcc326344fb7b1b301f77bb8385131eb8e1e118b677883a
7+
)
8+
9+
vcpkg_extract_source_archive(
10+
automake_source
11+
ARCHIVE "${ARCHIVE}"
12+
)
13+
14+
file(INSTALL
15+
"${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake"
16+
"${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake"
17+
"${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake"
18+
"${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake"
19+
"${CMAKE_CURRENT_LIST_DIR}/vcpkg_scripts.cmake"
20+
"${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
21+
DESTINATION
22+
"${CURRENT_PACKAGES_DIR}/share/${PORT}"
23+
)
24+
25+
file(INSTALL
26+
"${automake_source}/lib/ar-lib"
27+
"${automake_source}/lib/compile"
28+
DESTINATION
29+
"${CURRENT_PACKAGES_DIR}/share/${PORT}/wrappers"
30+
)
31+
32+
vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake")
2+
include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake")
3+
include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake")
4+
include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_common.cmake")
5+
include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake")
6+
include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_scripts.cmake")

ports/vcpkg-make/vcpkg.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "vcpkg-make",
3+
"version-date": "2023-05-15",
4+
"documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-make.html",
5+
"license": "MIT",
6+
"supports": "native",
7+
"dependencies": [
8+
{
9+
"name": "pkgconf",
10+
"host": true,
11+
"platform": "windows"
12+
},
13+
"vcpkg-cmake-get-vars"
14+
]
15+
}

0 commit comments

Comments
 (0)