Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ NASM ] Update version from 2.14.02 to 2.15.05 #14970

Merged
merged 2 commits into from
Dec 7, 2020
Merged

[ NASM ] Update version from 2.14.02 to 2.15.05 #14970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb87bb
Bump NASM version from 2.14.02 to 2.15.05
Nioub Dec 6, 2020
9c1c0b9
[freetds] Disable parallel configure
Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/freetds/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS ${FEATURE_OPTIONS}
)

Expand Down
1 change: 1 addition & 0 deletions ports/freetds/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "freetds",
"version-string": "1.2.11",
"port-version": 1,
"description": "Implementation of the Tabular Data Stream protocol",
"homepage": "https://www.freetds.org",
"supports": "windows & !uwp",
Expand Down
4 changes: 2 additions & 2 deletions scripts/cmake/vcpkg_find_acquire_program.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function(vcpkg_find_acquire_program VAR)
set(HASH d353d3dc743ebdc6d1e9f6f2b7a6db3c387c1ce6c890bae8adc8ae5deae8404f4c5e3cf249d1e151e7256d4c5ee9cd317e6c41f3b6f244340de18a24b938e0c4)
elseif(VAR MATCHES "NASM")
set(PROGNAME nasm)
set(NASM_VERSION 2.14.02)
set(NASM_VERSION 2.15.05)
set(PATHS ${DOWNLOADS}/tools/nasm/nasm-${NASM_VERSION})
set(BREW_PACKAGE_NAME "nasm")
set(APT_PACKAGE_NAME "nasm")
Expand All @@ -88,7 +88,7 @@ function(vcpkg_find_acquire_program VAR)
"https://fossies.org/windows/misc/nasm-${NASM_VERSION}-win32.zip"
)
set(ARCHIVE "nasm-${NASM_VERSION}-win32.zip")
set(HASH a0f16a9f3b668b086e3c4e23a33ff725998e120f2e3ccac8c28293fd4faeae6fc59398919e1b89eed7461685d2730de02f2eb83e321f73609f35bf6b17a23d1e)
set(HASH 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed)
elseif(VAR MATCHES "YASM")
set(PROGNAME yasm)
set(YASM_VERSION 1.3.0.6.g1962)
Expand Down