summaryrefslogtreecommitdiff
path: root/lang/ruby18/files
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2004-07-13 07:03:54 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2004-07-13 07:03:54 +0000
commit4e8d069e3f7458c644fc0beb54cf1c58698ec8e8 (patch)
tree5f0f2509df132a463efded44e8ac1e98ee95ec7a /lang/ruby18/files
parentRevert r1.192 that was committed by accident (diff)
Pull in the latest change to mkmf.rb to avoid build error when
devel/readline is installed.
Notes
Notes: svn path=/head/; revision=113532
Diffstat (limited to 'lang/ruby18/files')
-rw-r--r--lang/ruby18/files/patch-mkmf.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/lang/ruby18/files/patch-mkmf.rb b/lang/ruby18/files/patch-mkmf.rb
new file mode 100644
index 000000000000..fcb200f6b9e3
--- /dev/null
+++ b/lang/ruby18/files/patch-mkmf.rb
@@ -0,0 +1,21 @@
+--- lib/mkmf.rb.orig Fri Apr 23 23:25:28 2004
++++ lib/mkmf.rb Tue Jul 13 15:57:40 2004
+@@ -670,7 +670,7 @@
+ ldirs.concat(defaults.collect {|dir| dir + "/lib"})
+ ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
+ end
+- $LIBPATH |= ldirs
++ $LIBPATH = ldirs | $LIBPATH
+
+ [idir, ldir]
+ end
+@@ -969,8 +969,7 @@
+ $LIBRUBYARG = ""
+ $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
+ $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
+- $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
+- $LIBPATH.unshift("$(topdir)") if $extmk
++ $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
+ $INSTALLFILES = nil
+
+ $objs = nil