Skip to content

Commit

Permalink
Merge branch 'master' into duckdb-1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ErniGH authored Sep 11, 2024
2 parents 59fa27b + fe5bd27 commit ecaf8ed
Show file tree
Hide file tree
Showing 69 changed files with 979 additions and 902 deletions.
6 changes: 6 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1412,3 +1412,9 @@ authorized_users:
- sun-mir
- fhamonic
- simbahebinbo
- alessiosacco
- Blackflame576
- Bakul-Gaur
- itsmejoeeey
- JustCallMeRay
- shun2wang
7 changes: 7 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ required_for_references:
- cuda-samples
- cunit
- cute_headers
- cutlass
- cvplot
- cwalk
- cxxgraph
Expand Down Expand Up @@ -416,6 +417,7 @@ required_for_references:
- fftw
- fire-hpp
- fixed-containers
- fixed_math
- flac
- flann
- flatbuffers
Expand Down Expand Up @@ -475,6 +477,7 @@ required_for_references:
- geographiclib
- geos
- geotrans
- getdns
- getopt-for-visual-studio
- gettext
- gf-complete
Expand Down Expand Up @@ -505,6 +508,7 @@ required_for_references:
- gnu-config
- gnulib
- gnutls
- gobject-introspection
- godot-cpp
- godot_headers
- googleapis
Expand Down Expand Up @@ -717,6 +721,7 @@ required_for_references:
- libevdev
- libevent
- libexif
- libfabric
- libfdk_aac
- libffi
- libfork
Expand Down Expand Up @@ -1024,6 +1029,7 @@ required_for_references:
- nasm
- ncurses
- neargye-semver
- net-snmp
- netcdf
- nettle
- newmat
Expand Down Expand Up @@ -1108,6 +1114,7 @@ required_for_references:
- openjpeg
- openldap
- openmesh
- openmpi
- openmvg
- openpam
- openscenegraph
Expand Down
1 change: 1 addition & 0 deletions .c3i/waitlist_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ waitlist_users:
- NeXuS4Developer
- sabapathim
- pixelsoba
- liss-h
5 changes: 5 additions & 0 deletions recipes/bdwgc/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ sources:
"8.2.6":
url: "https://github.com/ivmai/bdwgc/releases/download/v8.2.6/gc-8.2.6.tar.gz"
sha256: "b9183fe49d4c44c7327992f626f8eaa1d8b14de140f243edb1c9dcff7719a7fc"
"8.2.8":
url: "https://github.com/ivmai/bdwgc/releases/download/v8.2.8/gc-8.2.8.tar.gz"
sha256: "7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160"
patches:
"8.0.4":
- patch_file: "patches/update-cmake-8_0_4.patch"
Expand All @@ -25,3 +28,5 @@ patches:
- patch_file: "patches/update-cmake-8_2_4.patch"
"8.2.6":
- patch_file: "patches/update-cmake-8_2_6.patch"
"8.2.8":
- patch_file: "patches/update-cmake-8_2_6.patch"
2 changes: 2 additions & 0 deletions recipes/bdwgc/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ versions:
folder: all
"8.2.6":
folder: all
"8.2.8":
folder: all
3 changes: 3 additions & 0 deletions recipes/c-ares/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.33.1":
url: "https://github.com/c-ares/c-ares/releases/download/v1.33.1/c-ares-1.33.1.tar.gz"
sha256: "06869824094745872fa26efd4c48e622b9bd82a89ef0ce693dc682a23604f415"
"1.33.0":
url: "https://github.com/c-ares/c-ares/releases/download/v1.33.0/c-ares-1.33.0.tar.gz"
sha256: "3e41df2f172041eb4ecb754a464c11ccc5046b2a1c8b1d6a40dac45d3a3b2346"
Expand Down
2 changes: 2 additions & 0 deletions recipes/c-ares/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.33.1":
folder: all
"1.33.0":
folder: all
"1.32.3":
Expand Down
3 changes: 3 additions & 0 deletions recipes/cpp-httplib/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"0.17.3":
url: "https://github.com/yhirose/cpp-httplib/archive/v0.17.3.tar.gz"
sha256: "95bd6dba4241656c59d6f0854d408d14c220f7c71e673319ee27d30aee741aaa"
"0.17.1":
url: "https://github.com/yhirose/cpp-httplib/archive/v0.17.1.tar.gz"
sha256: "044c5a233da242e981d9543dd136a5945e0549c5641a0373934db88bbd192f41"
Expand Down
2 changes: 2 additions & 0 deletions recipes/cpp-httplib/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"0.17.3":
folder: all
"0.17.1":
folder: all
"0.16.3":
Expand Down
3 changes: 3 additions & 0 deletions recipes/cpp-peglib/1.x.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.9.0":
url: "https://github.com/yhirose/cpp-peglib/archive/v1.9.0.tar.gz"
sha256: "6f4f0956ea2f44fd1c5882f8adc5782451ba9d227c467d214196390ddedb024c"
"1.8.8":
url: "https://github.com/yhirose/cpp-peglib/archive/v1.8.8.tar.gz"
sha256: "3019d8084a146562fe2fd4c71e3226ac6e3994e8cee21cab27b3cd5a86bcef34"
Expand Down
2 changes: 2 additions & 0 deletions recipes/cpp-peglib/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.9.0":
folder: "1.x.x"
"1.8.8":
folder: "1.x.x"
"1.8.7":
Expand Down
3 changes: 3 additions & 0 deletions recipes/expat/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2.6.3":
url: "https://github.com/libexpat/libexpat/releases/download/R_2_6_3/expat-2.6.3.tar.xz"
sha256: "274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc"
"2.6.2":
url: "https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.xz"
sha256: "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364"
Expand Down
2 changes: 2 additions & 0 deletions recipes/expat/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2.6.3":
folder: all
"2.6.2":
folder: all
"2.6.0":
Expand Down
11 changes: 0 additions & 11 deletions recipes/getdns/all/CMakeLists.txt

This file was deleted.

29 changes: 29 additions & 0 deletions recipes/getdns/all/conan_deps.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.15)
project(cmake_wrapper)

# Wrapper for find_package() that sets variables in the format expected by the project
macro(custom_find_package name)
find_package(${name} REQUIRED CONFIG
# Allow only Conan packages
NO_DEFAULT_PATH
PATHS ${CMAKE_PREFIX_PATH}
)
string(TOUPPER ${name} name_upper)
set(${name_upper}_FOUND TRUE)
set(${name_upper}_INCLUDE_DIR ${${name}_INCLUDE_DIR})
set(${name_upper}_LIBRARIES ${${name}_LIBRARIES})
endmacro()

custom_find_package(OpenSSL)
if(BUILD_LIBEV)
custom_find_package(Libev)
endif()
if(BUILD_LIBEVENT2)
custom_find_package(Libevent2)
endif()
if(BUILD_LIBUV)
custom_find_package(Libuv)
endif()
if(USE_LIBIDN2)
custom_find_package(Libidn2)
endif()
19 changes: 8 additions & 11 deletions recipes/getdns/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
sources:
"1.6.0":
url: "https://getdnsapi.net/dist/getdns-1.6.0.tar.gz"
sha256: "40e5737471a3902ba8304b0fd63aa7c95802f66ebbc6eae53c487c8e8a380f4a"
"1.7.3":
url: "https://getdnsapi.net/dist/getdns-1.7.3.tar.gz"
sha256: "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c"
patches:
"1.6.0":
- patch_file: "patches/1.6.0-0001-install-runtimes.patch"
base_path: "source_subfolder"
"1.7.3":
- patch_file: "patches/1.6.0-0002-fix-exports-extension-libraries.patch"
base_path: "source_subfolder"
- patch_file: "patches/1.6.0-0003-let-find-modules-use-pkgconfig.patch"
base_path: "source_subfolder"
- patch_file: "patches/1.6.0-0004-dont-install-symlinked-license.patch"
base_path: "source_subfolder"
- patch_file: "patches/1.7.3-fix-windows-build.patch"
patch_description: "Fix Windows build"
patch_source: "https://github.com/getdnsapi/getdns/pull/538"
patch_type: "portability"
Loading

0 comments on commit ecaf8ed

Please sign in to comment.