diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-11-07 21:54:58 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-11-07 21:54:58 +0000 |
| commit | 5298eba34cdb623686f7c74056cca3995b3eddf5 (patch) | |
| tree | c594e1331c896315a9aede93cdf2543ec7ce4da7 | |
| parent | 46f821bb4a6ca2082741f08474564e50a60c2b7b (diff) | |
| download | asb-5298eba34cdb623686f7c74056cca3995b3eddf5.tar.gz asb-5298eba34cdb623686f7c74056cca3995b3eddf5.tar.xz | |
Multilib fix; create .txz package
| -rwxr-xr-x | xulrunner/build/xulrunner.SlackBuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xulrunner/build/xulrunner.SlackBuild b/xulrunner/build/xulrunner.SlackBuild index 62260c34..ce189634 100755 --- a/xulrunner/build/xulrunner.SlackBuild +++ b/xulrunner/build/xulrunner.SlackBuild @@ -37,10 +37,10 @@ # 1.9.2.10-1: 11/oct/2010 by Eric Hameleers <alien@slackware.com> # * Update. # 1.9.2.12-1: 07/nov/2010 by Eric Hameleers <alien@slackware.com> -# * Update. +# * Update. Use xz compression to reduce package size. # # Run 'sh xulrunner.SlackBuild' to build a Slackware package. -# The package (.tgz) and .txt file as well as build logs are created in /tmp . +# The package (.txz) and .txt file as well as build logs are created in /tmp . # Install it using 'installpkg'. # # ----------------------------------------------------------------------------- @@ -193,6 +193,11 @@ export CFLAGS="$SLKCFLAGS" make MOZ_MAKE_FLAGS="$NUMJOBS" 2>&1 | tee $OUTPUT/make-${PRGNAM}.log make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +# Make sure gre configuration files do not oeverwrite one another on multilib, +# the filename is not important, all *.conf files in the directory are parsed: +GECKOVERS=$(./config/milestone.pl --topsrcdir=.) +mv $PKG/etc/gre.d/${GECKOVERS}.system.conf $PKG/etc/gre.d/gre${LIBDIRSUFFIX}.conf + # Add missing xulrunner-plugin.pc ( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ln -sf mozilla-plugin.pc xulrunner-plugin.pc @@ -233,9 +238,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt |