From 7c5e7d796585cb9b5de36dfb9fcce0d096bf6800 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 18 May 2010 06:18:03 +0000 Subject: [PATCH] Update the ruby-1.9.1 patch to remove libbe from the default link libraries --- dev-lang/ruby/patches/ruby-1.9.1.patch | 46 ++++++++++++++------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dev-lang/ruby/patches/ruby-1.9.1.patch b/dev-lang/ruby/patches/ruby-1.9.1.patch index 91ea08562..b47775105 100644 --- a/dev-lang/ruby/patches/ruby-1.9.1.patch +++ b/dev-lang/ruby/patches/ruby-1.9.1.patch @@ -1,19 +1,23 @@ -diff -up ruby-1.9.1-p243/ChangeLog.orig ruby-1.9.1-p243/ChangeLog diff -up ruby-1.9.1-p243/configure.in.orig ruby-1.9.1-p243/configure.in ---- ruby-1.9.1-p243/configure.in.orig 2009-05-11 09:06:48.039321600 -0600 -+++ ruby-1.9.1-p243/configure.in 2010-04-18 22:19:16.236716032 -0600 -@@ -1466,7 +1466,7 @@ if test "$with_dln_a_out" != yes; then +--- ruby-1.9.1-p243/configure.in.orig 2009-05-11 09:06:48.052428800 -0600 ++++ ruby-1.9.1-p243/configure.in 2010-05-17 23:53:26.615514112 -0600 +@@ -1462,11 +1462,11 @@ if test "$with_dln_a_out" != yes; then + haiku*) case "$target_cpu" in + powerpc*) + : ${LDSHARED="ld -xms"} +- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' ++ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' ;; i586*) : ${LDSHARED="ld -shared"} - DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" -+ DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot -L/boot/common/lib" ++ DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lroot -L/boot/common/lib" ;; esac : ${LIBPATHENV=LIBRARY_PATH} diff -up ruby-1.9.1-p243/signal.c.orig ruby-1.9.1-p243/signal.c ---- ruby-1.9.1-p243/signal.c.orig 2009-02-22 02:48:12.003932160 -0700 -+++ ruby-1.9.1-p243/signal.c 2010-04-18 22:19:16.291766272 -0600 +--- ruby-1.9.1-p243/signal.c.orig 2009-02-22 02:48:12.016777216 -0700 ++++ ruby-1.9.1-p243/signal.c 2010-05-17 23:44:05.636223488 -0600 @@ -34,7 +34,7 @@ typedef int rb_atomic_t; # define ATOMIC_DEC(var) (--(var)) #endif @@ -33,8 +37,8 @@ diff -up ruby-1.9.1-p243/signal.c.orig ruby-1.9.1-p243/signal.c NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); rb_thread_t *th = GET_THREAD(); diff -up ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h.orig ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h ---- ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h.orig 2008-11-11 01:41:20.044564480 -0700 -+++ ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h 2010-04-18 22:19:16.276037632 -0600 +--- ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h.orig 2008-11-11 01:41:20.057671680 -0700 ++++ ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h 2010-05-17 23:44:05.639631360 -0600 @@ -164,6 +164,11 @@ void setbinmode(FILE *fp) # ifndef HAVE_LOCALE_H # define HAVE_LOCALE_H @@ -48,8 +52,8 @@ diff -up ruby-1.9.1-p243/ext/nkf/nkf-utf8/nkf.h.orig ruby-1.9.1-p243/ext/nkf/nkf # ifndef HAVE_LANGINFO_H # define HAVE_LANGINFO_H diff -up ruby-1.9.1-p243/ext/openssl/ossl.c.orig ruby-1.9.1-p243/ext/openssl/ossl.c ---- ruby-1.9.1-p243/ext/openssl/ossl.c.orig 2009-01-15 08:39:30.047448064 -0700 -+++ ruby-1.9.1-p243/ext/openssl/ossl.c 2010-04-18 22:57:15.778305536 -0600 +--- ruby-1.9.1-p243/ext/openssl/ossl.c.orig 2009-01-15 08:39:30.060293120 -0700 ++++ ruby-1.9.1-p243/ext/openssl/ossl.c 2010-05-17 23:44:05.643301376 -0600 @@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) #define OSSL_IMPL_SK2ARY(name, type) \ @@ -78,8 +82,8 @@ diff -up ruby-1.9.1-p243/ext/openssl/ossl.c.orig ruby-1.9.1-p243/ext/openssl/oss } \ return ary; \ diff -up ruby-1.9.1-p243/ext/openssl/ossl.h.orig ruby-1.9.1-p243/ext/openssl/ossl.h ---- ruby-1.9.1-p243/ext/openssl/ossl.h.orig 2008-09-25 21:05:47.047448064 -0600 -+++ ruby-1.9.1-p243/ext/openssl/ossl.h 2010-04-18 22:57:15.803471360 -0600 +--- ruby-1.9.1-p243/ext/openssl/ossl.h.orig 2008-09-25 21:05:47.060293120 -0600 ++++ ruby-1.9.1-p243/ext/openssl/ossl.h 2010-05-17 23:44:05.645398528 -0600 @@ -104,6 +104,13 @@ extern VALUE eOSSLError; } while (0) @@ -95,8 +99,8 @@ diff -up ruby-1.9.1-p243/ext/openssl/ossl.h.orig ruby-1.9.1-p243/ext/openssl/oss */ int string2hex(const unsigned char *, int, char **, int *); diff -up ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c.orig ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c ---- ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c.orig 2008-07-22 09:34:23.050069504 -0600 -+++ ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c 2010-04-18 22:57:15.864550912 -0600 +--- ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c.orig 2008-07-22 09:34:23.062914560 -0600 ++++ ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c 2010-05-17 23:44:05.650117120 -0600 @@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, V return self; } @@ -191,8 +195,8 @@ diff -up ruby-1.9.1-p243/ext/openssl/ossl_pkcs7.c.orig ruby-1.9.1-p243/ext/opens static VALUE diff -up ruby-1.9.1-p243/ext/openssl/ossl_ssl.c.orig ruby-1.9.1-p243/ext/openssl/ossl_ssl.c ---- ruby-1.9.1-p243/ext/openssl/ossl_ssl.c.orig 2009-04-19 07:32:18.051118080 -0600 -+++ ruby-1.9.1-p243/ext/openssl/ossl_ssl.c 2010-04-18 22:57:15.747634688 -0600 +--- ruby-1.9.1-p243/ext/openssl/ossl_ssl.c.orig 2009-04-19 07:32:18.064225280 -0600 ++++ ruby-1.9.1-p243/ext/openssl/ossl_ssl.c 2010-05-17 23:44:05.653262848 -0600 @@ -1195,10 +1195,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self) } chain = SSL_get_peer_cert_chain(ssl); @@ -207,8 +211,8 @@ diff -up ruby-1.9.1-p243/ext/openssl/ossl_ssl.c.orig ruby-1.9.1-p243/ext/openssl } diff -up ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c.orig ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c ---- ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c.orig 2008-08-28 21:19:15.051904512 -0600 -+++ ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c 2010-04-18 22:57:15.719585280 -0600 +--- ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c.orig 2008-08-28 21:19:15.064749568 -0600 ++++ ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c 2010-05-17 23:44:05.662700032 -0600 @@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self) ossl_str_adjust(str, p); } @@ -222,8 +226,8 @@ diff -up ruby-1.9.1-p243/ext/openssl/ossl_x509attr.c.orig ruby-1.9.1-p243/ext/op p = (unsigned char *)RSTRING_PTR(str); i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, diff -up ruby-1.9.1-p243/ext/openssl/ossl_x509crl.c.orig ruby-1.9.1-p243/ext/openssl/ossl_x509crl.c ---- ruby-1.9.1-p243/ext/openssl/ossl_x509crl.c.orig 2008-07-22 09:34:23.052166656 -0600 -+++ ruby-1.9.1-p243/ext/openssl/ossl_x509crl.c 2010-04-18 22:57:15.824180736 -0600 +--- ruby-1.9.1-p243/ext/openssl/ossl_x509crl.c.orig 2008-07-22 09:34:23.065011712 -0600 ++++ ruby-1.9.1-p243/ext/openssl/ossl_x509crl.c 2010-05-17 23:44:05.666632192 -0600 @@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self) VALUE ary, revoked;