From c4429f2ce3ab5b9fe38b83850f844fd38483ede0 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 6 Sep 2015 19:53:05 +0300 Subject: libjpeg-turbo: install DLL to bin/libjpeg-turbo Enable shared build. It was disabled because DLLs were installed to lib/bin. see #826 --- ...-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch | 28 ++++++++++++++++++++++ src/libjpeg-turbo.mk | 2 -- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch diff --git a/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch b/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch new file mode 100644 index 0000000..872bacc --- /dev/null +++ b/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch @@ -0,0 +1,28 @@ +This file is part of MXE. +See index.html for further information. + +From 703326874bf235adb392b9748ff0a56a08991690 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 6 Sep 2015 17:45:40 +0100 +Subject: [PATCH] install DLL to bin/libjpeg-turbo not to lib/bin + +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index a968835..6acc338 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5229,7 +5229,7 @@ fi\ + # place dlname in correct position for cygwin + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in +- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../../bin/libjpeg-turbo/$dlname ;; + esac + $echo > $output "\ + # $outputname - a libtool library file +-- +2.1.4 + diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index e47af58..5015761 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -38,5 +38,3 @@ define $(PKG)_BUILD '$(TOP_DIR)/src/jpeg-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ `'$(TARGET)-pkg-config' jpeg-turbo --cflags --libs` endef - -$(PKG)_BUILD_SHARED = -- cgit v0.12 From ebbd57a5745ece507cd9ff55533699e5adac5290 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 8 Sep 2015 10:17:37 +0300 Subject: libjpeg-turbo: install DLLs to bin/ Do not install DLLs to bin/libjpeg-turbo/$dlname See #834 --- src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch b/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch index 872bacc..fb8b768 100644 --- a/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch +++ b/src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch @@ -19,7 +19,7 @@ index a968835..6acc338 100644 tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../../bin/libjpeg-turbo/$dlname ;; ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../../bin/$dlname ;; esac $echo > $output "\ # $outputname - a libtool library file -- cgit v0.12