diff options
| author | Benjamin Trigona-Harany <bosth@alumni.sfu.ca> | 2017-06-02 09:56:25 -0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-06-03 07:59:59 +0700 |
| commit | 339f7ce0690abac8a3e275a8e72ea9ecf81d6b21 (patch) | |
| tree | d8414046878d731500227cd523cb6c938f1d9786 /gis | |
| parent | bf5624d164d03a5390dab7d459f962fd333163de (diff) | |
| download | slackbuilds-339f7ce0690abac8a3e275a8e72ea9ecf81d6b21.tar.gz | |
gis/osm2pgsql: Updated for version git28ce89d.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Diffstat (limited to 'gis')
| -rw-r--r-- | gis/osm2pgsql/osm2pgsql.SlackBuild | 53 | ||||
| -rw-r--r-- | gis/osm2pgsql/osm2pgsql.info | 6 |
2 files changed, 23 insertions, 36 deletions
diff --git a/gis/osm2pgsql/osm2pgsql.SlackBuild b/gis/osm2pgsql/osm2pgsql.SlackBuild index 1b710e02b0..f3606a99ac 100644 --- a/gis/osm2pgsql/osm2pgsql.SlackBuild +++ b/gis/osm2pgsql/osm2pgsql.SlackBuild @@ -22,13 +22,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=osm2pgsql -VERSION=${VERSION:-0.88.1} +GITREV=28ce89dd28c20d94a98e29f41b8e76cfc7b6b823 +VERSION=${VERSION:-git28ce89d} 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 @@ -39,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -58,13 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -if [ -e $CWD/$VERSION.tar.gz ]; then - tar xvf $CWD/$VERSION.tar.gz -else - tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -fi -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$GITREV +tar xvf $CWD/$PRGNAM-$GITREV.tar.gz +cd $PRGNAM-$GITREV chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,36 +69,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-bzip2=/usr/lib${LIBDIRSUFFIX} \ - --with-geos=yes \ - --with-proj=yes \ - --with-zlib=/usr/lib${LIBDIRSUFFIX} \ - --with-libxml2=yes \ - --with-postgresql=/usr/bin/pg_config \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mv $PKG/usr/share/man $PKG/usr gzip -9 $PKG/usr/man/man?/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog NEWS README TODO \ + AUTHORS COPYING ChangeLog README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/gis/osm2pgsql/osm2pgsql.info b/gis/osm2pgsql/osm2pgsql.info index 887712e23e..a1ee1f2954 100644 --- a/gis/osm2pgsql/osm2pgsql.info +++ b/gis/osm2pgsql/osm2pgsql.info @@ -1,8 +1,8 @@ PRGNAM="osm2pgsql" -VERSION="0.88.1" +VERSION="git28ce89d" HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql" -DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/0.88.1.tar.gz" -MD5SUM="b52675522c36147d1c6c4bcabe7fc296" +DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/28ce89dd28c20d94a98e29f41b8e76cfc7b6b823/osm2pgsql-28ce89dd28c20d94a98e29f41b8e76cfc7b6b823.tar.gz" +MD5SUM="32ec87993608b1587a51e360dde9cfde" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="postgis" |