From ff7ae0fb7964ee57e526b59920849ad52d9fb9a6 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Tue, 8 Nov 2005 15:52:38 +0000
Subject: Make sure that there is always a space between "-o" and its argument
 when running gcc or ld.  This makes the package build on Darwin.

---
 lang/ruby18-base/distinfo         |  3 ++-
 lang/ruby18-base/patches/patch-ac | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 lang/ruby18-base/patches/patch-ac

(limited to 'lang/ruby18-base')

diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 6b32836ff99..618048efc23 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2005/11/02 08:56:39 taca Exp $
+$NetBSD: distinfo,v 1.8 2005/11/08 15:52:38 minskim Exp $
 
 SHA1 (ruby/ruby-1.8.3.tar.gz) = 407e70377214fcb812cdbb86a3e1b735e69b7cff
 RMD160 (ruby/ruby-1.8.3.tar.gz) = b4244a288d04fca29556144636b5e093b78a8cd5
 Size (ruby/ruby-1.8.3.tar.gz) = 4227276 bytes
 SHA1 (patch-aa) = fcd7a15ed5d89e534b6de3e1ecee38bb5bc89cfb
 SHA1 (patch-ab) = 0abdff0ce4e7a926ed5422b668f7a3574152bc69
+SHA1 (patch-ac) = a9c11048b1c7d712d08a6540014eeda3569ece3f
 SHA1 (patch-ad) = acbe8fc8491c2341a951b395359009aca1afeb2f
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
 SHA1 (patch-at) = 97a1240fef51c7266652788f855c9c69b2745b3a
diff --git a/lang/ruby18-base/patches/patch-ac b/lang/ruby18-base/patches/patch-ac
new file mode 100644
index 00000000000..e926e6f445c
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.3 2005/11/08 15:52:38 minskim Exp $
+
+--- Makefile.in.orig	2005-11-05 09:25:06.000000000 -0800
++++ Makefile.in
+@@ -92,11 +92,11 @@ all:
+ 
+ miniruby$(EXEEXT):
+ 		@$(RM) $@
+-		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(MAINLIBS)
++		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG) $@ $(LDFLAGS) $(MAINLIBS)
+ 
+ $(PROGRAM):
+ 		@$(RM) $@
+-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
++		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG) $@
+ 
+ # We must `rm' the library each time this rule is invoked because "updating" a
+ # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
+@@ -107,7 +107,7 @@ $(LIBRUBY_A):
+ 		@-$(RANLIB) $@ 2> /dev/null || true
+ 
+ $(LIBRUBY_SO):
+-		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
++		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG) $@
+ 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+ 						  File.symlink "$(LIBRUBY_SO)", link}' \
+ 				$(LIBRUBY_ALIASES) || true
-- 
cgit v1.2.3