diff options
| author | cyan <cyjan@mrcyjanek.net> | 2024-11-15 14:14:15 +0000 |
|---|---|---|
| committer | cyan <cyjan@mrcyjanek.net> | 2024-11-15 14:14:15 +0000 |
| commit | d8fdddcc3f96eaaf3216b65e36b940b0bbcb7d10 (patch) | |
| tree | 7263c7a4197dc672d68bb050d461c24df4b13b55 | |
| parent | 482cb1c53167f6c9ffb627fc4c7c32e0dc3edd24 (diff) | |
switch to ubuntu:24.04
add POLYSEED_STATIC to toolchain.cmake.in in order to properly link
drop patches
| -rw-r--r-- | .github/workflows/full_check.yaml | 4 | ||||
| -rw-r--r-- | contrib/depends/packages/polyseed.mk | 5 | ||||
| -rw-r--r-- | contrib/depends/patches/polyseed/force-static-mingw.patch | 23 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 2 |
4 files changed, 4 insertions, 30 deletions
diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml index f5dbbc4..e9866a9 100644 --- a/.github/workflows/full_check.yaml +++ b/.github/workflows/full_check.yaml @@ -10,12 +10,12 @@ jobs: coin: [monero, wownero] runs-on: ubuntu-latest container: - image: debian:sid + image: ubuntu:24.04 steps: - name: Install dependencies run: | apt update - apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo6 gperf gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 + apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 gperf gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk index 881e356..3c0e9c5 100644 --- a/contrib/depends/packages/polyseed.mk +++ b/contrib/depends/packages/polyseed.mk @@ -4,11 +4,6 @@ $(package)_download_path=https://github.com/MrCyjaneK/$(package)/archive/refs/ta $(package)_download_file=v$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=7f5c583a1f48ee6d63174dd1f1485d00b02d76d6df0181bc42c54558502c8443 -$(package)_patches=force-static-mingw.patch - -define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch -endef define $(package)_config_cmds CC="$($(package)_cc)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DSTATIC=ON . diff --git a/contrib/depends/patches/polyseed/force-static-mingw.patch b/contrib/depends/patches/polyseed/force-static-mingw.patch deleted file mode 100644 index f05cb2b..0000000 --- a/contrib/depends/patches/polyseed/force-static-mingw.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/include/polyseed.h -+++ b/include/polyseed.h -@@ -93,13 +93,13 @@ Shared/static library definitions - - define POLYSEED_STATIC when linking to the static library - */ - #if defined(_WIN32) || defined(__CYGWIN__) -- #ifdef POLYSEED_SHARED -- #define POLYSEED_API __declspec(dllexport) -- #elif !defined(POLYSEED_STATIC) -- #define POLYSEED_API __declspec(dllimport) -- #else -- #define POLYSEED_API -- #endif -+// #ifdef POLYSEED_SHARED -+// #define POLYSEED_API __declspec(dllexport) -+// #elif !defined(POLYSEED_STATIC) -+// #define POLYSEED_API __declspec(dllimport) -+// #else -+ #define POLYSEED_API -+// #endif - #define POLYSEED_PRIVATE - #else - #ifdef POLYSEED_SHARED diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index e063cb9..772c8a6 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -174,5 +174,7 @@ endif() link_directories(@prefix@/lib) +add_definitions(-DPOLYSEED_STATIC=ON) + #Create a new global cmake flag that indicates building with depends set (DEPENDS true) |