academic/qhull: Updated for version 2012.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
Chris Abela 2012-04-02 14:52:03 -04:00 committed by Erik Hanson
parent 57d794011a
commit fbf6db4c35
3 changed files with 46 additions and 80 deletions

View file

@ -1,47 +0,0 @@
--- Make-config.sh 2010-03-26 07:21:14.000000000 +0000
+++ Make-config.sh.new 2010-03-26 07:24:34.000000000 +0000
@@ -114,7 +114,7 @@
### Man pages (trick to get around .man extension)
%.1: %.man
- cp $< $@
+ cp $< $@
CLEANFILES = *.1
man_MANS = rbox.1 qhull.1
@@ -195,7 +195,10 @@
geom.c \
poly.c \
qset.c \
- mem.c
+ mem.c \
+ usermem.c \
+ userprintf.c \
+ rboxlib.c
# how:
libqhull_la_LDFLAGS = -version-info 4:0:0 -lm
@@ -233,7 +236,9 @@
merge.h \
libqhull.h \
qset.h \
- user.h
+ user.h \
+ random.h \
+ qhull.h
### Example programs
@@ -246,10 +251,9 @@
examples_DATA = \
user_eg.c \
user_eg2.c \
- qhull_interface.cpp \
- Makefile.txt \
+ Makefile \
Make-config.sh \
- MBorland
+ Mborland
doc_DATA = Changes.txt \
index.htm \

View file

@ -2,12 +2,29 @@
# Slackware build script for qhull
# Written by Chris Abela <chris.abela@maltats.com>
# 2010.03.19
# Copyright 2012 Chris Abela, Malta
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
#
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qhull
VERSION=${VERSION:-2010.1}
BUILD=${BUILD:-2}
VERSION=${VERSION:-2012.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -24,13 +41,13 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing"
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing"
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing"
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
@ -52,29 +69,25 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
cd src
# Amongst other things, this caters for the octave SlackBuild
patch -Np0 -i $CWD/Make-config.sh.patch Make-config.sh
./Make-config.sh
cd -
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-DMAN_INSTALL_DIR=/usr/man/man1 \
-DDOC_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
cd ..
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--datarootdir=/usr \
--docdir=/usr \
--disable-static \
--build=$ARCH-slackware-linux
# Let octave find us
ln -s libqhull $PKG/usr/include/qhull
ln -s libqhull.h $PKG/usr/include/libqhull/qhull.h
make \
docdir=/usr/doc/$PRGNAM-$VERSION
make install \
docdir=/usr/doc/$PRGNAM-$VERSION \
DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;

View file

@ -1,10 +1,10 @@
PRGNAM="qhull"
VERSION="2010.1"
VERSION="2012.1"
HOMEPAGE="http://www.qhull.org/"
DOWNLOAD="http://www.qhull.org/download/qhull-2010.1-src.tgz"
MD5SUM="e64138470acdeb18f752a0bc2a11ceb4"
DOWNLOAD="http://www.qhull.org/download/qhull-2012.1-src.tgz"
MD5SUM="d0f978c0d8dfb2e919caefa56ea2953c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Chris Abela"
EMAIL="chris.abela@maltats.com"
APPROVED="Erik Hanson"
EMAIL="kristofru@gmail.com"
APPROVED="dsomero"