Skip to content

Commit 958a2ba

Browse files
mathbunnyrumathbunnyru
authored
Merge branch 'master' into wasmi
2 parents 63cccaa + 177514d commit 958a2ba

File tree

108 files changed

+1430
-1011
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1430
-1011
lines changed

‎.github/workflows/export.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
name: Export
22

33
on:
4+
pull_request:
5+
paths:
6+
- '.github/workflows/export.yml'
7+
- 'recipes/**'
48
push:
9+
branches:
10+
- main
511
paths:
612
- '.github/workflows/export.yml'
713
- 'recipes/**'
@@ -27,6 +33,7 @@ jobs:
2733
conan remote add --index 0 ${{ vars.CONAN_REMOTE_NAME }} ${{ vars.CONAN_REMOTE_URL }}
2834
echo "Added new conan remote '${{ vars.CONAN_REMOTE_NAME }}' at ${{ vars.CONAN_REMOTE_URL }}."
2935
- name: Log into Conan remote
36+
if: ${{ github.repository_owner == 'XRPLF' && github.event_name == 'push' }}
3037
run: |
3138
conan remote login ${{ vars.CONAN_REMOTE_NAME }} ${{ secrets.CONAN_REMOTE_USERNAME }} --password "${{ secrets.CONAN_REMOTE_PASSWORD }}"
3239
conan remote list-users
@@ -42,5 +49,5 @@ jobs:
4249
- name: Upload the recipes (dry run)
4350
run: conan upload '*' --confirm --check --only-recipe --remote ${{ vars.CONAN_REMOTE_NAME }} --dry-run
4451
- name: Upload the recipes
45-
if: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
52+
if: ${{ github.repository_owner == 'XRPLF' && github.event_name == 'push' }}
4653
run: conan upload '*' --confirm --check --only-recipe --remote ${{ vars.CONAN_REMOTE_NAME }}

‎recipes/7zip/all/conandata.yml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,3 @@ sources:
55
- https://github.com/ip7z/7zip/releases/download/25.01/7z2501-src.tar.xz
66
- https://sourceforge.net/projects/sevenzip/files/7-Zip/25.01/7z2501-src.tar.xz
77
sha256: "ed087f83ee789c1ea5f39c464c55a5c9d4008deb0efe900814f2df262b82c36e"
8-
"24.09":
9-
url:
10-
- https://www.7-zip.org/a/7z2409-src.tar.xz
11-
- https://sourceforge.net/projects/sevenzip/files/7-Zip/24.09/7z2409-src.tar.xz
12-
sha256: "49c05169f49572c1128453579af1632a952409ced028259381dac30726b6133a"
13-
"23.01":
14-
url:
15-
- https://www.7-zip.org/a/7z2301-src.tar.xz
16-
- https://sourceforge.net/projects/sevenzip/files/7-Zip/23.01/7z2301-src.tar.xz
17-
sha256: "356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74"
18-
"22.01":
19-
url:
20-
- https://www.7-zip.org/a/7z2201-src.tar.xz
21-
- https://sourceforge.net/projects/sevenzip/files/7-Zip/22.01/7z2201-src.tar.xz
22-
sha256: "393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5"
23-
"19.00":
24-
url:
25-
- https://www.7-zip.org/a/7z1900-src.7z
26-
- https://sourceforge.net/projects/sevenzip/files/7-Zip/19.00/7z1900-src.7z
27-
sha256: "9ba70a5e8485cf9061b30a2a84fe741de5aeb8dd271aab8889da0e9b3bf1868e"

‎recipes/7zip/all/conanfile.py‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from conan import ConanFile
22
from conan.errors import ConanInvalidConfiguration
3-
from conan.tools.files import copy, chdir, download, get, replace_in_file
3+
from conan.tools.files import copy, chdir, get, replace_in_file
44
from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain
55
from conan.tools.layout import basic_layout
66
from conan.tools.microsoft import is_msvc, NMakeToolchain
77
from conan.tools.scm import Version
88

99
import os
1010

11-
required_conan_version = ">=1.55.0"
11+
required_conan_version = ">=2"
1212

1313

1414
class SevenZipConan(ConanFile):
@@ -21,10 +21,6 @@ class SevenZipConan(ConanFile):
2121
package_type = "application"
2222
settings = "os", "arch", "compiler", "build_type"
2323

24-
@property
25-
def _settings_build(self):
26-
return getattr(self, "settings_build", self.settings)
27-
2824
def validate(self):
2925
if self.settings.os != "Windows":
3026
raise ConanInvalidConfiguration("Only Windows supported")
@@ -35,26 +31,15 @@ def layout(self):
3531
basic_layout(self, src_folder="src")
3632

3733
def build_requirements(self):
38-
if Version(self.version) < "22":
39-
self.build_requires("lzma_sdk/9.20")
40-
41-
if not is_msvc(self) and self._settings_build.os == "Windows" and "make" not in os.environ.get("CONAN_MAKE_PROGRAM", ""):
34+
if not is_msvc(self) and self.settings_build.os == "Windows" and "make" not in os.environ.get("CONAN_MAKE_PROGRAM", ""):
4235
self.build_requires("make/4.3")
4336

4437
def package_id(self):
4538
del self.info.settings.build_type
4639
del self.info.settings.compiler
4740

4841
def source(self):
49-
if Version(self.version) < "22":
50-
item = self.conan_data["sources"][self.version]
51-
filename = "7z-source.7z"
52-
download(self, **item, filename=filename)
53-
sevenzip = os.path.join(self.dependencies.build["lzma_sdk"].package_folder, "bin", "7zr.exe")
54-
self.run(f"{sevenzip} x {filename}")
55-
os.unlink(filename)
56-
else:
57-
get(self, **self.conan_data["sources"][self.version])
42+
get(self, **self.conan_data["sources"][self.version])
5843

5944
def generate(self):
6045
if is_msvc(self):
@@ -115,9 +100,5 @@ def package(self):
115100
# TODO: Package the libraries: binaries and headers (add the rest of settings)
116101

117102
def package_info(self):
118-
bin_path = os.path.join(self.package_folder, "bin")
119-
self.output.info(f"Appending PATH environment variable: {bin_path}")
120-
self.env_info.path.append(bin_path)
121-
122103
self.cpp_info.includedirs = []
123104
self.cpp_info.libdirs = []

‎recipes/7zip/config.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
versions:
22
"25.01":
33
folder: "all"
4-
"24.09":
5-
folder: "all"
6-
"23.01":
7-
folder: "all"
8-
"22.01":
9-
folder: "all"
10-
"19.00":
11-
folder: "all"

‎recipes/alembic/all/conandata.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"1.8.8":
3+
url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.8.tar.gz"
4+
sha256: "ba1f34544608ef7d3f68cafea946ec9cc84792ddf9cda3e8d5590821df71f6c6"
25
"1.8.6":
36
url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.6.tar.gz"
47
sha256: "c572ebdea3a5f0ce13774dd1fceb5b5815265cd1b29d142cf8c144b03c131c8c"
@@ -12,6 +15,10 @@ sources:
1215
url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.2.tar.gz"
1316
sha256: "3f1c466ee1600578689b32b1f2587066d3259704ec7ed1fcf80c324d01274f48"
1417
patches:
18+
"1.8.8":
19+
- patch_file: "patches/1.8.8-0001-fix-cmake.patch"
20+
patch_description: "CMake: let conan specify fPIC, don't change rpath"
21+
patch_type: "conan"
1522
"1.8.6":
1623
- patch_file: "patches/1.8.5-0001-fix-cmake.patch"
1724
patch_description: "CMake: fix install layout, don't link directly to zlib if hdf5, relocatable shared lib for macOS"

‎recipes/alembic/all/conanfile.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def layout(self):
4444
cmake_layout(self, src_folder="src")
4545

4646
def requirements(self):
47-
self.requires("imath/3.1.9", transitive_headers=True)
47+
self.requires("imath/[>=3.1.9 <4]", transitive_headers=True)
4848
if self.options.with_hdf5:
4949
self.requires("hdf5/1.14.3")
5050

@@ -70,7 +70,6 @@ def generate(self):
7070
tc.variables["ALEMBIC_SHARED_LIBS"] = self.options.shared
7171
tc.variables["ALEMBIC_USING_IMATH_3"] = False
7272
tc.variables["ALEMBIC_ILMBASE_FOUND"] = 1
73-
tc.variables["ALEMBIC_ILMBASE_LIBS"] = "OpenEXR::OpenEXR"
7473
if Version(self.version) >= "1.8.4":
7574
tc.variables["ALEMBIC_DEBUG_WARNINGS_AS_ERRORS"] = False
7675
tc.generate()

‎recipes/alembic/all/patches/1.8.8-0001-fix-cmake.patch‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
--- a/CMakeLists.txt
2+
+++ b/CMakeLists.txt
3+
@@ -175,22 +175,6 @@ IF (BUILD_TESTING)
4+
MARK_AS_ADVANCED(BUILDNAME)
5+
ENDIF(BUILD_TESTING)
6+
7+
-IF (UNIX AND NOT WINDOWS)
8+
- FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
9+
- IF (CMAKE_UNAME)
10+
- EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
11+
- SET(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL
12+
-"processor type (i386 and x86_64)")
13+
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
14+
- ADD_DEFINITIONS(-fPIC)
15+
- ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
16+
- ENDIF(CMAKE_UNAME)
17+
-ENDIF(UNIX AND NOT WINDOWS)
18+
-
19+
-IF (DARWIN)
20+
- ADD_DEFINITIONS(-fPIC)
21+
-ENDIF()
22+
-
23+
#-******************************************************************************
24+
# DEPENDENCIES
25+
#-******************************************************************************
26+
@@ -206,7 +190,6 @@ INCLUDE("./cmake/AlembicIlmBase.cmake")
27+
28+
# HDF5
29+
IF (USE_HDF5)
30+
- FIND_PACKAGE(ZLIB REQUIRED)
31+
SET(ALEMBIC_WITH_HDF5 "1")
32+
INCLUDE("./cmake/AlembicHDF5.cmake")
33+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DH5_USE_18_API")
34+
--- a/lib/Alembic/CMakeLists.txt
35+
+++ b/lib/Alembic/CMakeLists.txt
36+
@@ -65,23 +65,16 @@ IF (ALEMBIC_SHARED_LIBS)
37+
SET_TARGET_PROPERTIES(Alembic PROPERTIES DEFINE_SYMBOL ALEMBIC_EXPORTS
38+
SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
39+
VERSION ${PROJECT_VERSION})
40+
-
41+
- if (ALEMBIC_USING_IMATH_3)
42+
- if (APPLE OR UNIX)
43+
- set_target_properties(Alembic PROPERTIES INSTALL_RPATH "$<TARGET_FILE_DIR:${ALEMBIC_ILMBASE_LIBS}>")
44+
- endif ()
45+
- endif ()
46+
ENDIF()
47+
48+
49+
TARGET_LINK_LIBRARIES(Alembic
50+
- LINK_PUBLIC
51+
+ PUBLIC
52+
${ALEMBIC_ILMBASE_LIBS}
53+
${CMAKE_THREAD_LIBS_INIT}
54+
${EXTERNAL_MATH_LIBS}
55+
- LINK_PRIVATE
56+
+ PRIVATE
57+
${HDF5_LIBRARIES}
58+
- ${ZLIB_LIBRARY}
59+
)
60+
61+
INSTALL(TARGETS Alembic
62+
--
63+
2.45.2
64+

‎recipes/alembic/config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"1.8.8":
3+
folder: all
24
"1.8.6":
35
folder: all
46
"1.8.5":

‎recipes/arrow/all/conanfile.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def requirements(self):
188188
if self.options.get_safe("with_opentelemetry"):
189189
self.requires("opentelemetry-cpp/1.21.0")
190190
if self.options.with_s3:
191-
self.requires("aws-sdk-cpp/1.9.234")
191+
self.requires("aws-sdk-cpp/[~1.11]")
192192
if self.options.with_brotli:
193193
self.requires("brotli/1.1.0")
194194
if self.options.with_bz2:
@@ -265,6 +265,8 @@ def validate(self):
265265
raise ConanInvalidConfiguration("arrow:parquet requires arrow:with_thrift")
266266

267267
def build_requirements(self):
268+
if self.options.with_protobuf:
269+
self.tool_requires("protobuf/<host_version>")
268270
if Version(self.version) >= "22.0.0":
269271
self.tool_requires("cmake/[>=3.26 <4]")
270272
elif Version(self.version) >= "20.0.0":
@@ -447,7 +449,10 @@ def package_info(self):
447449
self.cpp_info.components["libarrow_substrait"].set_property("pkg_config_name", "arrow_substrait")
448450
self.cpp_info.components["libarrow_substrait"].set_property("cmake_target_name", f"Arrow::arrow_substrait_{cmake_suffix}")
449451
self.cpp_info.components["libarrow_substrait"].libs = [f"arrow_substrait{suffix}"]
450-
self.cpp_info.components["libarrow_substrait"].requires = ["libparquet", "dataset"]
452+
self.cpp_info.components["libarrow_substrait"].requires = ["libparquet"]
453+
if self.options.dataset_modules:
454+
self.cpp_info.components["libarrow_substrait"].requires.append("dataset")
455+
451456

452457
# Plasma was deprecated in Arrow 12.0.0
453458
del self.options.plasma

‎recipes/aws-c-auth/all/conandata.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
sources:
2-
"0.9.0":
3-
url: "https://github.com/awslabs/aws-c-auth/archive/v0.9.0.tar.gz"
4-
sha256: "aa6e98864fefb95c249c100da4ae7aed36ba13a8a91415791ec6fad20bec0427"
2+
"0.9.1":
3+
url: "https://github.com/awslabs/aws-c-auth/archive/v0.9.1.tar.gz"
4+
sha256: "adae1e725d9725682366080b8bf8e49481650c436b846ceeb5efe955d5e03273"

0 commit comments

Comments
 (0)