From: Jan Rękorajski Date: Tue, 26 Aug 2014 20:07:03 +0000 (+0200) Subject: - added fix for ruby 2.x b/c of moved RUBY_CONFIG_INCLUDE_DIR X-Git-Tag: auto/th/cmake-2.8.12.2-2~2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=commitdiff_plain;h=a048aac345ef36ef6b1d5fab4bb64a38cc82daee - added fix for ruby 2.x b/c of moved RUBY_CONFIG_INCLUDE_DIR --- diff --git a/cmake-findruby2.patch b/cmake-findruby2.patch new file mode 100644 index 0000000..45eb55b --- /dev/null +++ b/cmake-findruby2.patch @@ -0,0 +1,10 @@ +--- cmake-2.8.12.2/Modules/FindRuby.cmake~ 2014-08-26 22:03:46.000000000 +0200 ++++ cmake-2.8.12.2/Modules/FindRuby.cmake 2014-08-26 22:05:53.115892137 +0200 +@@ -170,6 +170,7 @@ + find_path(RUBY_CONFIG_INCLUDE_DIR + NAMES ruby/config.h config.h + HINTS ++ ${RUBY_HDR_DIR} + ${RUBY_HDR_DIR}/${RUBY_ARCH} + ${RUBY_ARCH_DIR} + ) diff --git a/cmake.spec b/cmake.spec index af71371..39401db 100644 --- a/cmake.spec +++ b/cmake.spec @@ -23,6 +23,7 @@ Patch1: %{name}-helpers.patch Patch2: %{name}-findruby.patch Patch3: %{name}-tests.patch Patch4: %{name}-freetype2.patch +Patch5: %{name}-findruby2.patch URL: http://www.cmake.org/ %{?with_gui:BuildRequires: QtGui-devel} BuildRequires: libarchive-devel @@ -102,6 +103,7 @@ Bashowe dopełnianie parametrów dla cmake'a. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cat > "init.cmake" <