By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to allow building with ruby 1.9.1

tdebindings-ruby191.diff (text/plain), 7.38 KB, created by Darrell on 2012-09-29 18:42:55 CDT

(hide)

Description: Patch to allow building with ruby 1.9.1

Filename:

MIME Type:

Creator: Darrell

Created: 2012-09-29 18:42:55 CDT

Size: 7.38 KB

patch

obsolete

>diff -urN tdebindings/korundum/rubylib/korundum/configure.in.in tdebindings.new/korundum/rubylib/korundum/configure.in.in >--- tdebindings/korundum/rubylib/korundum/configure.in.in 2012-09-27 21:31:50.000000000 -0500 >+++ tdebindings.new/korundum/rubylib/korundum/configure.in.in 2012-09-29 17:45:06.000000000 -0500 >@@ -8,6 +8,7 @@ > DO_NOT_COMPILE="$DO_NOT_COMPILE korundum" > else > AC_MSG_CHECKING(for ruby dirs) >+ # Note: pkgconfig file exists only for ruby >= 1.9.3 > if test -n "$PKGCONFIG"; then > RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null` > if test -n "$RUBY_VERSION"; then >@@ -16,24 +17,51 @@ > RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` > RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` > 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 >+ RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'` >+ RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'` >+ RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'` >+ if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then >+ RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY" >+ fi >+ fi >+ 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"@:>@)'` >- RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'` >- RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'` >+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'` >+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'` >+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'` >+ RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'` >+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'` >+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'` >+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` > AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) > fi > fi > if test -z "$RUBY_VERSION"; then >- RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` >- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` >- RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` >- RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` >+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` >+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` >+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` >+ RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` >+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` >+ RUBY_INCLUDEDIR=$RUBY_ARCHDIR >+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` > fi >- AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, cflags $RUBY_CFLAGS]) >+ AC_MSG_RESULT([ >+ archdir $RUBY_ARCHDIR, >+ sitearchdir $RUBY_SITEARCHDIR, >+ sitedir $RUBY_SITEDIR, >+ rubylibdir $RUBY_RUBYLIBDIR, >+ libdir $RUBY_LIBDIR, >+ includedir $RUBY_INCLUDEDIR, >+ librubyarg $RUBY_LIBRUBYARG, >+ cflags $RUBY_CFLAGS]) > AC_SUBST(RUBY_ARCHDIR) > AC_SUBST(RUBY_SITEARCHDIR) > AC_SUBST(RUBY_RUBYLIBDIR) >+ AC_SUBST(RUBY_INCLUDEDIR) > AC_SUBST(RUBY_SITEDIR) > AC_SUBST(RUBY_CFLAGS) > fi >diff -urN tdebindings/qtruby/rubylib/qtruby/configure.in.in tdebindings.new/qtruby/rubylib/qtruby/configure.in.in >--- tdebindings/qtruby/rubylib/qtruby/configure.in.in 2012-09-27 21:31:50.000000000 -0500 >+++ tdebindings.new/qtruby/rubylib/qtruby/configure.in.in 2012-09-29 17:45:36.000000000 -0500 >@@ -16,12 +16,25 @@ > RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` > RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` > 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 >+ RUBY_MAJOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MAJOR']"@:>@)'` >+ RUBY_MINOR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['MINOR']"@:>@)'` >+ RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'` >+ if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then >+ RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY" >+ fi >+ fi >+ 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"@:>@)'` > RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'` > RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'` > RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'` >+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'` > RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` > AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) > fi >@@ -32,14 +45,24 @@ > RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` > RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` > RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` >+ RUBY_INCLUDEDIR=$RUBY_ARCHDIR > RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` > fi >- AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG, cflags $RUBY_CFLAGS]) >+ AC_MSG_RESULT([ >+ archdir $RUBY_ARCHDIR, >+ sitearchdir $RUBY_SITEARCHDIR, >+ sitedir $RUBY_SITEDIR, >+ rubylibdir $RUBY_RUBYLIBDIR, >+ libdir $RUBY_LIBDIR, >+ includedir $RUBY_INCLUDEDIR, >+ librubyarg $RUBY_LIBRUBYARG, >+ cflags $RUBY_CFLAGS]) > AC_SUBST(RUBY_ARCHDIR) > AC_SUBST(RUBY_SITEARCHDIR) > AC_SUBST(RUBY_SITEDIR) > AC_SUBST(RUBY_RUBYLIBDIR) > AC_SUBST(RUBY_LIBDIR) >+ AC_SUBST(RUBY_INCLUDEDIR) > AC_SUBST(RUBY_LIBRUBYARG) > AC_SUBST(RUBY_CFLAGS) > fi View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]