[gentoo-commits] gentoo-x86 commit in dev-lang/ruby/files: ruby-1.9.1_p129-parallelmake.patch ruby-1.9.1_p129-gfbsd7.patch ruby-1.9.1_p129-no-undefined-ext.patch

[gentoo-commits] gentoo-x86 commit in dev-lang/ruby/files: ruby-1.9.1_p129-parallelmake.patch ruby-1.9.1_p129-gfbsd7.patch ruby-1.9.1_p129-no-undefined-ext.patch

[Diego Petteno (flameeyes)]

flameeyes    09/05/27 16:40:13

  Added:                ruby-1.9.1_p129-parallelmake.patch
                        ruby-1.9.1_p129-gfbsd7.patch
                        ruby-1.9.1_p129-no-undefined-ext.patch
  Log:
  Revision bump, add patches 1) to make Ruby behave more similarly between Linux and (Gentoo/)FreeBSD; 2) to force --no-undefined when building Ruby extensions (undefined symbols in them will cause abort at runtime 3) to remove a concurrency issue when building the dl extension that could result in a broken dl.so.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-lang/ruby/files/ruby-1.9.1_p129-parallelmake.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby-1.9.1_p129-parallelmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby-1.9.1_p129-parallelmake.patch?rev=1.1&content-type=text/plain

Index: ruby-1.9.1_p129-parallelmake.patch
===================================================================
Index: ruby-1.9.1-p129/ext/dl/depend
===================================================================
--- ruby-1.9.1-p129.orig/ext/dl/depend
+++ ruby-1.9.1-p129/ext/dl/depend
@@ -18,7 +18,8 @@ callback-8.o: callback-8.c $(hdrdir)/rub
 
 callback-0.c callback-1.c callback-2.c \
 callback-3.c callback-4.c callback-5.c \
-callback-6.c callback-7.c callback-8.c \
+callback-6.c callback-7.c callback-8.c: callback.h
+
 callback.h: $(srcdir)/mkcallback.rb dl.h
 	@echo "generating callback.h"
 	@$(RUBY) $(srcdir)/mkcallback.rb $(srcdir)/dl.h 



1.1                  dev-lang/ruby/files/ruby-1.9.1_p129-gfbsd7.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby-1.9.1_p129-gfbsd7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby-1.9.1_p129-gfbsd7.patch?rev=1.1&content-type=text/plain

Index: ruby-1.9.1_p129-gfbsd7.patch
===================================================================
Index: ruby-1.9.1-p129/configure.in
===================================================================
--- ruby-1.9.1-p129.orig/configure.in
+++ ruby-1.9.1-p129/configure.in
@@ -1294,7 +1294,7 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
+linux* | gnu* | k*bsd*-gnu | bsdi* | freebsd* | dragonfly* )
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
@@ -1381,7 +1381,7 @@ if test "$with_dln_a_out" != yes; then
 			*shlicc*)	: ${LDSHARED="$CC -r"}
 					rb_cv_dlopen=yes ;;
 			esac ;;
-	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
+	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | freebsd7*)
 			: ${LDSHARED='${CC} -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@@ -1393,7 +1393,6 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes ;;
 	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
 			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -rdynamic"
 			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
 			else
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
@@ -1722,7 +1721,7 @@ if test "$enable_shared" = 'yes'; then
     sunos4*)
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-    linux* | gnu* | k*bsd*-gnu | atheos*)
+    linux* | gnu* | k*bsd*-gnu | atheos* | freebsd7* )
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;



1.1                  dev-lang/ruby/files/ruby-1.9.1_p129-no-undefined-ext.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby-1.9.1_p129-no-undefined-ext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/files/ruby-1.9.1_p129-no-undefined-ext.patch?rev=1.1&content-type=text/plain

Index: ruby-1.9.1_p129-no-undefined-ext.patch
===================================================================
Index: ruby-1.9.1-p129/configure.in
===================================================================
--- ruby-1.9.1-p129.orig/configure.in
+++ ruby-1.9.1-p129/configure.in
@@ -1384,7 +1384,7 @@ if test "$with_dln_a_out" != yes; then
 	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | freebsd7*)
 			: ${LDSHARED='${CC} -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined"
 			fi
 			rb_cv_dlopen=yes ;;
 	interix*) 	: ${LDSHARED="$CC -shared"}