diff options
| author |   Teutates <103068388+Teutates@users.noreply.github.com> | 2022-07-07 13:12:19 -0400 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2022-07-07 13:12:19 -0400 |
| commit | dfd6fccd7f8950601e32602b47f205f0a4a9ff7e (patch) | |
| tree | b5db1036fed4b166085bbc04be43b095caf82f3e /.github | |
| parent | 9685c0d6ce74c677b1b3141a8a885f73e137de31 (diff) | |
| download | ldid-dfd6fccd7f8950601e32602b47f205f0a4a9ff7e.tar.gz ldid-dfd6fccd7f8950601e32602b47f205f0a4a9ff7e.tar.zst ldid-dfd6fccd7f8950601e32602b47f205f0a4a9ff7e.zip | |
OpenSSL 3 fixes (#15)
* Remove deprecated openssl functions as of openssl 3.0.5
* Re-add openssl to actions with (should be) proper static providers
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6315017..0144433 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ on: env: LIBPLIST_VERSION: 2.2.0 - OPENSSL_VERSION: 1.1.1n + OPENSSL_VERSION: 3.0.5 SCCACHE_VERSION: 0.2.15 jobs: @@ -77,6 +77,7 @@ jobs: echo "NM=${TRIPLE}-gcc-nm" >> $GITHUB_ENV echo "RANLIB=${TRIPLE}-gcc-ranlib" >> $GITHUB_ENV echo "CFLAGS=-Os -fPIC -fno-pie -no-pie -static -flto -ffunction-sections -fdata-sections" >> $GITHUB_ENV + echo "CXXFLAGS=-Os -fPIC -fno-pie -no-pie -static -flto -ffunction-sections -fdata-sections" >> $GITHUB_ENV echo "LDFLAGS=-Wl,--gc-sections -Wl,-strip-all -flto" >> $GITHUB_ENV - name: build libplist @@ -97,7 +98,7 @@ jobs: wget -q -nc -P ${DOWNLOAD_PATH} https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz tar xf ${DOWNLOAD_PATH}/openssl-${OPENSSL_VERSION}.tar.gz -C ${DEP_PATH} cd ${DEP_PATH}/openssl-${OPENSSL_VERSION} - ./Configure --prefix=/usr --static -static ${PLATFORM} + ./config --prefix=/usr --static -static no-module ${PLATFORM} make -j$(nproc) build_generated libcrypto.a echo "CPPFLAGS=${CPPFLAGS} -I${DEP_PATH}/openssl-${OPENSSL_VERSION}/include" >> $GITHUB_ENV @@ -178,6 +179,7 @@ jobs: echo "${HOME}/sccache-v${SCCACHE_VERSION}-x86_64-apple-darwin" >> $GITHUB_PATH echo "CC=sccache clang -arch ${ARCH} -mmacosx-version-min=10.13" >> $GITHUB_ENV echo "CXX=sccache clang++ -arch ${ARCH} -mmacosx-version-min=10.13" >> $GITHUB_ENV + echo "CXXFLAGS=-Os" >> $GITHUB_ENV echo "CFLAGS=-Os" >> $GITHUB_ENV - name: build libplist @@ -188,7 +190,7 @@ jobs: ./configure --host=${HOST_ARCH}-apple-darwin --without-cython --enable-static --disable-shared make -j$(sysctl -n hw.ncpu) - echo "CFLAGS=${CFLAGS} -I${DEP_PATH}/libplist-${LIBPLIST_VERSION}/include" >> $GITHUB_ENV + echo "CXXFLAGS=${CXXFLAGS} -I${DEP_PATH}/libplist-${LIBPLIST_VERSION}/include" >> $GITHUB_ENV echo "LIBPLIST_LIB=${DEP_PATH}/libplist-${LIBPLIST_VERSION}/src/.libs/libplist-2.0.a" >> $GITHUB_ENV - name: build openssl @@ -196,17 +198,17 @@ jobs: wget -q -nc -P ${DOWNLOAD_PATH} https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz tar xf ${DOWNLOAD_PATH}/openssl-${OPENSSL_VERSION}.tar.gz -C ${DEP_PATH} cd ${DEP_PATH}/openssl-${OPENSSL_VERSION} - ./Configure --prefix=/usr no-shared darwin64-${ARCH}-cc + ./config --prefix=/usr no-shared no-module darwin64-${ARCH}-cc make -j$(sysctl -n hw.ncpu) build_generated libcrypto.a - echo "CFLAGS=${CFLAGS} -I${DEP_PATH}/openssl-${OPENSSL_VERSION}/include" >> $GITHUB_ENV + echo "CXXFLAGS=${CXXFLAGS} -I${DEP_PATH}/openssl-${OPENSSL_VERSION}/include" >> $GITHUB_ENV echo "LIBCRYPTO_LIB=${DEP_PATH}/openssl-${OPENSSL_VERSION}/libcrypto.a" >> $GITHUB_ENV - name: build run: | export LDID_VERSION=$(echo "$(git describe --tags --abbrev=0)") make -j$(sysctl -n hw.ncpu) \ - CFLAGS="${CFLAGS} -flto=thin" \ + CXXFLAGS="-std=c++11 ${CXXFLAGS} -flto=thin" \ VERSION="${LDID_VERSION}" \ LIBS="${LIBPLIST_LIB} ${LIBCRYPTO_LIB}" strip ldid |