diff options
| author | knu <knu@FreeBSD.org> | 2004-07-13 07:03:54 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2004-07-13 07:03:54 +0000 |
| commit | 3deaececa23b26b70c3b1c696bd2b8bce793b91c (patch) | |
| tree | 34756d79e2b6c308067288c588d47e3e68ff5160 /lang/ruby18 | |
| parent | 59c767756d08b2d8d6ece41445618ad11c7f0580 (diff) | |
| download | FreeBSD-ports-3deaececa23b26b70c3b1c696bd2b8bce793b91c.zip FreeBSD-ports-3deaececa23b26b70c3b1c696bd2b8bce793b91c.tar.gz | |
Pull in the latest change to mkmf.rb to avoid build error when
devel/readline is installed.
Diffstat (limited to 'lang/ruby18')
| -rw-r--r-- | lang/ruby18/Makefile | 1 | ||||
| -rw-r--r-- | lang/ruby18/files/patch-mkmf.rb | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index cddf3a6..90084a8 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -7,6 +7,7 @@ PORTNAME= ruby${RUBY_R} PORTVERSION= ${RUBY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY} diff --git a/lang/ruby18/files/patch-mkmf.rb b/lang/ruby18/files/patch-mkmf.rb new file mode 100644 index 0000000..fcb200f --- /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 |
