summaryrefslogtreecommitdiffstats
path: root/source/d/cmake
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2013-11-04 17:08:47 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:57:36 +0200
commit76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (patch)
tree9b98e6e193c7870cb27ac861394c1c4592850922 /source/d/cmake
parent9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff)
downloadcurrent-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.gz
current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.xz
Slackware 14.1slackware-14.1
Mon Nov 4 17:08:47 UTC 2013 Slackware 14.1 x86_64 stable is released! It's been another interesting release cycle here at Slackware bringing new features like support for UEFI machines, updated compilers and development tools, the switch from MySQL to MariaDB, and many more improvements throughout the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/d/cmake')
-rwxr-xr-xsource/d/cmake/cmake.SlackBuild6
-rw-r--r--source/d/cmake/cmake.findpkgconfig.3ea850.patch63
2 files changed, 2 insertions, 67 deletions
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index 3002e35b4..6150598ba 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
PKGNAM=cmake
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -58,8 +58,6 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
cd $PKGNAM-$VERSION
-zcat $CWD/cmake.findpkgconfig.3ea850.patch.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/d/cmake/cmake.findpkgconfig.3ea850.patch b/source/d/cmake/cmake.findpkgconfig.3ea850.patch
deleted file mode 100644
index a64e47a72..000000000
--- a/source/d/cmake/cmake.findpkgconfig.3ea850.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3ea850a5023060b84dcc0e6f0098c32c28b15807 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike@sf-mail.de>
-Date: Fri, 13 Apr 2012 08:50:49 +0200
-Subject: [PATCH] FindPkgConfig.cmake: fix documented output variable not set
- (#13125,#13132)
-
-The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
-An additional hint to really get this fixed came from Rex Dieter.
----
- Modules/FindPkgConfig.cmake | 8 ++++++--
- Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 3 +--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 5d93ab1..39d3a76 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -13,11 +13,10 @@
- # When the 'QUIET' argument is set, no status messages will be printed.
- #
- # It sets the following variables:
--# PKG_CONFIG_FOUND ... true if pkg-config works on the system
-+# PKG_CONFIG_FOUND ... if pkg-config executable was found
- # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
- # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
- # (since CMake 2.8.8)
--# PKG_CONFIG_FOUND ... if pkg-config executable was found
- #
- # For the following variables two sets of values exist; first one is the
- # common one and has the given PREFIX. The second set contains flags
-@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
- REQUIRED_VARS PKG_CONFIG_EXECUTABLE
- VERSION_VAR PKG_CONFIG_VERSION_STRING)
-
-+# This is needed because the module name is "PkgConfig" but the name of
-+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
-+# handled by FPHSA.
-+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
-+
- # Unsets the given variables
- macro(_pkgconfig_unset var)
- set(${var} "" CACHE INTERNAL "")
-diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
-index 6604208..fc65e58 100644
---- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
-+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
-@@ -71,7 +71,7 @@ endmacro(check_version_string)
- # reported.
-
- foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
-- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
-+ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
- check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
- endforeach(VTEST)
-
-@@ -82,4 +82,3 @@ endforeach(VTEST)
-
- check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
- check_version_string(SUBVERSION Subversion_VERSION_SVN)
--check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
---
-1.7.10
-