From 54479651f4c661e1b6f854e94f52b0eb618c76b3 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 29 Dec 2013 01:07:08 -0700 Subject: [PATCH] Fix bzip2 library location and symlinks * Move the static library to $libDir on secondary arch builds * Create libbz2.so symlink so things can actually find/use the shared lib * Remove $binDir and $manDir on secondary arch builds The bin commands were already excluded from the package because of where they were installed. This just gets rid of the policy warning --- app-arch/bzip2/bzip2-1.0.6.recipe | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index f9ffdcfcb..9cdb5608f 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -5,7 +5,7 @@ LICENSE="bzip2" COPYRIGHT="1996-2010 Julian R Seward" SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" @@ -57,8 +57,15 @@ INSTALL() make install PREFIX=$prefix mkdir -p $libDir + + #move the static library to the right dir for secondary arch builds + if [ -n "$secondaryArchSuffix" ];then + mv $prefix/lib/libbz2.a $libDir + fi + # also install shared lib - cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir + ln -sf libbz2.so.1.0.6 libbz2.so + cp -a libbz2.so.1.0.6 libbz2.so.1.0 libbz2.so $libDir # move man pages mkdir -p $manDir @@ -77,6 +84,12 @@ INSTALL() # devel package packageEntries devel \ $developDir + + #remove bin commands and man pages when building for secondary arch + if [ -n "$secondaryArchSuffix" ];then + rm -rf $prefix/bin + rm -rf $manDir + fi } # ----- devel package -------------------------------------------------------