[csw-devel] SF.net SVN: gar:[11445] csw/mgar/pkg/ruby/trunk

[bdwalton at users.sourceforge.net]

Revision: 11445
          http://gar.svn.sourceforge.net/gar/?rev=11445&view=rev
Author:   bdwalton
Date:     2010-10-31 02:11:32 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
ruby: add patch to force proper SONAME in libruby.so.1

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-10-30 19:33:15 UTC (rev 11444)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-10-31 02:11:32 UTC (rev 11445)
@@ -85,6 +85,7 @@
 # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698
 PATCHFILES = rdoc_parse_order_fix.patch
 PATCHFILES += 0002-Correct-potential-segfault-caused-during-garbage-col.patch
+PATCHFILES += 0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-pthread

Added: csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch	                        (rev 0)
+++ csw/mgar/pkg/ruby/trunk/files/0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch	2010-10-31 02:11:32 UTC (rev 11445)
@@ -0,0 +1,28 @@
+From c426b27d2b6a35acafc157182c21f15ebcb97a69 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 31 Oct 2010 02:43:48 +0100
+Subject: [PATCH] Force ld to embed the proper SONAME for libruby
+
+Set LIBRUBY_DLDFLAGS in the solaris section of the configure script
+in order to force ld to pass the appropriate -h when building libruby.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index 0badcbd..5753333 100755
+--- a/configure
++++ b/configure
+@@ -10696,6 +10696,7 @@ if test "$enable_shared" = 'yes'; then
+ 	SOLIBS='$(LIBS)'
+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
++	LIBRUBY_DLDFLAGS="-h ${LIBRUBY_SO}"
+ 	if test "$GCC" = yes; then
+ 	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
+ 	fi
+-- 
+1.7.3
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.