aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/native/libjpeg-turbo/Makefile
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2020-02-22 23:23:47 +0300
committerRechi <Rechi@users.noreply.github.com>2020-02-22 23:23:47 +0300
commit3b2870a9016ae905a8555911812c10db3f4a4095 (patch)
tree81bd272160e58771af1237ff4c75aa8291dc7e4b /tools/depends/native/libjpeg-turbo/Makefile
parentfab43c0a78b6a9246b9d04f4af06796491f3f6e8 (diff)
[depends] bump libjpeg-turbo to 2.0.4
Diffstat (limited to 'tools/depends/native/libjpeg-turbo/Makefile')
-rw-r--r--tools/depends/native/libjpeg-turbo/Makefile19
1 files changed, 7 insertions, 12 deletions
diff --git a/tools/depends/native/libjpeg-turbo/Makefile b/tools/depends/native/libjpeg-turbo/Makefile
index f673e84d97..761be37c6f 100644
--- a/tools/depends/native/libjpeg-turbo/Makefile
+++ b/tools/depends/native/libjpeg-turbo/Makefile
@@ -1,20 +1,15 @@
include ../../Makefile.include
PREFIX=$(NATIVEPREFIX)
PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include Makefile
+DEPS= ../../Makefile.include Makefile 01-disable-executables.patch
# lib name, version
LIBNAME=libjpeg-turbo
-VERSION=1.5.1
+VERSION=2.0.4
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- ./configure --prefix=$(PREFIX) --with-jpeg8 --without-simd
-CFLAGS+=-O3
-
-LIBDYLIB=$(PLATFORM)/.libs/libjpeg.a
+LIBDYLIB=$(PLATFORM)/build/libjpeg.a
all: .installed-$(PLATFORM)
@@ -24,14 +19,14 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); $(CONFIGURE)
+ cd $(PLATFORM); patch -p1 -i ../01-disable-executables.patch
+ cd $(PLATFORM); $(CMAKE) -B build -DCMAKE_TOOLCHAIN_FILE= -DCMAKE_ASM_NASM_COMPILER:FILEPATH=$(NATIVEPREFIX)/bin/yasm -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=ON
$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -j 1 -C $(PLATFORM)
- touch $@
+ $(MAKE) -C $(PLATFORM)/build
.installed-$(PLATFORM): $(LIBDYLIB)
- $(MAKE) -C $(PLATFORM) install
+ $(MAKE) -C $(PLATFORM)/build install
touch $@
clean: