diff options
Diffstat (limited to 'source/l/redland')
| -rwxr-xr-x | source/l/redland/redland.SlackBuild | 37 | ||||
| -rw-r--r-- | source/l/redland/slack-desc | 7 |
2 files changed, 31 insertions, 13 deletions
diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild index 1849481e..16d90675 100755 --- a/source/l/redland/redland.SlackBuild +++ b/source/l/redland/redland.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,24 +28,22 @@ PKGNAM=redland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,11 +53,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -95,8 +105,9 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --with-included-ltdl=no \ --with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \ + --with-bdb-dbname=db-4.4 \ --with-threads \ - --build=$ARCH-slackware-linux + --build=$TARGET # Prevent error "No rule to make target `-lltdl', needed by `librdf.la'" sed -i -e 's# -lltdl$# #' -e '/^LIBS =/s# = # = -lltdl #' src/Makefile diff --git a/source/l/redland/slack-desc b/source/l/redland/slack-desc index db035907..f16c1d45 100644 --- a/source/l/redland/slack-desc +++ b/source/l/redland/slack-desc @@ -1,3 +1,10 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler----------------------------------------------------| redland: redland (RDF high-level interface library) redland: |