diff options
| -rw-r--r-- | libraries/platform/platform-2.0.1-install.patch | 10 | ||||
| -rw-r--r-- | libraries/platform/platform-2.1.0-install.patch | 10 | ||||
| -rw-r--r-- | libraries/platform/platform.SlackBuild | 14 | ||||
| -rw-r--r-- | libraries/platform/platform.info | 6 |
4 files changed, 20 insertions, 20 deletions
diff --git a/libraries/platform/platform-2.0.1-install.patch b/libraries/platform/platform-2.0.1-install.patch deleted file mode 100644 index 0c6f8f69e5c8..000000000000 --- a/libraries/platform/platform-2.0.1-install.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2016-01-19 20:49:33.000000000 +0100 -+++ ./CMakeLists.txt 2016-02-05 13:30:27.456442363 +0100 -@@ -81,5 +81,5 @@ ENDIF(NOT WIN32) - configure_file (platform-config.cmake.in - platform-config.cmake @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/platform-config.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/platform) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/cmake/${CMAKE_PROJECT_NAME}) - diff --git a/libraries/platform/platform-2.1.0-install.patch b/libraries/platform/platform-2.1.0-install.patch new file mode 100644 index 000000000000..efa7ab82b3db --- /dev/null +++ b/libraries/platform/platform-2.1.0-install.patch @@ -0,0 +1,10 @@ +diff -Naur platform-platform-2.1.0.orig/CMakeLists.txt platform-platform-2.1.0/CMakeLists.txt +--- platform-platform-2.1.0.orig/CMakeLists.txt 2016-10-24 09:56:25.000000000 +0000 ++++ platform-platform-2.1.0/CMakeLists.txt 2017-03-01 16:41:56.443161968 +0000 +@@ -81,5 +81,5 @@ + configure_file (p8-platform-config.cmake.in + p8-platform-config.cmake @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/p8-platform-config.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/p8-platform) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/p8-platform) + diff --git a/libraries/platform/platform.SlackBuild b/libraries/platform/platform.SlackBuild index 49d90b15fec3..a468ae87f751 100644 --- a/libraries/platform/platform.SlackBuild +++ b/libraries/platform/platform.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for platform -# Copyright 2015-2016 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2015-2017 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=platform -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.1.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,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" @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fix cmake install path. -patch -p1 < $CWD/platform-2.0.1-install.patch +patch -p1 < $CWD/platform-2.1.0-install.patch mkdir -p build cd build @@ -89,7 +89,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 README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/platform/platform.info b/libraries/platform/platform.info index c4f0651bd590..beb2da3b6c7c 100644 --- a/libraries/platform/platform.info +++ b/libraries/platform/platform.info @@ -1,8 +1,8 @@ PRGNAM="platform" -VERSION="2.0.1" +VERSION="2.1.0" HOMEPAGE="https://github.com/Pulse-Eight/platform" -DOWNLOAD="https://github.com/Pulse-Eight/platform/archive/platform-2.0.1/platform-platform-2.0.1.tar.gz" -MD5SUM="7a8df819828b657301d850eacf90d3d9" +DOWNLOAD="https://github.com/Pulse-Eight/platform/archive/platform-2.1.0/platform-platform-2.1.0.tar.gz" +MD5SUM="8bfdb42cdfdd39f8f3385ad801f73cb0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |