From b8615774b42dd77240c24ff892725671424a315b Mon Sep 17 00:00:00 2001 From: Joeri Sykora Date: Thu, 9 Nov 2023 15:58:01 +0100 Subject: [PATCH] try static linking --- .github/workflows/build-release.yml | 18 ++++++++++++------ Makefile.common | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 099120dbfb..6392b7a619 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -12,13 +12,14 @@ jobs: name: Build natives libraries strategy: matrix: - os: [ ubuntu-latest, windows-latest ] + # os: [ ubuntu-latest, windows-latest ] + os: [ windows-latest ] target: [ native ] - include: - - os: ubuntu-latest - target: mac64-signed - - os: ubuntu-latest - target: mac-arm64-signed + # include: + # - os: ubuntu-latest + # target: mac64-signed + # - os: ubuntu-latest + # target: mac-arm64-signed runs-on: ${{ matrix.os }} steps: - name: Make space @@ -62,6 +63,11 @@ jobs: if: runner.os == 'Windows' run: cp C:\openssl1.1.1\bin\libcrypto.dll src\main\resources\org\sqlite\native\Windows\x86_64\libcrypto.dll + - name: Build OpenSSL + if: runner.os == 'Windows' + shell: bash + run: ls -l C:\openssl1.1.1\lib\ + - name: Set platform classifier shell: bash run: | diff --git a/Makefile.common b/Makefile.common index b313272caf..0979d6dbc7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -257,7 +257,7 @@ Windows-x86_SQLITE_FLAGS := Windows-x86_64_CC := $(CROSS_PREFIX)gcc Windows-x86_64_STRIP := $(CROSS_PREFIX)strip Windows-x86_64_CCFLAGS := -D_JNI_IMPLEMENTATION_ -Ilib/inc_win -IC:/openssl1.1.1/include -Os -msse4.2 -maes -Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc -LC:/openssl1.1.1/bin -lcrypto +Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc -LC:/openssl1.1.1/lib -l:libcrypto.lib Windows-x86_64_LIBNAME := sqlitejdbc.dll Windows-x86_64_SQLITE_FLAGS :=