Update to 0.8.7. Also add a feature to wrap the compiled internal python modules into a tarball

1 files changed, 62 insertions, 34 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 84a6411c..0d1dcdfb 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -42,7 +42,8 @@
 #               additional modules in the package.
 # 0.8.6-1:    17/jun/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update. Added dbus-python to the internal python 2.7 libraries,
-#               this was required for device detection and manipulation.
+# 0.8.7-1:    26/jun/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -53,7 +54,7 @@
 # Set initial variables:
 
 PRGNAM=calibre
-VERSION=${VERSION:-0.8.6}
+VERSION=${VERSION:-0.8.7}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -675,53 +676,80 @@ make_calibre () {
 # Compilation of the software:
 if [ "$BUILD_PYTHON" = "YES" ]; then
 
-  # No python2.7 was found on the computer so we need to build it ourself.
+  # No python2.7 was found on the computer so we need to supply it ourself.
+
+  if  [ -f $SRCDIR/calibre_pythondeps-$ARCH.tar.bz2 ]; then
+    # We unwrap the tarball of compiled python internal libraries instead of
+    # having to build them now:
+    mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre
+    ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
+      tar -jxvf $SRCDIR/calibre_pythondeps-$ARCH.tar.bz2
+    )
 
-  # After each part is built we will sync to here because in the end, calibre
-  # will wipe the origin and we will have to sync it all back:
-  mkdir /usr/lib${LIBDIRSUFFIX}/calibre
+    # Ensure that our non-standard python2.7 is found and used:
+    export PATH="/usr/lib${LIBDIRSUFFIX}/calibre:$PATH"
+    export PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib -L/usr/lib${LIBDIRSUFFIX}/calibre/lib"
+
+  else
 
-  make_python
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    # We need to build python2.7 ourself.
+    
+    # After each part is built we will sync to here because in the end, calibre
+    # will wipe the origin and we will have to sync it all back:
+    mkdir /usr/lib${LIBDIRSUFFIX}/calibre
 
-  # Ensure that our non-standard python2.7 is found and used:
-  export PATH="/usr/lib${LIBDIRSUFFIX}/calibre:$PATH"
-  export PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib/pkgconfig:$PKG_CONFIG_PATH"
-  export LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib -L/usr/lib${LIBDIRSUFFIX}/calibre/lib"
+    make_python
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_setuptools
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    # Ensure that our non-standard python2.7 is found and used:
+    export PATH="/usr/lib${LIBDIRSUFFIX}/calibre:$PATH"
+    export PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib -L/usr/lib${LIBDIRSUFFIX}/calibre/lib"
 
-  make_dbuspython
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_setuptools
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_BeautifulSoup
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_dbuspython
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_dnspython
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_BeautifulSoup
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_cssutils
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_dnspython
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_dateutil
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_cssutils
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_imaging
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_dateutil
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_lxml
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_imaging
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_mechanize
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_lxml
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_sip
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_mechanize
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-  make_pyqt
-  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+    make_sip
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+    make_pyqt
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    # At this point we can wrap the compiled python internal libraries into
+    # a tarball which we can re-use in a future build (so that we do not 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-$ARCH.tar.bz2 .
+    )
+
+  fi
 fi
 
 # The main course - compile calibre: