diff options
| author |   Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2010-05-19 00:47:47 +0200 |
|---|---|---|
| committer | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2010-05-19 00:47:47 +0200 |
| commit | 03273586effef1509aa3587748e224520d9d7534 (patch) | |
| tree | 834684a8208197b24cb5914c72a4b63a8335b921 | |
| parent | Refresh patches with quilt for consistency. (diff) | |
| download | ruby-scripts-03273586effef1509aa3587748e224520d9d7534.tar.gz ruby-scripts-03273586effef1509aa3587748e224520d9d7534.tar.bz2 ruby-scripts-03273586effef1509aa3587748e224520d9d7534.zip | |
Backport patches for --no-undefined and BerkDB 5.0 from MRI 1.8.7 patchset.
| -rw-r--r-- | patchsets/patches-ee-1.8.7.2010.01/007_no-undefined-ext.patch | 13 | ||||
| -rw-r--r-- | patchsets/patches-ee-1.8.7.2010.01/008_berkdb-5.0.patch | 13 | ||||
| -rw-r--r-- | patchsets/patches-ee-1.8.7.2010.01/series | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/patchsets/patches-ee-1.8.7.2010.01/007_no-undefined-ext.patch b/patchsets/patches-ee-1.8.7.2010.01/007_no-undefined-ext.patch new file mode 100644 index 0000000..a122561 --- /dev/null +++ b/patchsets/patches-ee-1.8.7.2010.01/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.2010.01/008_berkdb-5.0.patch b/patchsets/patches-ee-1.8.7.2010.01/008_berkdb-5.0.patch new file mode 100644 index 0000000..096a1bf --- /dev/null +++ b/patchsets/patches-ee-1.8.7.2010.01/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.2010.01/series b/patchsets/patches-ee-1.8.7.2010.01/series index 147a968..02e2ce4 100644 --- a/patchsets/patches-ee-1.8.7.2010.01/series +++ b/patchsets/patches-ee-1.8.7.2010.01/series @@ -4,3 +4,5 @@ 004_configure-libdir.patch 005_mkconfig-libdir.patch 006_pathname_warning.patch +007_no-undefined-ext.patch +008_berkdb-5.0.patch |