Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions ports/bde/apple-clang-sized-deallocation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/groups/bsl/bsls/bsls_compilerfeatures.cpp b/groups/bsl/bsls/bsls_compilerfeatures.cpp
index 40d367d..f3b5c46 100644
--- a/groups/bsl/bsls/bsls_compilerfeatures.cpp
+++ b/groups/bsl/bsls/bsls_compilerfeatures.cpp
@@ -450,9 +450,11 @@ BSLS_IDENT("$Id$ $CSID$")
// removing the enforcement from here.
# if !defined(BSLS_PLATFORM_CMP_CLANG) \
|| BSLS_PLATFORM_CMP_VERSION >= 190000
-# ifndef __cpp_sized_deallocation
+# if !defined(__apple_build_version__) && \
+ !defined(__cpp_sized_deallocation)
# error __cpp_sized_deallocation is not defined
-# elif __cpp_sized_deallocation < 201309L
+# elif !defined(__apple_build_version__) && \
+ __cpp_sized_deallocation < 201309L
# error __cpp_sized_deallocation does not suport C++17
# endif
# ifndef __cpp_template_template_args
1 change: 1 addition & 0 deletions ports/bde/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ vcpkg_from_github(
PATCHES
fix-bdlar-target.patch
use-vcpkg-pcre2.patch
apple-clang-sized-deallocation.patch
)

vcpkg_cmake_configure(
Expand Down
1 change: 1 addition & 0 deletions ports/bde/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "bde",
"version": "4.38.0.0",
"port-version": 1,
"description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.",
"homepage": "https://github.com/bloomberg/bde",
"documentation": "https://bloomberg.github.io/bde/",
Expand Down
1 change: 1 addition & 0 deletions ports/cyrus-sasl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ else()
--with-dblib=lmdb
--with-gss_impl=mit
--disable-macos-framework
ac_cv_prog_cc_c23=no
)
vcpkg_make_install()
endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/cyrus-sasl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cyrus-sasl",
"version": "2.1.28",
"port-version": 4,
"port-version": 5,
"description": "Cyrus SASL is an implementation of SASL that makes it easy for application developers to integrate authentication mechanisms into their application in a generic way.",
"homepage": "https://github.com/cyrusimap/cyrus-sasl",
"license": null,
Expand Down
17 changes: 17 additions & 0 deletions ports/glpk/fix-c23-bool.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/src/minisat/minisat.h b/src/minisat/minisat.h
index 2733e8d..00841f0 100644
--- a/src/minisat/minisat.h
+++ b/src/minisat/minisat.h
@@ -34,10 +34,12 @@
/*====================================================================*/
/* Simple types: */

+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
typedef int bool;

#define true 1
#define false 0
+#endif

typedef int lit;
#if 0 /* by mao */
3 changes: 2 additions & 1 deletion ports/glpk/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ vcpkg_extract_source_archive(
ARCHIVE "${DISTFILE}"
PATCHES
configure.ac.patch
fix-c23-bool.patch
)

vcpkg_list(SET CONFIGURE_OPTIONS)
vcpkg_list(SET CONFIGURE_OPTIONS ac_cv_prog_cc_c23=no)
if("dl" IN_LIST FEATURES)
vcpkg_list(APPEND CONFIGURE_OPTIONS --enable-dl=dlfcn "LIBS=-ldl \$LIBS")
else()
Expand Down
2 changes: 1 addition & 1 deletion ports/glpk/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "glpk",
"version": "5.0",
"port-version": 3,
"port-version": 5,
"maintainers": "Fabio A. Correa Duran",
"description": [
"The GNU Linear Programming Kit (GLPK) solves large-scale linear programming (LP), mixed integer programming (MIP), and related problems.",
Expand Down
2 changes: 2 additions & 0 deletions ports/highs/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v1.14.0"
SHA512 d4c2d09bf41384a58a04528ffaac223eee40dea4a1cadaea369791f6e8d1aa61ff3fce57e7c97cb5f4bef0f1305681066e8ef7483f4471770295f95b9ec337f7
HEAD_REF master
PATCHES
respect-user-selected-compiler.patch
)

