mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 05:28:53 +02:00
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
This commit is contained in:
@@ -5,7 +5,7 @@ LICENSE="bzip2"
|
|||||||
COPYRIGHT="1996-2010 Julian R Seward"
|
COPYRIGHT="1996-2010 Julian R Seward"
|
||||||
SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
|
SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
|
||||||
CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
|
CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
|
||||||
REVISION="4"
|
REVISION="5"
|
||||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||||
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
||||||
|
|
||||||
@@ -57,8 +57,15 @@ INSTALL()
|
|||||||
make install PREFIX=$prefix
|
make install PREFIX=$prefix
|
||||||
|
|
||||||
mkdir -p $libDir
|
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
|
# 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
|
# move man pages
|
||||||
mkdir -p $manDir
|
mkdir -p $manDir
|
||||||
@@ -77,6 +84,12 @@ INSTALL()
|
|||||||
# devel package
|
# devel package
|
||||||
packageEntries devel \
|
packageEntries devel \
|
||||||
$developDir
|
$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 -------------------------------------------------------
|
# ----- devel package -------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user