[103925] trunk/dports/lang/ruby

kimuraw at macports.org kimuraw at macports.org
Sat Mar 9 22:44:08 PST 2013


Revision: 103925
          https://trac.macports.org/changeset/103925
Author:   kimuraw at macports.org
Date:     2013-03-09 22:44:08 -0800 (Sat, 09 Mar 2013)
Log Message:
-----------
lang/ruby: fix post-configue error for +universal

Modified Paths:
--------------
    trunk/dports/lang/ruby/Portfile

Added Paths:
-----------
    trunk/dports/lang/ruby/files/patch-Makefile.in

Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile	2013-03-10 05:33:39 UTC (rev 103924)
+++ trunk/dports/lang/ruby/Portfile	2013-03-10 06:44:08 UTC (rev 103925)
@@ -53,6 +53,7 @@
 # c99: gperf generates code that doesn't work with clang (https://trac.macports.org/ticket/29974)
 # lib-drb-ssl.rb: 512bits rsa key is too small for openssl-1.0.1.
 #                 (http://bugs.ruby-lang.org/issues/6221)
+# Makefile.in: force libruby without suffix (backward compatibility)
 # --- clang support ----
 # numeric.c: fix wrong optimizaton of Numeric/Bignum build with clang.
 # configure: correct frame_address and stack_direction for +universal with clang.
@@ -63,6 +64,7 @@
 				patch-bug15528.diff \
 				patch-c99.diff \
 				patch-lib-drb-ssl.rb.diff \
+                patch-Makefile.in \
 				patch-numeric.c.diff \
 				patch-configure.diff \
 				patch-ext-tk-extconf.rb.diff
@@ -110,11 +112,6 @@
 # ignore minor version for archdir, like i686-darwin9
 configure.env	UNAME_RELEASE=${os.major}
 
-# force libruby without suffix (backward compatibility)
-post-configure {
-	reinplace "s|^RUBY_SO_NAME=.*|RUBY_SO_NAME=ruby|" ${worksrcpath}/Makefile
-}
-
 if {[variant_isset universal]} {
 	# NOTE: directory layout of port:ruby +universal
 	#   universal binary

Added: trunk/dports/lang/ruby/files/patch-Makefile.in
===================================================================
--- trunk/dports/lang/ruby/files/patch-Makefile.in	                        (rev 0)
+++ trunk/dports/lang/ruby/files/patch-Makefile.in	2013-03-10 06:44:08 UTC (rev 103925)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-12-02 21:23:34.000000000 +0900
++++ Makefile.in	2013-03-10 15:31:47.000000000 +0900
+@@ -52,7 +52,7 @@
+ MINIOBJS = @MINIOBJS@
+ 
+ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
+-RUBY_SO_NAME=@RUBY_SO_NAME@
++RUBY_SO_NAME=ruby
+ EXEEXT = @EXEEXT@
+ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
+ RUBY = $(RUBY_INSTALL_NAME)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130309/2e2f32a8/attachment.html>


More information about the macports-changes mailing list