Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ruby/patches/08-ruby-dtrace-1.8.7.patch
branchs11-sru
changeset 2248 c2beb07524a9
parent 199 b87534be1a76 
--- a/components/ruby/patches/08-ruby-dtrace-1.8.7.patch	Thu Feb 23 11:02:30 2012 -0800
+++ b/components/ruby/patches/08-ruby-dtrace-1.8.7.patch	Tue Mar 06 10:46:23 2012 -0800
@@ -1,6 +1,6 @@
-diff -rupN ruby-1.8.7-p334.orig/common.mk ruby-1.8.7-p334/common.mk
---- ruby-1.8.7-p334.orig/common.mk	2011-04-12 15:28:51.099921336 -0700
-+++ ruby-1.8.7-p334/common.mk	2011-04-12 15:25:22.224376846 -0700
+diff -rupN ruby-1.8.7-p357.orig/common.mk ruby-1.8.7-p357/common.mk
+--- ruby-1.8.7-p357.orig/common.mk	2010-11-21 23:22:16.000000000 -0800
++++ ruby-1.8.7-p357/common.mk	2012-01-23 14:50:29.502736000 -0800
 @@ -55,6 +55,7 @@ OBJS	      = array.$(OBJEXT) \
  		string.$(OBJEXT) \
  		struct.$(OBJEXT) \
@@ -30,9 +30,9 @@
  	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
  	@$(RM) y.tab.c y.output
  clean-ext:
-diff -rupN ruby-1.8.7-p334.orig/configure.in ruby-1.8.7-p334/configure.in
---- ruby-1.8.7-p334.orig/configure.in	2011-04-12 15:28:51.101489810 -0700
-+++ ruby-1.8.7-p334/configure.in	2011-04-12 15:43:06.096160692 -0700
+diff -rupN ruby-1.8.7-p357.orig/configure.in ruby-1.8.7-p357/configure.in
+--- ruby-1.8.7-p357.orig/configure.in	2011-02-18 02:37:47.000000000 -0800
++++ ruby-1.8.7-p357/configure.in	2012-01-23 14:50:29.513537000 -0800
 @@ -524,6 +524,11 @@ AC_CHECK_HEADERS(stdlib.h string.h unist
  		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
  		 ucontext.h intrinsics.h time.h)
@@ -64,9 +64,18 @@
  AC_STRUCT_TIMEZONE
  AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
    [AC_TRY_COMPILE([#include <time.h>],
-diff -rupN ruby-1.8.7-p334.orig/dtrace.d ruby-1.8.7-p334/dtrace.d
---- ruby-1.8.7-p334.orig/dtrace.d	1969-12-31 16:00:00.000000000 -0800
-+++ ruby-1.8.7-p334/dtrace.d	2011-04-12 15:25:22.224285683 -0700
+@@ -1207,7 +1224,7 @@ if test "$with_dln_a_out" != yes; then
+ 	 		       LDFLAGS="$LDFLAGS -Wl,-E"
+ 			   fi
+ 			else
+-			   : ${LDSHARED='ld -G'}
++			   : ${LDSHARED='$(CC) -G'}
+ 			fi
+ 			rb_cv_dlopen=yes;;
+ 	sunos*) 	: ${LDSHARED='ld -assert nodefinitions'}
+diff -rupN ruby-1.8.7-p357.orig/dtrace.d ruby-1.8.7-p357/dtrace.d
+--- ruby-1.8.7-p357.orig/dtrace.d	1969-12-31 16:00:00.000000000 -0800
++++ ruby-1.8.7-p357/dtrace.d	2012-01-23 14:50:29.525158000 -0800
 @@ -0,0 +1,26 @@
 +/* -*- Mode: C -*- */
 +
@@ -94,9 +103,9 @@
 +#pragma D attributes Private/Private/Common provider ruby function
 +#pragma D attributes Evolving/Evolving/Common provider ruby name
 +#pragma D attributes Evolving/Evolving/Common provider ruby args
-diff -rupN ruby-1.8.7-p334.orig/dtrace.h ruby-1.8.7-p334/dtrace.h
---- ruby-1.8.7-p334.orig/dtrace.h	1969-12-31 16:00:00.000000000 -0800
-+++ ruby-1.8.7-p334/dtrace.h	2011-04-12 15:25:22.224323302 -0700
+diff -rupN ruby-1.8.7-p357.orig/dtrace.h ruby-1.8.7-p357/dtrace.h
+--- ruby-1.8.7-p357.orig/dtrace.h	1969-12-31 16:00:00.000000000 -0800
++++ ruby-1.8.7-p357/dtrace.h	2012-01-23 14:50:29.531660000 -0800
 @@ -0,0 +1,85 @@
 +/*
 + * Generated by dtrace(1M).
@@ -183,9 +192,9 @@
 +#endif
 +
 +#endif	/* _DTRACE_H */
-diff -rupN ruby-1.8.7-p334.orig/eval.c ruby-1.8.7-p334/eval.c
---- ruby-1.8.7-p334.orig/eval.c	2011-04-12 15:28:51.209420258 -0700
-+++ ruby-1.8.7-p334/eval.c	2011-04-12 15:25:22.224969993 -0700
+diff -rupN ruby-1.8.7-p357.orig/eval.c ruby-1.8.7-p357/eval.c
+--- ruby-1.8.7-p357.orig/eval.c	2011-05-22 21:49:40.000000000 -0700
++++ ruby-1.8.7-p357/eval.c	2012-01-23 14:50:29.548765000 -0800
 @@ -226,6 +226,10 @@ int _setjmp(), _longjmp();
  
  #include <sys/stat.h>
@@ -362,9 +371,9 @@
  	    if (event_hooks) {
  		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, ruby_current_node, recv, id, klass);
  	    }
-diff -rupN ruby-1.8.7-p334.orig/gc.c ruby-1.8.7-p334/gc.c
---- ruby-1.8.7-p334.orig/gc.c	2011-04-12 15:28:51.239680123 -0700
-+++ ruby-1.8.7-p334/gc.c	2011-04-12 15:25:22.225120360 -0700
+diff -rupN ruby-1.8.7-p357.orig/gc.c ruby-1.8.7-p357/gc.c
+--- ruby-1.8.7-p357.orig/gc.c	2009-12-24 00:28:08.000000000 -0800
++++ ruby-1.8.7-p357/gc.c	2012-01-23 14:50:29.562277000 -0800
 @@ -30,6 +30,11 @@
  #include <sys/resource.h>
  #endif
@@ -414,26 +423,26 @@
  }
  
  void
