Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13546

Modified Files:
        rubycocoa-rb.info rubycocoa-rb.patch 
Log Message:
fix build on 10.4

Index: rubycocoa-rb.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/rubycocoa-rb.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rubycocoa-rb.info   21 May 2008 21:06:20 -0000      1.6
+++ rubycocoa-rb.info   23 May 2008 20:24:00 -0000      1.7
@@ -1,15 +1,15 @@
 Info2: <<
 Package: rubycocoa-rb%type_pkg[ruby]
 Version: 0.13.2
-Revision: 1
+Revision: 2
 Type: ruby (1.8)
 Description: Ruby interface to Cocoa programming
 Distribution: 10.4, 10.5
 License: LGPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
-Depends: ruby%type_pkg[ruby]
-BuildDepends: ruby%type_pkg[ruby]-dev
+Depends: (%type_raw[ruby] = 1.8) ruby%type_pkg[ruby] (>= 1.8.6-p114-1), 
(%type_raw[ruby] != 1.8) ruby%type_pkg[ruby]
+BuildDepends: (%type_raw[ruby] = 1.8) ruby%type_pkg[ruby]-dev (>= 
1.8.6-p114-1), (%type_raw[ruby] != 1.8) ruby%type_pkg[ruby]-dev
 
 Source: mirror:sourceforge:rubycocoa/RubyCocoa-%v.tgz
 Source-MD5: bbafee2a544bc4b8869268af8c187a9a
@@ -22,15 +22,16 @@
 CompileScript: <<
 #!/bin/sh -ev
 
-       ruby%type_raw[ruby] install.rb config --build-universal=no 
--install-prefix="%i" --install-root="%d" --frameworks=%p/lib/Frameworks 
--xcode-extras="%p/share/doc/%N/XCode Extras" 
--examples="%p/share/doc/%N/Examples" 
--documentation="%p/share/doc/%N/Documentation"
-       ruby%type_raw[ruby] install.rb setup
+       %p/bin/ruby%type_raw[ruby] install.rb config --build-universal=no 
--install-prefix="%i" --install-root="%d" --frameworks=%p/lib/Frameworks 
--xcode-extras="%p/share/doc/%N/XCode Extras" 
--examples="%p/share/doc/%N/Examples" 
--documentation="%p/share/doc/%N/Documentation"
+       find . -name Makefile | xargs perl -pi -e 
's/-Wl,-undefined,dynamic_lookup//g'
+       %p/bin/ruby%type_raw[ruby] install.rb setup
 <<
 # Install Phase:
 InstallScript: <<
 #!/bin/sh -ev
 
        # install
-       ruby%type_raw[ruby] install.rb install
+       %p/bin/ruby%type_raw[ruby] install.rb install
 
        mv %i/lib/Frameworks/RubyCocoa.framework/Versions/A 
%i/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]
        rm -f %i/lib/Frameworks/RubyCocoa.framework/Versions/Current

Index: rubycocoa-rb.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/rubycocoa-rb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rubycocoa-rb.patch  21 May 2008 21:06:20 -0000      1.4
+++ rubycocoa-rb.patch  23 May 2008 20:24:00 -0000      1.5
@@ -27,3 +27,15 @@
  
  all: $(LIB)
  
+diff -Nurd RubyCocoa-0.13.2/misc/libffi/ltcf-c.sh 
RubyCocoa-0.13.2-new/misc/libffi/ltcf-c.sh
+--- RubyCocoa-0.13.2/misc/libffi/ltcf-c.sh     2008-02-14 03:38:13.000000000 
-0500
++++ RubyCocoa-0.13.2-new/misc/libffi/ltcf-c.sh 2008-05-22 12:29:47.000000000 
-0400
+@@ -389,7 +389,7 @@
+               allow_undefined_flag='-flat_namespace -undefined suppress'
+               ;;
+           10.*)
+-              allow_undefined_flag='-undefined dynamic_lookup'
++              allow_undefined_flag='-flat_namespace -undefined suppress'
+               ;;
+       esac
+     fi


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to