aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Athey <james.athey@gmail.com>2021-08-18 20:24:14 -0400
committerGitHub <noreply@github.com>2021-08-18 17:24:14 -0700
commitbd7fc2c75b87b815c96abff1990a0d2333b20d6d (patch)
tree562e2a3d8c9fee46b484c401c850eaae91baa3e0
parent27d8b2976421e39066e31b4e4b78d29d310b46f5 (diff)
downloadvcpkg-bd7fc2c75b87b815c96abff1990a0d2333b20d6d.tar.gz
vcpkg-bd7fc2c75b87b815c96abff1990a0d2333b20d6d.zip
[libconfig] fix compilation errors on macos (#19374)
* remove "find_path(STDINT_H stdint.h)". On clang/macos, this picks up the kernel headers version of stdint.h, instead of the C standard library, breaking compilation * only define YY_NO_UNISTD_H and YY_USE_CONST on Windows, like the upstream CMakeLists.txt * set the C standard to C99, like the upstream CMakeLists.txt * update to 1.7.3 * remove the "fail" line from ci.baseline.txt * run ./vcpkg x-add-version --all to update metadata files * reset port-version
-rw-r--r--ports/libconfig/CMakeLists.txt6
-rw-r--r--ports/libconfig/CONTROL4
-rw-r--r--ports/libconfig/portfile.cmake4
-rw-r--r--scripts/ci.baseline.txt1
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/l-/libconfig.json5
6 files changed, 13 insertions, 11 deletions
diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt
index 53ca6f4e0..ab6711ad9 100644
--- a/ports/libconfig/CMakeLists.txt
+++ b/ports/libconfig/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5.1)
project(libconfig C CXX)
if(MSVC)
- add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+ add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DYY_NO_UNISTD_H -DYY_USE_CONST)
endif()
set(C_SOURCES
@@ -20,12 +20,10 @@ set(CPP_SOURCES
lib/libconfigcpp.cc
)
-find_path(STDINT_H stdint.h)
+set(CMAKE_C_STANDARD 99)
include_directories(lib ${STDINT_H})
-add_definitions(-DYY_NO_UNISTD_H -DYY_USE_CONST)
-
add_library(libconfig ${C_SOURCES})
add_library(libconfig++ ${CPP_SOURCES})
diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL
index 5a8555e10..a13a2c83d 100644
--- a/ports/libconfig/CONTROL
+++ b/ports/libconfig/CONTROL
@@ -1,5 +1,5 @@
Source: libconfig
-Version: 1.7.2
-Port-Version: 4
+Version: 1.7.3
+Port-Version: 0
Homepage: https://github.com/hyperrealm/libconfig
Description: C/C++ library for processing configuration files
diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake
index eb6d305bf..06b462677 100644
--- a/ports/libconfig/portfile.cmake
+++ b/ports/libconfig/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO hyperrealm/libconfig
- REF v1.7.2
- SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
+ REF v1.7.3
+ SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4
HEAD_REF master
)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index ee3dec09c..1129af095 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -542,7 +542,6 @@ libbson:x64-uwp=fail
libcds:arm64-windows=fail
libcds:arm-uwp=fail
libcds:x64-uwp=fail
-libconfig:x64-osx=fail
libcopp:arm64-windows=fail
libcopp:arm-uwp=fail
libcrafter:x86-windows=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index fce5a4ab1..1bfc674bc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3113,8 +3113,8 @@
"port-version": 0
},
"libconfig": {
- "baseline": "1.7.2",
- "port-version": 4
+ "baseline": "1.7.3",
+ "port-version": 0
},
"libconfuse": {
"baseline": "2019-07-14",
diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json
index 6d7eeafa1..3a906d688 100644
--- a/versions/l-/libconfig.json
+++ b/versions/l-/libconfig.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "0ef471f5497ea4d07f8282487141bcbe3ea9f319",
+ "version-string": "1.7.3",
+ "port-version": 0
+ },
+ {
"git-tree": "079c1b8cc62fe544a3277a949422bd68c57e0c45",
"version-string": "1.7.2",
"port-version": 4