From bc706f4dcf7c11e5ae9035a4d2bab68a1e830df6 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 21:58:16 -0500 Subject: [PATCH] Get Ruby building on x86-64. --- dev-lang/ruby/patches/ruby-1.9.1.patchset | 29 ++++++++++++++++++++--- dev-lang/ruby/ruby-1.9.1.recipe | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dev-lang/ruby/patches/ruby-1.9.1.patchset b/dev-lang/ruby/patches/ruby-1.9.1.patchset index 9ae38e313..d382648d4 100644 --- a/dev-lang/ruby/patches/ruby-1.9.1.patchset +++ b/dev-lang/ruby/patches/ruby-1.9.1.patchset @@ -1,4 +1,4 @@ -From 8905e56a8092d502b54c26a753bb7920eae149ba Mon Sep 17 00:00:00 2001 +From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 19:00:01 -0700 Subject: applying patch ruby-1.9.1.patch @@ -470,7 +470,7 @@ index 5da1769..74072d2 100644 1.8.3.4 -From 623782bf181c3f15a276316c69839bf774fe8658 Mon Sep 17 00:00:00 2001 +From b5cf064c70f3212fb0a44dd4eaa4298e881b333f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 20:00:13 -0700 Subject: Use gcc for linking modules @@ -496,7 +496,7 @@ index 113d4e5..9bfbfb3 100644 1.8.3.4 -From cc3d90149f715a93b962b4eab1b186acae22c23c Mon Sep 17 00:00:00 2001 +From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 23:13:59 -0700 Subject: Add soname flags for libruby.so @@ -520,3 +520,26 @@ index 9bfbfb3..611b586 100644 -- 1.8.3.4 + +From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 +From: Rene Gollent +Date: Wed, 18 Dec 2013 21:52:24 -0500 +Subject: Add case for x86_64. + + +diff --git a/configure.in b/configure.in +index 611b586..01f0bb0 100644 +--- a/configure.in ++++ b/configure.in +@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then + : ${LDSHARED="ld -xms"} + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; +- i586*) ++ i586*|x86_64*) + : ${LDSHARED="${CC} -shared"} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" +-- +1.8.3.4 + diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe index aecdaede9..c2e2be6dd 100644 --- a/dev-lang/ruby/ruby-1.9.1.recipe +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -22,7 +22,7 @@ COPYRIGHT="1993-2009 Yukihiro Matsumoto" REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86 !x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" ruby = $portVersion compat >= 1.9