-diff -rupN ruby-1.8.7-p334.orig/inits.c ruby-1.8.7-p334/inits.c
---- ruby-1.8.7-p334.orig/inits.c	2011-04-12 15:28:51.287011653 -0700
-+++ ruby-1.8.7-p334/inits.c	2011-04-12 14:50:21.714050708 -0700
-@@ -46,6 +46,7 @@ void Init_Struct _((void));
- void Init_Time _((void));
+diff -rupN ruby-1.8.7-p357.orig/inits.c ruby-1.8.7-p357/inits.c
+--- ruby-1.8.7-p357.orig/inits.c	2011-12-28 04:47:15.000000000 -0800
++++ ruby-1.8.7-p357/inits.c	2012-01-23 14:50:29.571286000 -0800
+@@ -48,6 +48,7 @@ void Init_Time _((void));
  void Init_var_tables _((void));
  void Init_version _((void));
+ void Init_st _((void));
 +void Init_Tracer _((void));
  
  void
  rb_call_inits()
-@@ -83,4 +84,5 @@ rb_call_inits()
+@@ -87,4 +88,5 @@ rb_call_inits()
      Init_Enumerator();
      Init_marshal();
      Init_version();
 +    Init_Tracer();
  }
-diff -rupN ruby-1.8.7-p334.orig/Makefile.in ruby-1.8.7-p334/Makefile.in
---- ruby-1.8.7-p334.orig/Makefile.in	2011-04-12 15:27:29.001372251 -0700
-+++ ruby-1.8.7-p334/Makefile.in	2011-04-12 15:33:29.186318522 -0700
+diff -rupN ruby-1.8.7-p357.orig/Makefile.in ruby-1.8.7-p357/Makefile.in
+--- ruby-1.8.7-p357.orig/Makefile.in	2012-01-23 14:35:56.408791000 -0800
++++ ruby-1.8.7-p357/Makefile.in	2012-01-23 14:50:29.579192000 -0800
 @@ -88,6 +88,7 @@ ASFLAGS       = @ASFLAGS@
  
  OBJEXT        = @OBJEXT@
@@ -475,9 +484,9 @@
  update-rubyspec: 
  	if [ -d $(srcdir)/rubyspec ]; then \
  	  cd $(srcdir)/rubyspec/mspec; \
-diff -rupN ruby-1.8.7-p334.orig/object.c ruby-1.8.7-p334/object.c
---- ruby-1.8.7-p334.orig/object.c	2011-04-12 15:28:51.288940374 -0700
-+++ ruby-1.8.7-p334/object.c	2011-04-12 15:25:22.224228022 -0700
+diff -rupN ruby-1.8.7-p357.orig/object.c ruby-1.8.7-p357/object.c
+--- ruby-1.8.7-p357.orig/object.c	2009-12-13 19:53:19.000000000 -0800
++++ ruby-1.8.7-p357/object.c	2012-01-23 14:50:29.588706000 -0800
 @@ -20,6 +20,12 @@
  #include <ctype.h>
  #include <math.h>
@@ -517,9 +526,9 @@
      if (rb_obj_class(obj) != rb_class_real(klass)) {
  	rb_raise(rb_eTypeError, "wrong instance allocation");
      }
-diff -rupN ruby-1.8.7-p334.orig/tracer.c ruby-1.8.7-p334/tracer.c
---- ruby-1.8.7-p334.orig/tracer.c	1969-12-31 16:00:00.000000000 -0800
-+++ ruby-1.8.7-p334/tracer.c	2011-04-12 14:53:16.013377766 -0700
+diff -rupN ruby-1.8.7-p357.orig/tracer.c ruby-1.8.7-p357/tracer.c
+--- ruby-1.8.7-p357.orig/tracer.c	1969-12-31 16:00:00.000000000 -0800
++++ ruby-1.8.7-p357/tracer.c	2012-01-23 14:50:29.606242000 -0800
 @@ -0,0 +1,64 @@
 +#include "ruby.h"
 +
upstream/oracle/userland-gate