summaryrefslogtreecommitdiffstats
path: root/redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch')
-rw-r--r--redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch b/redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch
new file mode 100644
index 000000000..85c496d10
--- /dev/null
+++ b/redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch
@@ -0,0 +1,34 @@
+commit 2f6e9c735fe8486ee3484c47c0e8ff999b699abc
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1347987185 -0500
+
+ Fall back to ruby-1.9 pkgconfig file if needed
+
+diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
+index e4ab2fd..924f42f 100644
+--- a/korundum/rubylib/korundum/configure.in.in
++++ b/korundum/rubylib/korundum/configure.in.in
+@@ -10,6 +10,9 @@ else
+ AC_MSG_CHECKING(for ruby dirs)
+ if test -n "$PKGCONFIG"; then
+ RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
++ if test -z "$RUBY_VERSION"; then
++ RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
++ fi
+ if test -n "$RUBY_VERSION"; then
+ RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
+diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
+index 7ad0e4d..e7f4f2c 100644
+--- a/qtruby/rubylib/qtruby/configure.in.in
++++ b/qtruby/rubylib/qtruby/configure.in.in
+@@ -10,6 +10,9 @@ else
+ AC_MSG_CHECKING(for ruby dirs)
+ if test -n "$PKGCONFIG"; then
+ RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
++ if test -z "$RUBY_VERSION"; then
++ RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
++ fi
+ if test -n "$RUBY_VERSION"; then
+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`