diff options
| author | Benjamin Trigona-Harany <bosth@alumni.sfu.ca> | 2018-03-16 22:56:00 -0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-03-24 06:50:33 +0700 |
| commit | e7d7741c742782e3e4ce1424a631ebb4ec515f0e (patch) | |
| tree | 20a86beca4044b8b377329b3c13bfcdbfa5477d2 | |
| parent | 17964961bf1d5a72244519575904c5f1f5f09969 (diff) | |
| download | slackbuilds-e7d7741c742782e3e4ce1424a631ebb4ec515f0e.tar.gz | |
gis/pointcloud: Remove need for cunit dependency.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
| -rw-r--r-- | gis/pointcloud/pointcloud.SlackBuild | 40 | ||||
| -rw-r--r-- | gis/pointcloud/pointcloud.info | 4 |
2 files changed, 23 insertions, 21 deletions
diff --git a/gis/pointcloud/pointcloud.SlackBuild b/gis/pointcloud/pointcloud.SlackBuild index 236b83aa0c..35a4da9a59 100644 --- a/gis/pointcloud/pointcloud.SlackBuild +++ b/gis/pointcloud/pointcloud.SlackBuild @@ -29,7 +29,7 @@ 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,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" @@ -60,11 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -if [ -e $CWD/v$VERSION.tar.gz ]; then - tar xvf $CWD/v$VERSION.tar.gz -else - tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -fi +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -77,23 +73,29 @@ find -L . \ # please remove it on next release patch -p1 < $CWD/postgresql9.5.patch -./autogen.sh -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --build=$ARCH \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --build=$ARCH-slackware-linux +sed -i "s/cppflags/cflags/" CMakeLists.txt +sed -i "s/CPPFLAGS/CFLAGS/" CMakeLists.txt +sed -i "s/CPPFLAGS/CFLAGS/" pgsql/CMakeLists.txt -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 \ + -DWITH_TESTS=FALSE \ + .. + make install DESTDIR=$PKG +cd .. 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYRIGHT README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYRIGHT NEWS README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/gis/pointcloud/pointcloud.info b/gis/pointcloud/pointcloud.info index edee771d3b..6faae1c927 100644 --- a/gis/pointcloud/pointcloud.info +++ b/gis/pointcloud/pointcloud.info @@ -1,10 +1,10 @@ PRGNAM="pointcloud" VERSION="1.0.1" HOMEPAGE="https://github.com/pramsey/pointcloud" -DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v1.0.1.tar.gz" +DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v1.0.1/pointcloud-1.0.1.tar.gz" MD5SUM="cceb8ae6985fc7fa5c5bf74ec412da68" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="cunit postgresql" +REQUIRES="postgresql" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" |