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

Jump to bottom

[mpc/mpfr] Add new port / update mpfr #13081

Merged
merged 16 commits into from
Jan 25, 2021
Merged

[mpc/mpfr] Add new port / update mpfr #13081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
83886e2
[mpc] add mpc port
Neumann-A Aug 22, 2020
e55b8c9
[mpfr] update mpfr to use make.
Neumann-A Aug 22, 2020
bb9362b
[gmp] fix preprocessor define for dlls.
Neumann-A Aug 22, 2020
dd99984
more fixes
Neumann-A Aug 22, 2020
aa47a35
fix mpfr regression on !windows
Neumann-A Aug 22, 2020
2c2f1e4
install autoconf-archive in provisioning script
Neumann-A Aug 23, 2020
f44fc6f
change indent of patches
Neumann-A Aug 24, 2020
019b2ea
Merge branch 'master' of https://github.com/microsoft/vcpkg into add_mpc
Oct 20, 2020
4b9a331
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 22, 2020
07dd9a5
Merge remote-tracking branch 'upstream/master' into add_mpc
Neumann-A Jan 10, 2021
072acb8
fix merge error
Neumann-A Jan 10, 2021
37b3da9
update PR
Neumann-A Jan 10, 2021
371c331
Merge remote-tracking branch 'origin/add_mpc' into add_mpc
Neumann-A Jan 10, 2021
66b0df7
Merge branch 'master' of https://github.com/microsoft/vcpkg into add_mpc
Jan 18, 2021
495fc34
update baseline
Jan 18, 2021
b23a80c
Merge remote-tracking branch 'upstream/master' into fix-versions
strega-nil Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/gmp/adddef.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/SMP/libgmp.def b/SMP/libgmp.def
index 289f0e2d1..632274ab2 100644
--- a/SMP/libgmp.def
+++ b/SMP/libgmp.def
@@ -16,6 +16,7 @@ __gmp_randclear
__gmp_urandomb_ui
__gmp_urandomm_ui
__gmp_asprintf
+__gmp_vasprintf
__gmp_fprintf
__gmp_printf
__gmp_snprintf
12 changes: 10 additions & 2 deletions ports/gmp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2
SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5
HEAD_REF master
PATCHES
PATCHES
vs.build.patch
runtime.patch
adddef.patch
)

include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
Expand Down Expand Up @@ -80,6 +81,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmp.pc" @ONLY)
configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmpxx.pc" @ONLY)
vcpkg_fixup_pkgconfig()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gmp.h"
"#if defined(DLL_EXPORT) && defined(NO_ASM)"
"#if 1")
endif()
else()
vcpkg_download_distfile(
ARCHIVE
Expand All @@ -97,12 +103,14 @@ else()
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
OPTIONS ${OPTIONS}
)

vcpkg_install_make()
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)
endif()
endif()
3 changes: 2 additions & 1 deletion ports/gmp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "gmp",
"version-string": "6.2.1-2",
"version-string": "6.2.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this already uses a manifest file, why not use version-semver or version versioning schemes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should it? This is a vcpkg internal update.
As such port-version is the correct thing and should have been from the beginning.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion we should start switching packages to their correct versioning schemes.

Since "version-string" are non-orderable (except by their port version number) by design, continuing to use them will seriously limit the usefulness of "version>=" constraints.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am just doing what vcpkg x-add-version does. If you want "version": "6.2.1", here please tell/teach the command to do that.

"port-version": 3,
"description": "The GNU Multiple Precision Arithmetic Library",
"homepage": "https://gmplib.org",
"supports": "windows & !(arm | arm64)",
Expand Down
5 changes: 5 additions & 0 deletions ports/mpc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source: mpc
Version: 1.2.0
Homepage: http://www.multiprecision.org/mpc/
Description: GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.
Build-Depends: gmp, mpfr
15 changes: 15 additions & 0 deletions ports/mpc/gmpd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/configure.ac b/configure.ac
index ab3da6092..2533df1d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,9 @@ AC_CHECK_FUNCS([dup dup2],,

AC_CHECK_LIB([gmp], [__gmpz_init],
[LIBS="-lgmp $LIBS"],
- [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])])
+ [AC_CHECK_LIB([gmpd], [__gmpz_init],
+ [LIBS="-lgmpd $LIBS"],
+ [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])])])

AC_MSG_CHECKING(for MPFR)
LIBS="-lmpfr $LIBS"
27 changes: 27 additions & 0 deletions ports/mpc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.gnu.org/gnu/mpc/mpc-1.2.0.tar.gz"
FILENAME "mpc-1.2.0.tar.gz"
SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES gmpd.patch
)

vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
)

vcpkg_install_make()

vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

# # Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

281 changes: 0 additions & 281 deletions ports/mpfr/CMakeLists.txt
View file
Open in desktop

This file was deleted.