openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File build-sh.diff of Package klayout (Revision 6abc612090a7b8a1d576ffa761f47cc2)

Currently displaying revision 6abc612090a7b8a1d576ffa761f47cc2 , Show latest

# Some systems like RHEL/CentOS 6 have no static library but ruby_top_self in
# their .so library. Thus, we first check for the lib path and use it then to
# check whether the file returned by LIBRUBY_A actually exists.
#
# Some systems also provide "ruby-mri" (Matz Ruby interpreter) rather than
# just "ruby".
#
# -rbinc2 will not be present on some systems. There will rather be one, so 
# the consistency check for that directory will fail. It is removed.
#
# We also have to switch off the test run at the end of the script which is 
# incompatible with -dry-run.

--- build.sh.orig	2014-03-16 19:54:18.486765291 +0100
+++ build.sh	2014-03-16 20:13:26.012455569 +0100
@@ -184,8 +184,8 @@
 echo "Scanning installation .."
 echo ""
 
-# if not given, locate ruby interpreter (prefer 1.9, then default, finally 1.8 as fallback)
-for ruby in "ruby1.9" "ruby" "ruby1.8"; do
+# if not given, locate ruby interpreter 
+for ruby in "ruby2.0" "ruby1.9" "ruby" "ruby-mri" "ruby1.8"; do
   if [ "$RUBY" = "" ] && [ "`$ruby -v 2>/dev/null`" != "" ]; then 
     RUBY="$ruby" 
   fi
@@ -206,21 +206,19 @@
   echo "    Ruby version code is $RUBYVERSIONCODE"
 
   # Get ruby installation files
-  if [ "$RUBYLIBFILE" = "" ]; then
-    RUBYLIBFILENAME=`$RUBY -rrbconfig -e "puts (RbConfig::CONFIG['LIBRUBY_SO'] || '')"`
-    if [ "$RUBYLIBFILENAME" = "" ]; then
-      RUBYLIBFILENAME=`$RUBY -rrbconfig -e "puts (RbConfig::CONFIG['LIBRUBY_A'] || '')"`
+  RUBYLIBFILEPATH=`$RUBY -rrbconfig -e "puts (Config::CONFIG['libdir'] || '')"`
+  if [ "$RUBYLIBFILEPATH" = "" ]; then
+    echo "Could not get ruby library path"
+  else
+    RUBYLIBFILENAME=`$RUBY -rrbconfig -e "puts (Config::CONFIG['LIBRUBY_A'] || '')"`
+    if [ -z "$RUBYLIBFILENAME" -o ! -f "$RUBYLIBFILEPATH/$RUBYLIBFILENAME" ]; then
+      RUBYLIBFILENAME=`$RUBY -rrbconfig -e "puts (Config::CONFIG['LIBRUBY_SO'] || '')"`
     fi
     if [ "$RUBYLIBFILENAME" = "" ]; then
-      echo "*** WARNING: Could not get ruby library name"
+      echo "Could not get ruby library name"
     else
-      RUBYLIBFILEPATH=`$RUBY -rrbconfig -e "puts (RbConfig::CONFIG['libdir'] || '')"`
-      if [ "$RUBYLIBFILEPATH" = "" ]; then
-        echo "*** WARNING: Could not get ruby library path"
-      else
-        RUBYLIBFILE="$RUBYLIBFILEPATH/$RUBYLIBFILENAME"
-        echo "    Ruby library found: $RUBYLIBFILE"
-      fi
+      RUBYLIBFILE="$RUBYLIBFILEPATH/$RUBYLIBFILENAME"
+      echo "    Ruby library found: $RUBYLIBFILE"
     fi
   fi
 
@@ -307,10 +305,6 @@
     echo "*** ERROR: wrong -rbinc path: $RUBYINCLUDE/ruby.h does not exist or is not a file"
     exit 1
   fi
-  if [ "$RUBYINCLUDE2" != "" ] && [ ! -f "$RUBYINCLUDE2/ruby/config.h" ]; then
-    echo "*** ERROR: wrong -rbinc2 path: $RUBYINCLUDE2/ruby/config.h does not exist or is not a file"
-    exit 1
-  fi
   if [ ! -f "$RUBYLIBFILE" ]; then
     echo "*** ERROR: wrong -rblib path: $RUBYLIBFILE does not exist or not a file"
     exit 1
@@ -413,8 +407,8 @@
   echo "$QTLIB"
   
   LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH
-  $BIN/$EXEC_NAME -v
-  $BIN/$EXEC_NAME -h
+#  $BIN/$EXEC_NAME -v
+#  $BIN/$EXEC_NAME -h
 fi
 
 exit 0

Places

File build-sh.diff of Package klayout (Revision 6abc612090a7b8a1d576ffa761f47cc2)

Places