forked from pool/cmake
Accepting request 121061 from devel:tools:building
- vendor-specific does no longer exist with ruby 1.9, so don't use it to check vendor support OBS-URL: https://build.opensuse.org/request/show/121061 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=56
This commit is contained in:
commit
39436d065c
13
cmake-fix-ruby-test.patch
Normal file
13
cmake-fix-ruby-test.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: cmake-2.8.8/Modules/FindRuby.cmake
|
||||||
|
===================================================================
|
||||||
|
--- cmake-2.8.8.orig/Modules/FindRuby.cmake 2012-04-18 20:10:54.000000000 +0200
|
||||||
|
+++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-14 15:42:52.137253084 +0200
|
||||||
|
@@ -93,7 +93,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||||||
|
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
||||||
|
|
||||||
|
# vendor_ruby available ?
|
||||||
|
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||||
|
+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?"
|
||||||
|
OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||||
|
|
||||||
|
IF(RUBY_HAS_VENDOR_RUBY)
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 14 13:43:06 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
- vendor-specific does no longer exist with ruby 1.9, so don't use
|
||||||
|
it to check vendor support
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 24 15:11:45 UTC 2012 - idonmez@suse.com
|
Tue Apr 24 15:11:45 UTC 2012 - idonmez@suse.com
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@ Url: http://www.cmake.org/
|
|||||||
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
|
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
|
||||||
Patch1: cmake-disable-builtin-chrpath.diff
|
Patch1: cmake-disable-builtin-chrpath.diff
|
||||||
Patch2: cmake-pkgconfig.patch
|
Patch2: cmake-pkgconfig.patch
|
||||||
|
Patch3: cmake-fix-ruby-test.patch
|
||||||
Summary: Cross-platform, open-source make system
|
Summary: Cross-platform, open-source make system
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
@ -52,6 +53,7 @@ CMake is a cross-platform, open-source make system
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1
|
%patch1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
Loading…
Reference in New Issue
Block a user