vcpkg_cmake_configure(
Expand Down
20 changes: 20 additions & 0 deletions ports/highs/respect-user-selected-compiler.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dc3a98..5427d1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,15 +6,6 @@
# policies up to CMake 3.27
cmake_minimum_required(VERSION 3.15...3.27)

-# set preference for clang compiler and intel compiler over gcc and other compilers
-include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
-include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
-set(CMAKE_C_COMPILER_NAMES clang gcc icx cc ${CMAKE_C_COMPILER_NAMES})
-
-include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
-include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
-set(CMAKE_CXX_COMPILER_NAMES clang++ g++ icpx c++ ${CMAKE_CXX_COMPILER_NAMES})
-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

include(set-version)
1 change: 1 addition & 0 deletions ports/highs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "highs",
"version": "1.14.0",
"port-version": 1,
"description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.",
"homepage": "https://highs.dev",
"license": "MIT",
Expand Down
12 changes: 12 additions & 0 deletions ports/krb5/autoconf-2.72.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/configure.ac b/src/configure.ac
index 4325fae..2865a26 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,4 +1,6 @@
-K5_AC_INIT([aclocal.m4])
+AC_INIT(Kerberos 5, K5_VERSION, K5_BUGADDR, krb5)
+AC_CONFIG_SRCDIR([aclocal.m4])
+build_dynobj=no

# If $runstatedir isn't set by autoconf (<2.70), set it manually.
if test x"$runstatedir" = x; then
1 change: 1 addition & 0 deletions ports/krb5/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
static-deps.diff
define-des-zeroblock.diff
autoconf-2.72.patch
)

if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand Down
2 changes: 1 addition & 1 deletion ports/krb5/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "krb5",
"version": "1.22.2",
"port-version": 1,
"port-version": 2,
"description": [
"Kerberos is a network authentication protocol.",
"It is designed to provide strong authentication for client/server applications by using secret-key cryptography.",
Expand Down
28 changes: 28 additions & 0 deletions ports/libtar/fix-c23-prototypes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/compat/basename.c b/compat/basename.c
index 2ac1e13..7b0384a 100644
--- a/compat/basename.c
+++ b/compat/basename.c
@@ -36,8 +36,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp
#include <sys/param.h>

char *
-openbsd_basename(path)
- const char *path;
+openbsd_basename(const char *path)
{
static char bname[MAXPATHLEN];
register const char *endp, *startp;
diff --git a/compat/dirname.c b/compat/dirname.c
index 986db4a..b51f6a4 100644
--- a/compat/dirname.c
+++ b/compat/dirname.c
@@ -36,8 +36,7 @@ static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $
#include <sys/param.h>

char *
-openbsd_dirname(path)
- const char *path;
+openbsd_dirname(const char *path)
{
static char bname[MAXPATHLEN];
register const char *endp;
13 changes: 13 additions & 0 deletions ports/libtar/fix-cross-install-strip.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/libtar/Makefile.in b/libtar/Makefile.in
index c7f066d..876d08e 100644
--- a/libtar/Makefile.in
+++ b/libtar/Makefile.in
@@ -19,7 +19,7 @@ SHELL = @SHELL@

### Installation programs and flags
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
LN_S = @LN_S@
MKDIR = @MKDIR@
8 changes: 7 additions & 1 deletion ports/libtar/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ vcpkg_download_distfile(ARCHIVE
SHA512 907d98ea2bd2e2a43604243fc7fd6c252aa02c3fdd79e21f2a784adf821cb18107e6e23a25ad0c64329fbe84e859da5c807272759a8bcd85a37b929c80af4a13
)

vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}")
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
fix-c23-prototypes.patch
fix-cross-install-strip.patch
)

vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion ports/libtar/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libtar",
"version": "1.2.20",
"port-version": 1,
"port-version": 3,
"description": "libtar - C library for manipulating tar files",
"homepage": "https://repo.or.cz/libtar.git",
"supports": "!windows"
Expand Down
26 changes: 26 additions & 0 deletions ports/nettle/fix-c23-prototypes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/getopt.c b/getopt.c
index 9d29de7..5b89302 100644
--- a/getopt.c
+++ b/getopt.c
@@ -136,7 +136,7 @@ static struct _getopt_data getopt_data;
whose names are inconsistent. */

#ifndef getenv
-extern char *getenv ();
+extern char *getenv (const char *);
#endif

#endif /* not __GNU_LIBRARY__ */
diff --git a/getopt.h b/getopt.h
index da1a01f..801ced5 100644
--- a/getopt.h
+++ b/getopt.h
@@ -166,7 +166,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv,
# endif
# endif
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+extern int getopt (int, char *const *, const char *);
#endif /* __GNU_LIBRARY__ */

#ifndef __need_getopt
1 change: 1 addition & 0 deletions ports/nettle/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_from_gitlab(
host-tools.patch
ccas.patch
msvc-support.patch
fix-c23-prototypes.patch
)

vcpkg_cmake_get_vars(cmake_vars_file)
Expand Down
2 changes: 1 addition & 1 deletion ports/nettle/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nettle",
"version": "3.10",
"port-version": 1,
"port-version": 2,
"description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.",
"homepage": "https://git.lysator.liu.se/nettle/nettle",
"license": null,
Expand Down
14 changes: 14 additions & 0 deletions ports/qt5-location/fix-boost-mpl-constant-expression.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/include/boost/mpl/aux_/integral_wrapper.hpp b/src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/include/boost/mpl/aux_/integral_wrapper.hpp
index 6bc05f7..f4e9acb 100644
--- a/src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/include/boost/mpl/aux_/integral_wrapper.hpp
+++ b/src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/include/boost/mpl/aux_/integral_wrapper.hpp
@@ -56,7 +56,8 @@ struct AUX_WRAPPER_NAME
// have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
// while some other don't like 'value + 1' (Borland), and some don't like
// either
-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) \
+ || __cplusplus >= 201103L
private:
BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
9 changes: 8 additions & 1 deletion ports/qt5-location/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch add-stdint.diff add-float-cast.diff)
qt_submodule_installation(
PATCHES
missing-include.patch
disable-enum-warning.patch
add-stdint.diff
add-float-cast.diff
fix-boost-mpl-constant-expression.patch
)
1 change: 1 addition & 0 deletions ports/qt5-location/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qt5-location",
"version": "5.15.19",
"port-version": 1,
"description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.",
"license": null,
"dependencies": [
Expand Down
13 changes: 13 additions & 0 deletions ports/rubberband/fix-size-t.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/common/mathmisc.h b/src/common/mathmisc.h
index d8bcc14..eece584 100644
--- a/src/common/mathmisc.h
+++ b/src/common/mathmisc.h
@@ -24,6 +24,8 @@
#ifndef RUBBERBAND_MATHMISC_H
#define RUBBERBAND_MATHMISC_H

+#include <stddef.h>
+
#include "sysutils.h"

#ifndef M_PI
2 changes: 2 additions & 0 deletions ports/rubberband/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 f581e900a71f78fde3361d2bed2fe165952c2ca087168c5f4e4994586bd832267eea58e0662a74b6a7430bc361fe80b5307b2ee6bf631a3561a8cba86e1cd3f2
HEAD_REF default
PATCHES
fix-size-t.patch
)


Expand Down
2 changes: 1 addition & 1 deletion ports/rubberband/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "rubberband",
"version": "4.0.0",
"port-version": 1,
"port-version": 2,
"description": "A high quality software library for audio time-stretching and pitch-shifting.",
"homepage": "https://www.breakfastquay.com/rubberband/",
"license": "GPL-2.0-or-later",
Expand Down
Loading