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

Don't use architecture extension in package name, since we're building a combined package

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@531 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-03-22 03:19:11 +00:00
parent bfa34cf143
commit e6f597f28f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
release/makesunpkg.in
View File

@@ -38,20 +38,17 @@ fi
umask 022 umask 022
TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX` TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
rm -f $PACKAGE_NAME.pkg.bz2
cp $SRCDIR/release/copyright $TMPDIR cp $SRCDIR/release/copyright $TMPDIR
touch $TMPDIR/depend touch $TMPDIR/depend
cp pkgscripts/pkginfo $TMPDIR/pkginfo cp pkgscripts/pkginfo $TMPDIR/pkginfo
if [ "$PKGARCH" = "i386" ]; then if [ "$PKGARCH" = "i386" ]; then
__LIB=lib __LIB=lib
PKGEXT=-x86; else
elif [ "$PKGARCH" = "amd64" ]; then
__LIB=lib/$PKGARCH __LIB=lib/$PKGARCH
PKGEXT=-x64;
fi fi
rm -f $PACKAGE_NAME-$VERSION$PKGEXT.pkg.bz2
if [ $COMBINED = 1 ]; then if [ $COMBINED = 1 ]; then
if [ ! -d $BUILDDIR32 ]; then if [ ! -d $BUILDDIR32 ]; then
echo ERROR: 32-bit build directory $BUILDDIR32 does not exist echo ERROR: 32-bit build directory $BUILDDIR32 does not exist
@@ -133,8 +130,8 @@ f none $PACKAGE_NAME/doc/usage.txt 0644 root bin
EOF EOF
pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto
pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME-$VERSION$PKGEXT.pkg $PACKAGE_NAME pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME-$VERSION$.pkg $PACKAGE_NAME
bzip2 $TMPDIR/$PACKAGE_NAME-$VERSION$PKGEXT.pkg bzip2 $TMPDIR/$PACKAGE_NAME-$VERSION$.pkg
cp $TMPDIR/$PACKAGE_NAME-$VERSION$PKGEXT.pkg.bz2 . cp $TMPDIR/$PACKAGE_NAME-$VERSION$.pkg.bz2 .
exit exit