From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 7 Aug 2012 18:42:07 +0000 (+0000)
Subject: Allow the libjpeg-turbo32 package to be used on MultiArch-compatible systems without... 
X-Git-Tag: 1.2.90~50^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a0f8d14e24e6cf11a21f2a67c3b7501790b31fd;p=libjpeg-turbo

Allow the libjpeg-turbo32 package to be used on MultiArch-compatible systems without overriding the linker path or LD_LIBRARY_PATH.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@857 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4a592c0..0cc61fd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,6 +3,11 @@
 
 [1] The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT flag.
 
+[2] The 32-bit supplementary package for amd64 Debian systems now provides
+symlinks in /usr/lib/i386-linux-gnu for the TurboJPEG libraries in /usr/lib32.
+This allows those libraries to be used on MultiArch-compatible systems (such as
+Ubuntu 11 and later) without setting the linker path.
+
 
 1.2.1
 =====
diff --git a/release/makedpkg.in b/release/makedpkg.in
index 6d081bb..628e0a6 100644
--- a/release/makedpkg.in
+++ b/release/makedpkg.in
@@ -67,6 +67,10 @@ makedeb()
 		mkdir -p $TMPDIR/usr/include
 		mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
 		ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/
+	else
+		mkdir -p $TMPDIR/usr/lib/i386-linux-gnu
+		ln -fs /usr/lib32/libturbojpeg.so $TMPDIR/usr/lib/i386-linux-gnu/libturbojpeg.so
+		ln -fs /usr/lib32/libturbojpeg.a $TMPDIR/usr/lib/i386-linux-gnu/libturbojpeg.a
 	fi
 
 	sudo chown -Rh root:root $TMPDIR/*