Skip to content

Commit 4ef2a71

Browse files
talregevtalregev
authored
[many ports] switch to vcpkg-make (#50498)
1 parent 7e99dc2 commit 4ef2a71

282 files changed

Lines changed: 1383 additions & 443 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ports/acl/portfile.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ else()
2020
vcpkg_list(APPEND options "--disable-nls")
2121
endif()
2222

23-
vcpkg_configure_make(
23+
vcpkg_make_configure(
2424
SOURCE_PATH "${SOURCE_PATH}"
25-
AUTOCONFIG
25+
AUTORECONF
2626
OPTIONS
2727
${options}
2828
)
2929

30-
vcpkg_install_make()
30+
vcpkg_make_install()
3131
vcpkg_fixup_pkgconfig()
3232

3333
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

‎ports/acl/vcpkg.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
{
22
"name": "acl",
33
"version-semver": "2.3.2",
4+
"port-version": 1,
45
"description": "Commands for Manipulating POSIX Access Control Lists",
56
"homepage": "https://savannah.nongnu.org/projects/acl",
67
"license": "LGPL-2.1-or-later",
78
"supports": "linux",
89
"dependencies": [
9-
"attr"
10+
"attr",
11+
{
12+
"name": "vcpkg-make",
13+
"host": true
14+
}
1015
],
1116
"features": {
1217
"nls": {

‎ports/activemq-cpp/portfile.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ vcpkg_extract_source_archive(
2020
)
2121

2222
if (VCPKG_TARGET_IS_LINUX)
23-
vcpkg_configure_make(
23+
vcpkg_make_configure(
2424
SOURCE_PATH "${SOURCE_PATH}"
25-
AUTOCONFIG
25+
AUTORECONF
2626
OPTIONS
2727
"--with-openssl=${CURRENT_INSTALLED_DIR}"
2828
"--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr"
2929
)
3030

31-
vcpkg_install_make()
31+
vcpkg_make_install()
3232

3333
file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/activemq" "${CURRENT_PACKAGES_DIR}/include/activemq")
3434
file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/cms" "${CURRENT_PACKAGES_DIR}/include/cms")

‎ports/activemq-cpp/vcpkg.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "activemq-cpp",
33
"version-semver": "3.9.5",
4-
"port-version": 17,
4+
"port-version": 18,
55
"description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
66
"license": "Apache-2.0",
77
"supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
@@ -11,6 +11,11 @@
1111
"name": "libuuid",
1212
"platform": "!windows & !osx"
1313
},
14+
{
15+
"name": "vcpkg-make",
16+
"host": true,
17+
"platform": "linux"
18+
},
1419
{
1520
"name": "vcpkg-msbuild",
1621
"host": true,

‎ports/alsa/portfile.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ else()
3737
endif()
3838
set(ALSA_CONFIG_DIR "/usr/share/alsa")
3939

40-
vcpkg_configure_make(
40+
vcpkg_make_configure(
4141
SOURCE_PATH "${SOURCE_PATH}"
42-
AUTOCONFIG
42+
AUTORECONF
4343
OPTIONS
4444
${BUILD_OPTS}
4545
--disable-python
4646
"--with-configdir=${ALSA_CONFIG_DIR}"
4747
"--with-plugindir=${ALSA_PLUGIN_DIR}"
4848
)
4949

50-
vcpkg_install_make()
50+
vcpkg_make_install()
5151
vcpkg_fixup_pkgconfig()
5252

5353
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

‎ports/alsa/vcpkg.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{
22
"name": "alsa",
33
"version": "1.2.15.3",
4+
"port-version": 1,
45
"description": "The Advanced Linux Sound Architecture (ALSA) - library",
56
"homepage": "https://www.alsa-project.org/",
67
"license": "LGPL-2.1-or-later",
7-
"supports": "linux | android"
8+
"supports": "linux | android",
9+
"dependencies": [
10+
{
11+
"name": "vcpkg-make",
12+
"host": true
13+
}
14+
]
815
}

‎ports/attr/portfile.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ else()
1919
vcpkg_list(APPEND options "--disable-nls")
2020
endif()
2121

22-
vcpkg_configure_make(
22+
vcpkg_make_configure(
2323
SOURCE_PATH "${SOURCE_PATH}"
24-
AUTOCONFIG
24+
AUTORECONF
2525
OPTIONS
2626
${options}
2727
)
2828

29-
vcpkg_install_make()
29+
vcpkg_make_install()
3030
vcpkg_fixup_pkgconfig()
3131

3232
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc")

‎ports/attr/vcpkg.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
{
22
"name": "attr",
33
"version-semver": "2.5.2",
4+
"port-version": 1,
45
"description": "Commands for Manipulating Filesystem Extended Attributes",
56
"homepage": "http://savannah.nongnu.org/projects/attr",
67
"license": "LGPL-2.1-or-later",
78
"supports": "linux",
9+
"dependencies": [
10+
{
11+
"name": "vcpkg-make",
12+
"host": true
13+
}
14+
],
815
"features": {
916
"nls": {
1017
"description": "Enable native language support",

‎ports/audit/portfile.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ message(STATUS "${PORT} currently requires the following libraries from the syst
1515

1616
file(TOUCH "${SOURCE_PATH}/README")
1717

18-
vcpkg_configure_make(
18+
vcpkg_make_configure(
1919
SOURCE_PATH "${SOURCE_PATH}"
20-
AUTOCONFIG
20+
AUTORECONF
2121
OPTIONS
2222
--with-python3=no
2323
--with-golang=no
@@ -26,7 +26,7 @@ vcpkg_configure_make(
2626
--disable-zos-remote
2727
)
2828

29-
vcpkg_install_make()
29+
vcpkg_make_install()
3030
vcpkg_fixup_pkgconfig()
3131

3232
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

‎ports/audit/vcpkg.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
{
22
"name": "audit",
33
"version": "4.1.3",
4+
"port-version": 1,
45
"description": "Library for working with audit subsystem",
56
"homepage": "https://github.com/linux-audit/audit-userspace",
67
"license": "GPL-2.0-or-later OR LGPL-2.1-or-later",
7-
"supports": "linux"
8+
"supports": "linux",
9+
"dependencies": [
10+
{
11+
"name": "vcpkg-make",
12+
"host": true
13+
}
14+
]
815
}

0 commit comments

Comments
 (0)
⚡