From f4de61ca329d188b8c2dc5bfd1e07b99c4326c0f Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 22 Sep 2021 15:08:28 +0200 Subject: [PATCH] Frei0r works without extra lib on master now --- scripts.d/50-dlfcn-win32.sh | 21 --------------------- scripts.d/50-frei0r.sh | 1 + 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100755 scripts.d/50-dlfcn-win32.sh diff --git a/scripts.d/50-dlfcn-win32.sh b/scripts.d/50-dlfcn-win32.sh deleted file mode 100755 index 04cf00b..0000000 --- a/scripts.d/50-dlfcn-win32.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -DLFCN_WIN32_REPO="https://github.com/dlfcn-win32/dlfcn-win32.git" -DLFCN_WIN32_COMMIT="010969070719fe14435f4b146ecef5e65df0098f" - -ffbuild_enabled() { - [[ $TARGET != win* ]] && return -1 - return 0 -} - -ffbuild_dockerbuild() { - git-mini-clone "$DLFCN_WIN32_REPO" "$DLFCN_WIN32_COMMIT" dlfcn-win32 - cd dlfcn-win32 - - mkdir build && cd build - - cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ - -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF .. - make -j$(nproc) - make install -} diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index fe896f8..2d8b36e 100755 --- a/scripts.d/50-frei0r.sh +++ b/scripts.d/50-frei0r.sh @@ -5,6 +5,7 @@ FREI0R_COMMIT="86475d3e11e1061bf161e6ed3830fe2cf3d172ac" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 + [[ $ADDINS_STR == *4.4* ]] && return -1 return 0 }