diff options
| -rw-r--r-- | gis/osm2pgrouting/osm2pgrouting.SlackBuild | 23 | ||||
| -rw-r--r-- | gis/osm2pgrouting/osm2pgrouting.info | 6 |
2 files changed, 12 insertions, 17 deletions
diff --git a/gis/osm2pgrouting/osm2pgrouting.SlackBuild b/gis/osm2pgrouting/osm2pgrouting.SlackBuild index fd244c8b67..f145cbca1a 100644 --- a/gis/osm2pgrouting/osm2pgrouting.SlackBuild +++ b/gis/osm2pgrouting/osm2pgrouting.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=osm2pgrouting -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-2.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,18 +40,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" 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 set -e @@ -59,9 +55,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$PRGNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -75,8 +71,7 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_ISNTALL_FULL_BINDIR=/xxxx \ - -DWITH_DOC=$WITH_DOC \ + -DCMAKE_BUILD_TYPE=Release \ .. make VERBOSE=1 @@ -87,7 +82,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS.txt COPYING Readme.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS.md COPYING NEWS Readme.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir $PKG/install diff --git a/gis/osm2pgrouting/osm2pgrouting.info b/gis/osm2pgrouting/osm2pgrouting.info index 5cf1cfa33c..748dd1b737 100644 --- a/gis/osm2pgrouting/osm2pgrouting.info +++ b/gis/osm2pgrouting/osm2pgrouting.info @@ -1,8 +1,8 @@ PRGNAM="osm2pgrouting" -VERSION="2.0.0" +VERSION="2.2.0" HOMEPAGE="http://pgrouting.org" -DOWNLOAD="https://github.com/pgRouting/osm2pgrouting/archive/osm2pgrouting-2.0.0/osm2pgrouting-2.0.0.tar.gz" -MD5SUM="79fbfe4cc1e75169f10744f9ab158139" +DOWNLOAD="https://github.com/pgRouting/osm2pgrouting/archive/v2.2.0/osm2pgrouting-2.2.0.tar.gz" +MD5SUM="" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pgrouting" |