ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create /opt/libjpeg-turbo/lib32 and /opt/libjpeg-turbo/lib64 symlinks when doing 'make install'

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@294 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-11-17 22:44:40 +00:00
parent 61c15bdefb
commit d1c281a055
5 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -10,6 +10,11 @@ README-turbo.txt for more details. This feature was sponsored by CamTrace SAS.
[4] jpgtest can now be used to test decompression performance only. [4] jpgtest can now be used to test decompression performance only.
[5] If the default install prefix (/opt/libjpeg-turbo) is used, then
'make install' now creates /opt/libjpeg-turbo/lib32 and
/opt/libjpeg-turbo/lib64 sym links to duplicate the behavior of the binary
packages.
Significant changes since 1.0.0 Significant changes since 1.0.0
=============================== ===============================

24
Makefile.am
View File

@@ -170,6 +170,30 @@ testclean:
rm -f *_444Q[0-9]*.ppm rm -f *_444Q[0-9]*.ppm
rm -f *_444Q[0-9]*.jpg rm -f *_444Q[0-9]*.jpg
if X86_64
install-exec-hook:
__PREFIX=`echo ${prefix} | sed -e 's@\/*$$@@'`; \
if [ "$$__PREFIX" = "/opt/libjpeg-turbo" ]; then \
cd $(DESTDIR)/${prefix}; \
if [ -d lib -a ! -d lib64 -a ! -h lib64 ]; then \
$(LN_S) lib lib64; \
fi \
fi
else
install-exec-hook:
__PREFIX=`echo ${prefix} | sed -e 's@\/*$$@@'`; \
if [ "$$__PREFIX" = "/opt/libjpeg-turbo" ]; then \
cd $(DESTDIR)/${prefix}; \
if [ -d lib -a ! -d lib32 -a ! -h lib32 ]; then \
$(LN_S) lib lib32; \
fi \
fi
endif
rpm: all rpm: all
TMPDIR=`mktemp -d /tmp/${PACKAGE_NAME}-build.XXXXXX`; \ TMPDIR=`mktemp -d /tmp/${PACKAGE_NAME}-build.XXXXXX`; \
mkdir -p $$TMPDIR/RPMS; \ mkdir -p $$TMPDIR/RPMS; \

4
release/libjpeg-turbo.spec.in
View File

@@ -55,10 +55,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/include
mv $RPM_BUILD_ROOT/opt/%{name}/include/turbojpeg.h $RPM_BUILD_ROOT/usr/include mv $RPM_BUILD_ROOT/opt/%{name}/include/turbojpeg.h $RPM_BUILD_ROOT/usr/include
ln -fs /usr/include/turbojpeg.h $RPM_BUILD_ROOT/opt/%{name}/include/ ln -fs /usr/include/turbojpeg.h $RPM_BUILD_ROOT/opt/%{name}/include/
ln -fs /usr/%{__lib}/libturbojpeg.a $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/ ln -fs /usr/%{__lib}/libturbojpeg.a $RPM_BUILD_ROOT/opt/%{name}/%{__lib}/
%ifarch x86_64
%else
ln -fs %{__lib} $RPM_BUILD_ROOT/opt/%{name}/lib32
%endif
%post -p /sbin/ldconfig %post -p /sbin/ldconfig

7
release/makedpkg
View File

@@ -58,13 +58,6 @@ makedeb()
/sbin/ldconfig -n $TMPDIR/usr/$__LIB /sbin/ldconfig -n $TMPDIR/usr/$__LIB
if [ ! $SUPPLEMENT = 1 ]; then if [ ! $SUPPLEMENT = 1 ]; then
if [ "$DEBARCH" = "amd64" ]; then
ln -fs lib $TMPDIR/opt/$DIRNAME/lib64
else
if [ ! "$__LIB" = "lib32" ]; then
ln -fs lib $TMPDIR/opt/$DIRNAME/lib32
fi
fi
mkdir -p $TMPDIR/usr/include mkdir -p $TMPDIR/usr/include
mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/ ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/

8
release/makemacpkg.in
View File

@@ -118,8 +118,12 @@ install_name_tool -id libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.dylib
ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/ ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/
ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/ ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/
ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32 if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib32 ]; then
ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib64 ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib32
fi
if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib64 ]; then
ln -fs lib $PKGROOT/opt/$PACKAGE_NAME/lib64
fi
mkdir -p $PKGROOT/Library/Documentation/$PACKAGE_NAME mkdir -p $PKGROOT/Library/Documentation/$PACKAGE_NAME
chmod 1775 $PKGROOT/Library chmod 1775 $PKGROOT/Library