diff options
| author | Chris Abela <kristofru@gmail.com> | 2012-01-24 13:54:12 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-02-11 21:19:28 -0600 |
| commit | c0f9bf5e5dfed271b431527221547fc4a688bce8 (patch) | |
| tree | e713991446af5845ec141583b011985b966e882c | |
| parent | eababad846ddf85c1dd24bf083f0de8a56924eb6 (diff) | |
misc/zyGrib: Build bump, added configure files in the source.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
| -rw-r--r-- | misc/zyGrib/zyGrib.SlackBuild | 54 | ||||
| -rw-r--r-- | misc/zyGrib/zyGrib.info | 2 |
2 files changed, 49 insertions, 7 deletions
diff --git a/misc/zyGrib/zyGrib.SlackBuild b/misc/zyGrib/zyGrib.SlackBuild index aeb186181107..d9ddb061ce03 100644 --- a/misc/zyGrib/zyGrib.SlackBuild +++ b/misc/zyGrib/zyGrib.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for appname +# Slackware build script for zyGrib -# Copyright 2011 Chris Abela, Malta +# Copyright 2011,2012 Chris Abela, Malta # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=zyGrib VERSION=${VERSION:-5.0.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -40,9 +40,33 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# zyGrib lacks configure scripts so the options are limited +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +make_configure () { + for DIR in $@; do + cd $DIR + mv Makefile Makefile.in + autoscan + mv configure.scan configure.in + autoheader + autoconf + cd - > /dev/null + done +} -set -e +set -e # In case the source was fetched with wget or some other downloader: SRCTAR=$PRGNAM-$VERSION.tgz @@ -62,11 +86,29 @@ find . \ -exec chmod 644 {} \; # src/zyGrib.pro is looking for the wrong qwt library -sed -i 's/lqwt-qt4/lqwt/' src/zyGrib.pro +sed -i 's/lqwt-qt4/lqwt/' src/zyGrib.pro +# src/bzip2/Makefile is looking in the wrong place for qmake.conf +sed -i 's/share\/qt4/lib\/qt/1' src/bzip2/Makefile # Makefile installs a good local installation, but we need a system installation patch -p0 < $CWD/Makefile.patch +# Prepare the source for configure +ln -s src/proj-4.6.0/install-sh . +make_configure . src src/bzip2 src/zlib-1.2.3 +find ./src/zlib-1.2.3 -name Makefile -exec mv {} {}.in \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + # See http://www.zygrib.org/forum/viewtopic.php?f=3&t=221&view=print [ "$ARCH" = x86_64 ] && make veryclean make diff --git a/misc/zyGrib/zyGrib.info b/misc/zyGrib/zyGrib.info index 7f35f0db6c0f..9f5de26ca3ec 100644 --- a/misc/zyGrib/zyGrib.info +++ b/misc/zyGrib/zyGrib.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Chris Abela" EMAIL="kristofru@gmail.com" -APPROVED="Niels Horn" +APPROVED="Erik Hanson" |