summaryrefslogtreecommitdiffhomepage
path: root/vars/libjpeg_turbo.vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-03-01 21:09:37 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-03-01 21:09:37 +0000
commitbf9edfaed49c4387e181be454602e0cc65fe4382 (patch)
tree2bf582d4f1f0916946bc2285014b193482c52d86 /vars/libjpeg_turbo.vars
parent725770754d9f53d5b41d876053a7a993b629472e (diff)
downloadmidipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.bz2
midipix_build-bf9edfaed49c4387e181be454602e0cc65fe4382.tar.xz
General cleanup, pt. III.
dist/dist_digest.dist: removes obsolete dist file. etc/{build.usage,README.md}: updated. groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group. groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group. groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set. groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set. groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set. groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set. midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF. subr/rtl_fileop.subr: adds ch{mod,own} fileops. vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
Diffstat (limited to 'vars/libjpeg_turbo.vars')
-rw-r--r--vars/libjpeg_turbo.vars35
1 files changed, 19 insertions, 16 deletions
diff --git a/vars/libjpeg_turbo.vars b/vars/libjpeg_turbo.vars
index 8ede8063..a8f1a8d5 100644
--- a/vars/libjpeg_turbo.vars
+++ b/vars/libjpeg_turbo.vars
@@ -3,19 +3,22 @@
#
pkg_libjpeg_turbo_configure() {
- rm -f config.cache;
- env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \
- PREFIX="" \
- cmake -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
- -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
- -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \
- -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \
- -DCMAKE_BUILD_TYPE="Debug" \
- -DCMAKE_INSTALL_PREFIX= \
- -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \
- -DWITH_JPEG8=ON \
- -DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm" \
- -DCMAKE_ASM_NASM_OBJECT_FORMAT="win64" \
- -DWITH_SIMD=OFF \
- "../libjpeg-turbo-${PKG_VERSION}";
-}
+ if ! rtl_fileop rm config.cache \
+ || ! env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" PREFIX="" \
+ cmake -DCMAKE_AR="${PREFIX}/bin/${PKG_AR}" \
+ -DCMAKE_ASM_NASM_COMPILER="${PREFIX}/bin/${PKG_TARGET}-nasm" \
+ -DCMAKE_ASM_NASM_OBJECT_FORMAT="win64" \
+ -DCMAKE_BUILD_TYPE="Debug" \
+ -DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}" \
+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="ONLY" \
+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="NEVER" \
+ -DCMAKE_INSTALL_PREFIX="" \
+ -DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}" \
+ -DWITH_JPEG8="ON" \
+ -DWITH_SIMD="OFF" \
+ "../libjpeg-turbo-${PKG_VERSION}"; then
+ return 1;
+ fi;
+};
+
+# vim:filetype=sh textwidth=0