summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-01-11 14:49:35 +0000
committer Eric Hameleers <alien@slackware.com>2013-01-11 14:49:35 +0000
commitd179926352dc1f82769309ae4b44ef38eb1847f8 (patch)
treef4faf7c87be3158c0a5e35d3b886853396c4d4e2
parent99efbff3c0769598147be1e932da6fe943f98f99 (diff)
downloadasb-d179926352dc1f82769309ae4b44ef38eb1847f8.tar.gz
asb-d179926352dc1f82769309ae4b44ef38eb1847f8.tar.xz
Be silent when extracting/packing the dependencies tarball. Also, generate a new tarball only if none was present before.
-rwxr-xr-xcalibre/build/calibre.SlackBuild13
1 files changed, 9 insertions, 4 deletions
diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 65bd1cd1..410178ec 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -1161,7 +1161,8 @@ if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; t
# having to build them - this saves a _lot_ of compile time:
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre
( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
- tar -jxvf $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2
+ echo "** Extracting dependencies tarball... **"
+ tar -jxf $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2
# We also need a copy in the filesystem root!
rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre /usr/lib${LIBDIRSUFFIX}/
)
@@ -1285,9 +1286,13 @@ if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; t
# have to recompile them every time).
# If you want to make use of this, then just copy the resulting tarball
# into the same directory as this SlackBuild script:
- ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
- tar -jcvf $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 .
- )
+ if [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
+ ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
+ echo "** Creating dependencies tarball $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2"
+ echo "** Move this file to $SRCDIR for future compilation speedups."
+ tar -jcf $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 .
+ )
+ fi
fi
if [ "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; then