diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-09-21 10:08:04 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-09-21 10:08:04 (GMT) |
| commit | da6c8e003f61098212a94a93fc27184ec8f50c07 (patch) | |
| tree | 4dcaf0ef36c5f572c438e144b076ff23bee31cb1 | |
| parent | 62d23ddec19b9eff2de06f9a632bd22a0e823553 (diff) | |
| parent | ebbd57a5745ece507cd9ff55533699e5adac5290 (diff) | |
| download | mxe-da6c8e003f61098212a94a93fc27184ec8f50c07.zip mxe-da6c8e003f61098212a94a93fc27184ec8f50c07.tar.gz mxe-da6c8e003f61098212a94a93fc27184ec8f50c07.tar.bz2 | |
Merge pull request #834 from LuaAndC/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo
libjpeg-turbo: install DLL to bin/libjpeg-turbo
| -rw-r--r-- | src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch | 28 | ||||
| -rw-r--r-- | src/libjpeg-turbo.mk | 2 |
2 files changed, 28 insertions, 2 deletions
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..fb8b768 --- /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 <bnagaev@gmail.com> +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/$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 = |