-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
334 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,12 +21,26 @@ steps: | |
| image: git.mrcyjanek.net/mrcyjanek/debian:buster | ||
| commands: | ||
| - cd ${repo} && git submodule update --init --force && cd .. | ||
| - git config --global user.email "[email protected]" | ||
| - git config --global user.name "CI mrcyjanek.net" | ||
| - ./apply_patches.sh ${repo} | ||
| - cd ${repo}/contrib/depends | ||
| - for i in sources built; do cp "/root/.cache/${repo}/$i" . -r || true; done | ||
| - make download | ||
| volumes: | ||
| - /opt/cache/monero_c/dotcache:/root/.cache | ||
| - name: x86_64-apple-darwin11 | ||
| image: git.mrcyjanek.net/mrcyjanek/debian:bookworm | ||
| commands: | ||
| - apt update | ||
| - apt install -y gperf libtinfo5 | ||
| - ./build_single.sh ${repo} x86_64-apple-darwin11 -j$(nproc) | ||
| - name: aarch64-apple-darwin11 | ||
| image: git.mrcyjanek.net/mrcyjanek/debian:bookworm | ||
| commands: | ||
| - apt update | ||
| - apt install -y gperf libtinfo5 | ||
| - ./build_single.sh ${repo} aarch64-apple-darwin11 -j$(nproc) | ||
| - name: x86_64-w64-mingw32 | ||
| image: git.mrcyjanek.net/mrcyjanek/debian:buster | ||
| commands: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| From b1b150b3de4dd3197c373be39b790c31bb7ddab3 Mon Sep 17 00:00:00 2001 | ||
| From: Your Name <[email protected]> | ||
| Date: Thu, 28 Mar 2024 02:03:08 +0100 | ||
| Subject: [PATCH] macos build fix | ||
|
|
||
| --- | ||
| contrib/depends/hosts/darwin.mk | 2 + | ||
| contrib/depends/packages/polyseed.mk | 13 +++-- | ||
| .../polyseed/0001-disable-soname.patch | 49 +++++++++++++++++++ | ||
| 3 files changed, 60 insertions(+), 4 deletions(-) | ||
| create mode 100644 contrib/depends/patches/polyseed/0001-disable-soname.patch | ||
|
|
||
| diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk | ||
| index 79d449054..cbe795081 100644 | ||
| --- a/contrib/depends/hosts/darwin.mk | ||
| +++ b/contrib/depends/hosts/darwin.mk | ||
| @@ -8,6 +8,8 @@ endif | ||
| darwin_CC=clang -target $(CC_target) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(host_prefix)/native/SDK/ -mlinker-version=$(LD64_VERSION) -B$(host_prefix)/native/bin/$(host)- | ||
| darwin_CXX=clang++ -target $(CC_target) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(host_prefix)/native/SDK/ -mlinker-version=$(LD64_VERSION) -stdlib=libc++ -B$(host_prefix)/native/bin/$(host)- | ||
|
|
||
| +darwin_RANLIB=$(host_prefix)/native/bin/$(host)-ranlib | ||
| + | ||
| darwin_CFLAGS=-pipe | ||
| darwin_CXXFLAGS=$(darwin_CFLAGS) | ||
| darwin_ARFLAGS=cr | ||
| diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk | ||
| index 2ddeac621..0071b20f3 100644 | ||
| --- a/contrib/depends/packages/polyseed.mk | ||
| +++ b/contrib/depends/packages/polyseed.mk | ||
| @@ -4,18 +4,23 @@ $(package)_download_path=https://github.com/tevador/$(package)/archive/refs/tags | ||
| $(package)_download_file=v$($(package)_version).tar.gz | ||
| $(package)_file_name=$(package)-$($(package)_version).tar.gz | ||
| $(package)_sha256_hash=f36282fcbcd68d32461b8230c89e1a40661bd46b91109681cec637433004135a | ||
| -$(package)_patches=force-static-mingw.patch | ||
| +$(package)_patches=force-static-mingw.patch 0001-disable-soname.patch | ||
|
|
||
| define $(package)_preprocess_cmds | ||
| - patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch | ||
| + patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch &&\ | ||
| + patch -p1 < $($(package)_patch_dir)/0001-disable-soname.patch | ||
| endef | ||
|
|
||
| define $(package)_config_cmds | ||
| - cmake -DCMAKE_INSTALL_PREFIX=$(host_prefix) -DCMAKE_C_COMPILER=$($(package)_cc) . | ||
| + CC="$($(package)_cc)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" . | ||
| +endef | ||
| + | ||
| +define $(package)_set_vars | ||
| + $(package)_build_opts=CC="$($(package)_cc)" | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| - $(MAKE) | ||
| + CC="$($(package)_cc)" $(MAKE) | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| diff --git a/contrib/depends/patches/polyseed/0001-disable-soname.patch b/contrib/depends/patches/polyseed/0001-disable-soname.patch | ||
| new file mode 100644 | ||
| index 000000000..a261636e8 | ||
| --- /dev/null | ||
| +++ b/contrib/depends/patches/polyseed/0001-disable-soname.patch | ||
| @@ -0,0 +1,49 @@ | ||
| +From aabafcfc0572651436d024a635483c49042fad7f Mon Sep 17 00:00:00 2001 | ||
| +From: Czarek Nakamoto <[email protected]> | ||
| +Date: Thu, 28 Mar 2024 00:32:51 +0100 | ||
| +Subject: [PATCH] disable soname | ||
| + | ||
| +--- | ||
| + CMakeLists.txt | 16 +++++++++------- | ||
| + 1 file changed, 9 insertions(+), 7 deletions(-) | ||
| + | ||
| +diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| +index 8a8e7c2..5301353 100644 | ||
| +--- a/CMakeLists.txt | ||
| ++++ b/CMakeLists.txt | ||
| +@@ -36,6 +36,7 @@ include_directories(polyseed | ||
| + target_compile_definitions(polyseed PRIVATE POLYSEED_SHARED) | ||
| + set_target_properties(polyseed PROPERTIES VERSION 2.0.0 | ||
| + SOVERSION 2 | ||
| ++ NO_SONAME 1 | ||
| + C_STANDARD 11 | ||
| + C_STANDARD_REQUIRED ON) | ||
| + | ||
| +@@ -45,16 +46,17 @@ include_directories(polyseed_static | ||
| + include/) | ||
| + target_compile_definitions(polyseed_static PRIVATE POLYSEED_STATIC) | ||
| + set_target_properties(polyseed_static PROPERTIES OUTPUT_NAME polyseed | ||
| ++ NO_SONAME 1 | ||
| + C_STANDARD 11 | ||
| + C_STANDARD_REQUIRED ON) | ||
| + | ||
| +-add_executable(polyseed-tests | ||
| +- tests/tests.c) | ||
| +-include_directories(polyseed-tests | ||
| +- include/) | ||
| +-target_compile_definitions(polyseed-tests PRIVATE POLYSEED_STATIC) | ||
| +-target_link_libraries(polyseed-tests | ||
| +- PRIVATE polyseed_static) | ||
| ++# add_executable(polyseed-tests | ||
| ++# tests/tests.c) | ||
| ++# include_directories(polyseed-tests | ||
| ++# include/) | ||
| ++# target_compile_definitions(polyseed-tests PRIVATE POLYSEED_STATIC) | ||
| ++# target_link_libraries(polyseed-tests | ||
| ++# PRIVATE polyseed_static) | ||
| + | ||
| + include(GNUInstallDirs) | ||
| + install(TARGETS polyseed polyseed_static | ||
| +-- | ||
| +2.39.2 | ||
| + | ||
| -- | ||
| 2.39.2 | ||
|
|
Oops, something went wrong.