diff --git a/recipes/wip/libs/image/libjpeg-turbo/recipe.toml b/recipes/wip/libs/image/libjpeg-turbo/recipe.toml index 3035d42a1..7b89d807c 100644 --- a/recipes/wip/libs/image/libjpeg-turbo/recipe.toml +++ b/recipes/wip/libs/image/libjpeg-turbo/recipe.toml @@ -1,20 +1,10 @@ -#TODO maybe incomplete script, see https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/BUILDING.md#build-procedure [source] -tar = "https://sourceforge.net/projects/libjpeg-turbo/files/3.0.1/libjpeg-turbo-3.0.1.tar.gz" +tar = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz" +blake3 = "3efc14da55c56fc0a6a50f109d9e1ee8a91f5ae7dd17a21d3aebe04a65f3ee96" + [build] template = "custom" script = """ -COOKBOOK_CONFIGURE="cmake" -COOKBOOK_CONFIGURE_FLAGS=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_CROSSCOMPILING=True - -DCMAKE_EXE_LINKER_FLAGS="-static" - -DCMAKE_INSTALL_PREFIX="/" - -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" - -DCMAKE_SYSTEM_NAME=Generic - -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)" - -DCMAKE_VERBOSE_MAKEFILE=On -"${COOKBOOK_SOURCE}" -) -cookbook_configure +DYNAMIC_INIT +cookbook_cmake """ diff --git a/src/bin/cook.rs b/src/bin/cook.rs index 19601d54f..c0452aea2 100644 --- a/src/bin/cook.rs +++ b/src/bin/cook.rs @@ -805,11 +805,6 @@ set(CMAKE_FIND_ROOT_PATH ${COOKBOOK_SYSROOT}) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_INSTALL_INCLUDEDIR include) -set(CMAKE_INSTALL_LIBDIR lib) -set(CMAKE_INSTALL_OLDINCLUDEDIR /include) -set(CMAKE_INSTALL_PREFIX /usr) -set(CMAKE_INSTALL_SBINDIR bin) set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1) set(CMAKE_PREFIX_PATH, ${COOKBOOK_SYSROOT}) set(CMAKE_RANLIB ${TARGET}-ranlib) @@ -821,6 +816,11 @@ EOF "${COOKBOOK_CMAKE}" "${COOKBOOK_SOURCE}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CROSSCOMPILING=True \ + -DCMAKE_INSTALL_INCLUDEDIR=include \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_OLDINCLUDEDIR=/include \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SBINDIR=bin \ -DCMAKE_TOOLCHAIN_FILE=cross_file.cmake \ -DBUILD_SHARED_LIBS=True \ -DENABLE_STATIC=False \