From 792dddb2cf73c01f2bf1b1fa1d27e4a198299b12253ff0a25ba21c404b2471c7 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 27 Aug 2008 14:58:00 +0000 Subject: [PATCH] - fix build errors. OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby:extensions/rubygem-eventmachine?expand=0&rev=3 --- eventmachine-0.12.0.gem | 4 +-- rubygem-eventmachine-0.12.0_fix_build.patch | 27 +++++++++++++++++++++ rubygem-eventmachine.changes | 5 ++++ rubygem-eventmachine.spec | 4 +++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 rubygem-eventmachine-0.12.0_fix_build.patch diff --git a/eventmachine-0.12.0.gem b/eventmachine-0.12.0.gem index 5ba9624..6d33e1e 100644 --- a/eventmachine-0.12.0.gem +++ b/eventmachine-0.12.0.gem @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84ba05b1d816b390a8787a662eef1f70d2f7e637ce955f1a693018d0b6fb491c -size 145408 +oid sha256:f5b461c24813142e657f5de7a1eba83134da3a06ac90f9912479d8498c1c7db2 +size 143360 diff --git a/rubygem-eventmachine-0.12.0_fix_build.patch b/rubygem-eventmachine-0.12.0_fix_build.patch new file mode 100644 index 0000000..c07b09b --- /dev/null +++ b/rubygem-eventmachine-0.12.0_fix_build.patch @@ -0,0 +1,27 @@ +Index: ext/extconf.rb +=================================================================== +--- ext/extconf.rb (revision 770) ++++ ext/extconf.rb (working copy) +@@ -142,7 +142,6 @@ + flags << "-DHAVE_TBR" + end + +- dir_config('ssl', "#{ENV['OPENSSL']}/include", ENV['OPENSSL']) + # Check for libcrypto twice, before and after ssl. That's because on some platforms + # and openssl versions, libssl will emit unresolved externals from crypto. It + # would be cleaner to simply check crypto first, but that doesn't always work in +@@ -159,14 +158,6 @@ + end + # on Unix we need a g++ link, not gcc. + CONFIG['LDSHARED'] = "$(CXX) -shared" +- +- # Modify the mkmf constant LINK_SO so the generated shared object is stripped. +- # You might think modifying CONFIG['LINK_SO'] would be a better way to do this, +- # but it doesn't work because mkmf doesn't look at CONFIG['LINK_SO'] again after +- # it initializes. +- linkso = Object.send :remove_const, "LINK_SO" +- LINK_SO = linkso + "; strip $@" +- + else + unless have_library('pthread') + exit diff --git a/rubygem-eventmachine.changes b/rubygem-eventmachine.changes index 4a41128..5a6fb2a 100644 --- a/rubygem-eventmachine.changes +++ b/rubygem-eventmachine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 27 16:56:41 CEST 2008 - mrueckert@suse.de + +- created patched gem file to fix build issues in extconf.rb + ------------------------------------------------------------------- Mon Aug 25 17:40:23 CEST 2008 - mrueckert@suse.de diff --git a/rubygem-eventmachine.spec b/rubygem-eventmachine.spec index 15e5bf5..ec0f700 100644 --- a/rubygem-eventmachine.spec +++ b/rubygem-eventmachine.spec @@ -28,6 +28,10 @@ Url: http://rubyeventmachine.com/ # http://rubyforge.org/projects/eventmachine Source: http://rubyforge.org/frs/download.php/37853/eventmachine-0.12.0.gem Source1: rubygem-eventmachine.rpmlintrc +# we use a modified gem to fix a few issues in the build: +# svn export http://rubyeventmachine.com/svn/tags/v0_12_0/ eventmachine-0.12.0 +# cd eventmachine-0.12.0 ; patch -p0 < ../rubygem-eventmachine-0.12.0_fix_build.patch ; rake gem ; cp pkg/eventmachine-0.12.0.gem .. +Source2: rubygem-eventmachine-0.12.0_fix_build.patch # Summary: Ruby/EventMachine socket engine library %description