diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-31 15:38:14 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-31 15:38:14 +0200 |
| commit | cdec7ede2cd93dedf437e5b10597433ea9d9eabe (patch) | |
| tree | 723b1f74f1d9d264363e9b535466dd461be8fef6 /redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch | |
| parent | 1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (diff) | |
| download | tde-packaging-cdec7ede2cd93dedf437e5b10597433ea9d9eabe.tar.gz tde-packaging-cdec7ede2cd93dedf437e5b10597433ea9d9eabe.zip | |
RPM Packaging: update 3.5.13.2 for openSUSE 13.1
Diffstat (limited to 'redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch')
| -rw-r--r-- | redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch new file mode 100644 index 000000000..67174598e --- /dev/null +++ b/redhat/tdebindings/tdebindings-3.5.13.2-fix_ruby2_detection.patch @@ -0,0 +1,30 @@ +--- ./qtruby/rubylib/qtruby/configure.in.in.ruby2 2013-08-24 15:44:24.933359206 +0200 ++++ ./qtruby/rubylib/qtruby/configure.in.in 2013-08-24 15:49:41.820696908 +0200 +@@ -21,6 +21,12 @@ + fi + fi + if test -z "$RUBY_VERSION"; then ++ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null` ++ if test -n "$RUBY_VERSION"; then ++ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags` ++ fi ++ fi ++ if test -z "$RUBY_VERSION"; then + # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h + if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then + # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1 +--- ./korundum/rubylib/korundum/configure.in.in.ruby2 2013-08-24 15:44:24.933359206 +0200 ++++ ./korundum/rubylib/korundum/configure.in.in 2013-08-24 15:50:46.666333349 +0200 +@@ -19,6 +19,12 @@ + if test -n "$RUBY_VERSION"; then + RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` + fi ++ fi ++ if test -z "$RUBY_VERSION"; then ++ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null` ++ if test -n "$RUBY_VERSION"; then ++ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags` ++ fi + fi + if test -z "$RUBY_VERSION"; then + # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h |