* [gentoo-commits] proj/ruby-scripts:master commit in: patchsets/patches-ee-1.8.7.2012.02/
@ 2012-03-03 8:16 Hans de Graaff
0 siblings, 0 replies; only message in thread
From: Hans de Graaff @ 2012-03-03 8:16 UTC (permalink / raw
To: gentoo-commits
commit: c8d353836a330dfa3d35a04b9175c9541e675e83
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sat Mar 3 08:16:35 2012 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 08:16:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-scripts.git;a=commit;h=c8d35383
Update patchset for 2012.02 release.
Drop mkconfig.rb patch since that is now upstreamed. Drop fastthreading patch
because that is no longer included or supported by upstream.
---
.../patches-ee-1.8.7.2012.02/001_memory_leak.patch | 59 ++++++++++++++++++++
.../003_mkmf-parallel-install.patch | 16 +++++
.../004_configure-libdir.patch | 13 ++++
.../005_mkconfig-libdir.patch | 15 +++++
.../007_no-undefined-ext.patch | 13 ++++
.../patches-ee-1.8.7.2012.02/008_berkdb-5.0.patch | 13 ++++
patchsets/patches-ee-1.8.7.2012.02/series | 6 ++
7 files changed, 135 insertions(+), 0 deletions(-)
diff --git a/patchsets/patches-ee-1.8.7.2012.02/001_memory_leak.patch b/patchsets/patches-ee-1.8.7.2012.02/001_memory_leak.patch
new file mode 100644
index 0000000..25853be
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/001_memory_leak.patch
@@ -0,0 +1,59 @@
+Index: source/ext/dl/handle.c
+===================================================================
+--- source.orig/ext/dl/handle.c
++++ source/ext/dl/handle.c
+@@ -10,9 +10,12 @@ VALUE rb_cDLHandle;
+ void
+ dlhandle_free(struct dl_handle *dlhandle)
+ {
++ if (!dlhandle)
++ return;
+ if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+ dlclose(dlhandle->ptr);
+ }
++ dlfree(dlhandle);
+ }
+
+ VALUE
+Index: source/ext/dl/ptr.c
+===================================================================
+--- source.orig/ext/dl/ptr.c
++++ source/ext/dl/ptr.c
+@@ -45,6 +45,8 @@ rb_dlmem_aref(void *ptr)
+ void
+ dlptr_free(struct ptr_data *data)
+ {
++ if (!data)
++ return;
+ if (data->ptr) {
+ DEBUG_CODE({
+ printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
+@@ -61,6 +63,7 @@ dlptr_free(struct ptr_data *data)
+ if (data->stype) dlfree(data->stype);
+ if (data->ssize) dlfree(data->ssize);
+ if (data->ids) dlfree(data->ids);
++ dlfree(data);
+ }
+
+ void
+Index: source/ext/dl/sym.c
+===================================================================
+--- source.orig/ext/dl/sym.c
++++ source/ext/dl/sym.c
+@@ -57,6 +57,8 @@ char2type(int ch)
+ void
+ dlsym_free(struct sym_data *data)
+ {
++ if(!data)
++ return;
+ if( data->name ){
+ DEBUG_CODE({
+ printf("dlsym_free(): free(data->name:%s)\n",data->name);
+@@ -69,6 +71,7 @@ dlsym_free(struct sym_data *data)
+ });
+ free(data->type);
+ }
++ dlfree(data);
+ }
+
+ VALUE
diff --git a/patchsets/patches-ee-1.8.7.2012.02/003_mkmf-parallel-install.patch b/patchsets/patches-ee-1.8.7.2012.02/003_mkmf-parallel-install.patch
new file mode 100644
index 0000000..41bf2bc
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/003_mkmf-parallel-install.patch
@@ -0,0 +1,16 @@
+ Patch for bug 239101 by Matsuu Takuto, via Redmine issue 1337 (yes, really).
+ Backported for 1.8.* by Alex Legler.
+
+Index: source/lib/mkmf.rb
+===================================================================
+--- source.orig/lib/mkmf.rb
++++ source/lib/mkmf.rb
+@@ -1523,7 +1523,7 @@ static: $(STATIC_LIB)#{$extout ? " inst
+ dest = "#{dir}/#{f}"
+ mfile.puts dir, "install-so: #{dest}"
+ unless $extout
+- mfile.print "#{dest}: #{f}\n"
++ mfile.print "#{dest}: #{dir} #{f}\n"
+ if (sep = config_string('BUILD_FILE_SEPARATOR'))
+ f.gsub!("/", sep)
+ dir.gsub!("/", sep)
diff --git a/patchsets/patches-ee-1.8.7.2012.02/004_configure-libdir.patch b/patchsets/patches-ee-1.8.7.2012.02/004_configure-libdir.patch
new file mode 100644
index 0000000..b7f17fa
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/004_configure-libdir.patch
@@ -0,0 +1,13 @@
+Index: source/configure.in
+===================================================================
+--- source.orig/configure.in
++++ source/configure.in
+@@ -1730,7 +1730,7 @@ case "$target_os" in
+ rubyw_install_name="$RUBYW_INSTALL_NAME"
+ ;;
+ esac
+-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
++RUBY_LIB_PREFIX=`eval echo \\"${libdir}/rubyee\\"`
+
+ AC_ARG_WITH(sitedir,
+ [ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
diff --git a/patchsets/patches-ee-1.8.7.2012.02/005_mkconfig-libdir.patch b/patchsets/patches-ee-1.8.7.2012.02/005_mkconfig-libdir.patch
new file mode 100644
index 0000000..932a4e3
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/005_mkconfig-libdir.patch
@@ -0,0 +1,15 @@
+Evil hack fiddling with the ruby libdir
+
+Index: source/mkconfig.rb
+===================================================================
+--- source.orig/mkconfig.rb
++++ source/mkconfig.rb
+@@ -141,7 +141,7 @@ print(*v_fast)
+ print(*v_others)
+ print <<EOS
+ CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
+- CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
++ CONFIG["rubylibdir"] = "$(libdir)/rubyee/$(ruby_version)"
+ CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+ CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+ CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
diff --git a/patchsets/patches-ee-1.8.7.2012.02/007_no-undefined-ext.patch b/patchsets/patches-ee-1.8.7.2012.02/007_no-undefined-ext.patch
new file mode 100644
index 0000000..a122561
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/007_no-undefined-ext.patch
@@ -0,0 +1,13 @@
+Index: source/configure.in
+===================================================================
+--- source.orig/configure.in
++++ source/configure.in
+@@ -1201,7 +1201,7 @@ if test "$with_dln_a_out" != yes; then
+ linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
+ : ${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"}
diff --git a/patchsets/patches-ee-1.8.7.2012.02/008_berkdb-5.0.patch b/patchsets/patches-ee-1.8.7.2012.02/008_berkdb-5.0.patch
new file mode 100644
index 0000000..096a1bf
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/008_berkdb-5.0.patch
@@ -0,0 +1,13 @@
+Index: ruby-1.8.7-p249/ext/dbm/extconf.rb
+===================================================================
+--- ruby-1.8.7-p249.orig/ext/dbm/extconf.rb
++++ ruby-1.8.7-p249/ext/dbm/extconf.rb
+@@ -26,7 +26,7 @@ def headers.db_check(db)
+ case db
+ when /^db2?$/
+ db_prefix = "__db_n"
+- hsearch = "-DDB_DBM_HSEARCH "
++ hsearch = "-DDB_DBM_HSEARCH -DHAVE_DBM "
+ when "gdbm"
+ have_gdbm = true
+ when "gdbm_compat"
diff --git a/patchsets/patches-ee-1.8.7.2012.02/series b/patchsets/patches-ee-1.8.7.2012.02/series
new file mode 100644
index 0000000..d0c12b4
--- /dev/null
+++ b/patchsets/patches-ee-1.8.7.2012.02/series
@@ -0,0 +1,6 @@
+001_memory_leak.patch
+003_mkmf-parallel-install.patch
+004_configure-libdir.patch
+005_mkconfig-libdir.patch
+007_no-undefined-ext.patch
+008_berkdb-5.0.patch
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-03 8:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-03 8:16 [gentoo-commits] proj/ruby-scripts:master commit in: patchsets/patches-ee-1.8.7.2012.02/ Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox