Author: dmacvicar Date: Thu Aug 9 12:02:21 2007 New Revision: 40121 URL: http://svn.opensuse.org/viewcvs/yast?rev=40121&view=rev Log: fix build on 64 bits. Use ruby vendorarch Added: trunk/ruby-bindings/cmake/modules/FindRuby.cmake Modified: trunk/ruby-bindings/CMakeLists.txt trunk/ruby-bindings/cmake/modules/FindYast.cmake trunk/ruby-bindings/src/ruby/CMakeLists.txt trunk/ruby-bindings/yast2-ruby-bindings.spec.in Modified: trunk/ruby-bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/CMakeLists.txt?rev=40121&r1=40120&r2=40121&view=diff ============================================================================== --- trunk/ruby-bindings/CMakeLists.txt (original) +++ trunk/ruby-bindings/CMakeLists.txt Thu Aug 9 12:02:21 2007 @@ -64,7 +64,7 @@ FIND_PACKAGE(Ruby REQUIRED) #RUBY_RUBY_LIB_PATH -MESSAGE( STATUS "Ruby arch dir: ${RUBY_ARCH_DIR}" ) +MESSAGE( STATUS "Ruby vendor arch dir: ${RUBY_VENDORARCH_DIR}" ) #################################################################### # RPM SPEC # Added: trunk/ruby-bindings/cmake/modules/FindRuby.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/cmake/modules/FindRuby.cmake?rev=40121&view=auto ============================================================================== --- trunk/ruby-bindings/cmake/modules/FindRuby.cmake (added) +++ trunk/ruby-bindings/cmake/modules/FindRuby.cmake Thu Aug 9 12:02:21 2007 @@ -0,0 +1,84 @@ +# - Find Ruby +# This module finds if Ruby is installed and determines where the include files +# and libraries are. It also determines what the name of the library is. This +# code sets the following variables: +# +# RUBY_INCLUDE_PATH = path to where ruby.h can be found +# RUBY_EXECUTABLE = full path to the ruby binary + +# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. +# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. + + +if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + # Already in cache, be silent + set(RUBY_FIND_QUIETLY TRUE) +endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + +# 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_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` +# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` + +FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ) + +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']" + OUTPUT_VARIABLE RUBY_ARCH_DIR) + +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']" + OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH) + +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']" + OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH) + +# site_ruby +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']" + OUTPUT_VARIABLE RUBY_SITEARCH_DIR) + +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']" + OUTPUT_VARIABLE RUBY_SITELIB_DIR) + + +# vendor_ruby +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print '-rvendor-specific'" + OUTPUT_VARIABLE RUBY_VENDOR_ARG) + +IF(RUBY_VENDOR_ARG) + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" + OUTPUT_VARIABLE RUBY_VENDORARCH_DIR) + + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']" + OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) +ELSE(RUBY_VENDOR_ARG) + # fall back to site*dir + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']" + OUTPUT_VARIABLE RUBY_VENDORARCH_DIR) + + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']" + OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) +ENDIF(RUBY_VENDOR_ARG) + +# this is not needed if you use "print" inside the ruby statements +# remove the new lines from the output by replacing them with empty strings +#STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}") +#STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}") +#STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}") + + +FIND_PATH(RUBY_INCLUDE_PATH + NAMES ruby.h + PATHS + ${RUBY_ARCH_DIR} + /usr/lib/ruby/1.8/i586-linux-gnu/ ) + +FIND_LIBRARY(RUBY_LIBRARY + NAMES ruby ruby1.8 + PATHS ${RUBY_POSSIBLE_LIB_PATH} + ) + +MARK_AS_ADVANCED( + RUBY_EXECUTABLE + RUBY_LIBRARY + RUBY_INCLUDE_PATH + ) Modified: trunk/ruby-bindings/cmake/modules/FindYast.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/cmake/modules/FindYast.cmake?rev=40121&r1=40120&r2=40121&view=diff ============================================================================== --- trunk/ruby-bindings/cmake/modules/FindYast.cmake (original) +++ trunk/ruby-bindings/cmake/modules/FindYast.cmake Thu Aug 9 12:02:21 2007 @@ -18,13 +18,13 @@ FIND_LIBRARY(YAST_LIBRARY NAMES y2 PATHS - /usr/lib + ${LIB_INSTALL_DIR} /usr/local/lib ) FIND_LIBRARY(YAST_YCP_LIBRARY NAMES ycp PATHS - /usr/lib + ${LIB_INSTALL_DIR} /usr/local/lib ) @@ -38,7 +38,7 @@ FIND_LIBRARY(YAST_PLUGIN_SCR_LIBRARY NAMES py2scr PATHS ${YAST_PLUGIN_DIR} - /usr/lib + ${LIB_INSTALL_DIR} /usr/local/lib ) @@ -50,4 +50,4 @@ MESSAGE( STATUS "YaST2 not found") endif(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) -MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY YAST_PLUGIN_WFM_LIBRARY) \ No newline at end of file +MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY YAST_PLUGIN_WFM_LIBRARY ${YAST_PLUGIN_DIR}) \ No newline at end of file Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeLists.txt?rev=40121&r1=40120&r2=40121&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Thu Aug 9 12:02:21 2007 @@ -39,7 +39,7 @@ TARGET_LINK_LIBRARIES( yast ${YAST_PLUGIN_WFM_LIBRARY} ) TARGET_LINK_LIBRARIES( yast ${YAST_PLUGIN_SCR_LIBRARY} ) TARGET_LINK_LIBRARIES( yast ${RUBY_LIBRARY} ) -INSTALL(TARGETS yast LIBRARY DESTINATION ${RUBY_ARCH_DIR} ) +INSTALL(TARGETS yast LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) ADD_LIBRARY( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_LIBRARY} ) Modified: trunk/ruby-bindings/yast2-ruby-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/yast2-ruby-bindings.spec.in?rev=40121&r1=40120&r2=40121&view=diff ============================================================================== --- trunk/ruby-bindings/yast2-ruby-bindings.spec.in (original) +++ trunk/ruby-bindings/yast2-ruby-bindings.spec.in Thu Aug 9 12:02:21 2007 @@ -14,10 +14,9 @@ Source0: yast2-ruby-bindings-%{version}.tar.bz2 prefix: /usr -#BuildRequires: cmake blocxx-devel curl-devel gcc-c++ libxcrypt-devel rpm-devel yast2-core-devel yast2-devtools libzypp-devel -BuildRequires: cmake blocxx-devel curl-devel gcc-c++ libxcrypt-devel rpm-devel yast2-core-devel yast2-devtools +BuildRequires: swig cmake gcc-c++ libxcrypt-devel yast2-core-devel yast2-devtools # libzypp-devel is missing .la requires -BuildRequires: boost-devel dbus-1-devel hal-devel ruby-devel +BuildRequires: ruby-devel Requires: yast2-core >= 2.13.28 Requires: ruby Summary: Ruby bindings for the YaST platform. @@ -54,8 +53,5 @@ %files %defattr (-, root, root) -#@YAST_PLUGIN_DIR@/libpy2lang_ruby.so.* -@YAST_PLUGIN_DIR@/libpy2lang_ruby.so -# libYCP goes elsewhere -#%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/yast.so -%{_libdir}/ruby/%{rb_ver}/%{rb_arch}/yast.so \ No newline at end of file +%{_libdir}/YaST2/plugin/libpy2lang_ruby.so +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/yast.so -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org