diff options
| -rw-r--r-- | ports/gsl/0001-configure.patch | 37 | ||||
| -rw-r--r-- | ports/gsl/portfile.cmake | 17 | ||||
| -rw-r--r-- | ports/gsl/vcpkg.json | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/g-/gsl.json | 5 |
5 files changed, 42 insertions, 36 deletions
diff --git a/ports/gsl/0001-configure.patch b/ports/gsl/0001-configure.patch index 7f80e2e55..404ae879b 100644 --- a/ports/gsl/0001-configure.patch +++ b/ports/gsl/0001-configure.patch @@ -1,16 +1,9 @@ --- - config.h.in => config.h | 50 ++++++++++++++++++++++++------------------------- - 1 file changed, 25 insertions(+), 25 deletions(-) - rename config.h.in => config.h (92%) - diff --git a/config.h.in b/config.h -similarity index 92% -rename from config.h.in -rename to config.h -index d39c766..c650f5b 100644 +index adab7a58d..f6dc2278e 100644 --- a/config.h.in +++ b/config.h -@@ -8,19 +8,19 @@ +@@ -11,19 +11,19 @@ /* Define to 1 if you have the declaration of `acosh', and to 0 if you don't. */ @@ -34,7 +27,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the declaration of `feenableexcept', and to 0 if you don't. */ -@@ -40,31 +40,31 @@ +@@ -43,31 +43,31 @@ /* Define to 1 if you have the declaration of `frexp', and to 0 if you don't. */ @@ -73,7 +66,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -@@ -73,13 +73,13 @@ +@@ -76,13 +76,13 @@ #undef HAVE_DOPRNT /* Defined if you have ansi EXIT_SUCCESS and EXIT_FAILURE in stdlib.h */ @@ -89,7 +82,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the <ieeefp.h> header file. */ #undef HAVE_IEEEFP_H -@@ -94,43 +94,43 @@ +@@ -97,43 +97,43 @@ #undef HAVE_INLINE /* Define to 1 if you have the <inttypes.h> header file. */ @@ -107,10 +100,6 @@ index d39c766..c650f5b 100644 -#undef HAVE_MEMMOVE +#define HAVE_MEMMOVE 1 - /* Define to 1 if you have the <memory.h> header file. */ --#undef HAVE_MEMORY_H -+#define HAVE_MEMORY_H 1 - /* Define this if printf can handle %Lf for long double */ #undef HAVE_PRINTF_LONGDOUBLE @@ -118,6 +107,10 @@ index d39c766..c650f5b 100644 -#undef HAVE_STDINT_H +#define HAVE_STDINT_H 1 + /* Define to 1 if you have the <stdio.h> header file. */ +-#undef HAVE_STDIO_H ++#define HAVE_STDIO_H 1 + /* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 @@ -143,7 +136,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H -@@ -142,7 +142,7 @@ +@@ -145,7 +145,7 @@ #undef HAVE_UNISTD_H /* Define to 1 if you have the `vprintf' function. */ @@ -152,14 +145,14 @@ index d39c766..c650f5b 100644 /* Define if you need to hide the static definitions of inline functions */ #undef HIDE_INLINE_STATIC -@@ -176,7 +176,7 @@ - #undef RELEASED - - /* Define to 1 if you have the ANSI C header files. */ +@@ -180,7 +180,7 @@ + /* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ -#undef STDC_HEADERS +#define STDC_HEADERS 1 /* Version number of package */ #undef VERSION --- +--- diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index b722393fe..5e1358ca2 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -1,9 +1,9 @@ -set(GSL_VERSION 2.6) +set(GSL_VERSION 2.7) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" FILENAME "gsl-${GSL_VERSION}.tar.gz" - SHA512 0be8240715f0b86aba2c63d9f12da4dba4719d4e350e9308d279e0dd3b2f0519ea26fd2e38a17f3e8cf43aacbaa2455207a7ca0d6c305f3b8725e8ece2250a74 + SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5 ) vcpkg_extract_source_archive_ex( @@ -14,17 +14,16 @@ vcpkg_extract_source_archive_ex( 0002-add-fp-control.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
\ No newline at end of file diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index 092f208c2..e09fe1f11 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,7 +1,16 @@ { "name": "gsl", - "version-string": "2.6", - "port-version": 2, + "version": "2.7", "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", - "homepage": "https://www.gnu.org/software/gsl/" + "homepage": "https://www.gnu.org/software/gsl/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ee24d26b1..6e394c072 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2513,8 +2513,8 @@ "port-version": 1 }, "gsl": { - "baseline": "2.6", - "port-version": 2 + "baseline": "2.7", + "port-version": 0 }, "gsl-lite": { "baseline": "0.38.1", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index b8a0c1540..864c4d491 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "535ee015f7dee11404cf4a708a7f7f45e1b74383", + "version": "2.7", + "port-version": 0 + }, + { "git-tree": "4754262f449ca9f2d46d597c6b1da89504b7ac08", "version-string": "2.6", "port-version": 2 |