From 75f253fef0565e181dd2328522ae964e5e0fe450 Mon Sep 17 00:00:00 2001
From: Mike Fiore <mfiore@multitech.com>
Date: Wed, 10 Apr 2013 11:34:03 -0500
Subject: ruby-1.9.3: cleaned up recipe, renamed patch files for consistency

---
 ...onf-hardcode-wide-getaddr-info-test-outco.patch | 26 ----------------------
 multitech/recipes/ruby/ruby/Makefile.in.patch      | 11 ---------
 .../recipes/ruby/ruby/ruby-1.9.3-Makefile-in.patch | 11 +++++++++
 ...f-hardcode-wide-getaddr-info-test-outcome.patch | 26 ++++++++++++++++++++++
 multitech/recipes/ruby/ruby_1.9.3-p392.bb          |  4 ++--
 5 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 multitech/recipes/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
 delete mode 100644 multitech/recipes/ruby/ruby/Makefile.in.patch
 create mode 100644 multitech/recipes/ruby/ruby/ruby-1.9.3-Makefile-in.patch
 create mode 100644 multitech/recipes/ruby/ruby/ruby-1.9.3-socket-extconf-hardcode-wide-getaddr-info-test-outcome.patch

diff --git a/multitech/recipes/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch b/multitech/recipes/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
deleted file mode 100644
index 712602a..0000000
--- a/multitech/recipes/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9341293e71c03fe606edc9157bf1e13e3dd5b507 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Fri, 17 Dec 2010 11:35:38 +0100
-Subject: [PATCH] socket extconf: hardcode wide-getaddr info test outcome to true
-
-Without this the socket extension doesn't build correctly
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- ext/socket/extconf.rb |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/ext/socket/extconf.rb
-+++ b/ext/socket/extconf.rb
-@@ -356,6 +356,11 @@
-   exit(EXIT_FAILURE);
- }
- EOF
-+
-+# Ignore the actual result of the above test and assume that
-+# everything is OK.
-+getaddr_info_ok = true
-+
- if ipv6 and not getaddr_info_ok
-   abort <<EOS
- 
diff --git a/multitech/recipes/ruby/ruby/Makefile.in.patch b/multitech/recipes/ruby/ruby/Makefile.in.patch
deleted file mode 100644
index deb0a33..0000000
--- a/multitech/recipes/ruby/ruby/Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig	2013-03-11 14:25:21.000000000 +0100
-+++ b/Makefile.in	2013-03-11 14:25:37.000000000 +0100
-@@ -63,7 +63,7 @@
- LIBS = @LIBS@ $(EXTLIBS)
- MISSING = @LIBOBJS@ @ALLOCA@
- LDSHARED = @LIBRUBY_LDSHARED@
--DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
-+DLDFLAGS = @LIBRUBY_DLDFLAGS@,--hash-style=gnu $(EXTLDFLAGS) $(ARCH_FLAG)
- SOLIBS = @SOLIBS@
- MAINLIBS = @MAINLIBS@
- ARCHMINIOBJS = @MINIOBJS@
diff --git a/multitech/recipes/ruby/ruby/ruby-1.9.3-Makefile-in.patch b/multitech/recipes/ruby/ruby/ruby-1.9.3-Makefile-in.patch
new file mode 100644
index 0000000..deb0a33
--- /dev/null
+++ b/multitech/recipes/ruby/ruby/ruby-1.9.3-Makefile-in.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in.orig	2013-03-11 14:25:21.000000000 +0100
++++ b/Makefile.in	2013-03-11 14:25:37.000000000 +0100
+@@ -63,7 +63,7 @@
+ LIBS = @LIBS@ $(EXTLIBS)
+ MISSING = @LIBOBJS@ @ALLOCA@
+ LDSHARED = @LIBRUBY_LDSHARED@
+-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
++DLDFLAGS = @LIBRUBY_DLDFLAGS@,--hash-style=gnu $(EXTLDFLAGS) $(ARCH_FLAG)
+ SOLIBS = @SOLIBS@
+ MAINLIBS = @MAINLIBS@
+ ARCHMINIOBJS = @MINIOBJS@
diff --git a/multitech/recipes/ruby/ruby/ruby-1.9.3-socket-extconf-hardcode-wide-getaddr-info-test-outcome.patch b/multitech/recipes/ruby/ruby/ruby-1.9.3-socket-extconf-hardcode-wide-getaddr-info-test-outcome.patch
new file mode 100644
index 0000000..712602a
--- /dev/null
+++ b/multitech/recipes/ruby/ruby/ruby-1.9.3-socket-extconf-hardcode-wide-getaddr-info-test-outcome.patch
@@ -0,0 +1,26 @@
+From 9341293e71c03fe606edc9157bf1e13e3dd5b507 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 17 Dec 2010 11:35:38 +0100
+Subject: [PATCH] socket extconf: hardcode wide-getaddr info test outcome to true
+
+Without this the socket extension doesn't build correctly
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ ext/socket/extconf.rb |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/ext/socket/extconf.rb
++++ b/ext/socket/extconf.rb
+@@ -356,6 +356,11 @@
+   exit(EXIT_FAILURE);
+ }
+ EOF
++
++# Ignore the actual result of the above test and assume that
++# everything is OK.
++getaddr_info_ok = true
++
+ if ipv6 and not getaddr_info_ok
+   abort <<EOS
+ 
diff --git a/multitech/recipes/ruby/ruby_1.9.3-p392.bb b/multitech/recipes/ruby/ruby_1.9.3-p392.bb
index 49e60ef..4d3f3f1 100644
--- a/multitech/recipes/ruby/ruby_1.9.3-p392.bb
+++ b/multitech/recipes/ruby/ruby_1.9.3-p392.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0"
 DEPENDS += "libyaml"
 
 SRC_URI += "\
-  file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch \
+  file://ruby-1.9.3-socket-extconf-hardcode-wide-getaddr-info-test-outcome.patch \
   file://ruby-1.9.3-always-use-i386.patch \
   file://ruby-1.9.3-disable-versioned-paths.patch \
   file://ruby-1.9.3-fix-s390x-build.patch \
@@ -14,7 +14,7 @@ SRC_URI += "\
   file://rubygems-1.8.11-binary-extensions.patch \
   file://ruby-1.9.3-mkmf-verbose.patch \
   file://ruby-1.9.3-install-cross.patch \
-  file://Makefile.in.patch"
+  file://ruby-1.9.3-Makefile-in.patch"
 
 SRC_URI[md5sum] = "f689a7b61379f83cbbed3c7077d83859"
 SRC_URI[sha256sum] = "8861ddadb2cd30fb30e42122741130d12f6543c3d62d05906cd41076db70975f"
-- 
cgit v1.2.3