Update to jruby 1.6.7.
This commit is contained in:
jeremy
parent
b202a72985
commit
d50fbf5be0
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2012/01/05 02:10:06 jeremy Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2012/04/04 20:23:59 jeremy Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
COMMENT = pure-Java implementation of the Ruby language
|
||||
|
||||
V = 1.6.5.1
|
||||
V = 1.6.7
|
||||
DISTNAME = jruby-src-${V}
|
||||
PKGNAME = jruby-${V}
|
||||
CATEGORIES = lang lang/ruby
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
MD5 (jruby-src-1.6.5.1.tar.gz) = 3VHmsE2qywd2gucQLRlHBA==
|
||||
MD5 (jruby-src-1.6.7.tar.gz) = c320uAvNQ5H1o9q86MubSw==
|
||||
MD5 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = mOyRmYChedDeeXyUmTVBog==
|
||||
RMD160 (jruby-src-1.6.5.1.tar.gz) = qW3mxmBVy86/SBCcly1G99IqZ8I=
|
||||
RMD160 (jruby-src-1.6.7.tar.gz) = JQ4k7nv9XiiqwRsfVx/QZ6BQ73E=
|
||||
RMD160 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = lTBayILxwHuGltkNqDMvfjn0+kM=
|
||||
SHA1 (jruby-src-1.6.5.1.tar.gz) = jh9vv2Ce2YrYSNNjaqwbzctj4/8=
|
||||
SHA1 (jruby-src-1.6.7.tar.gz) = G17wza9o9tat04UTbnSzMKXh57Y=
|
||||
SHA1 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = ocUg1SbvOliOtPrMEBIY0sOEK90=
|
||||
SHA256 (jruby-src-1.6.5.1.tar.gz) = ESbym4iLVCfC1BYEKmwBCEmrHSnum+l+WSyvaFmSG+U=
|
||||
SHA256 (jruby-src-1.6.7.tar.gz) = OKFbxLmEnJ/f6HB3shvgQnrWQyFnyb9VVY/Am1dALDc=
|
||||
SHA256 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = ybtb8CunJ/jql9zzBZnz2eYWXc08etMsiuWso0nas1c=
|
||||
SIZE (jruby-src-1.6.5.1.tar.gz) = 14284770
|
||||
SIZE (jruby-src-1.6.7.tar.gz) = 14579497
|
||||
SIZE (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = 1728176
|
||||
|
||||
@ -1,7 +1,4 @@
|
||||
$OpenBSD: patch-build_xml,v 1.4 2011/11/14 11:38:16 jeremy Exp $
|
||||
|
||||
Fix build by removing ri cache generation, backported from git
|
||||
commit a760b4aea4b5aa9b38da4bd3334d8355a83f60fa.
|
||||
$OpenBSD: patch-build_xml,v 1.5 2012/04/04 20:24:00 jeremy Exp $
|
||||
|
||||
Don't install the jruby launcher when running the regress specs,
|
||||
as it fails due to a make error and it isn't necessary for the
|
||||
@ -10,25 +7,9 @@ regress tests.
|
||||
Also, don't fork for the regress tests, as otherwise the JVM
|
||||
exits abnormally.
|
||||
|
||||
--- build.xml.orig Tue Oct 25 16:54:51 2011
|
||||
+++ build.xml Sun Nov 13 23:49:50 2011
|
||||
@@ -379,7 +379,6 @@
|
||||
</jar>
|
||||
|
||||
<antcall target="add-emma-jars"/>
|
||||
- <antcall target="generate-ri-cache"/>
|
||||
|
||||
<property name="jar-jruby.hasrun" value="true"/>
|
||||
</target>
|
||||
@@ -484,7 +483,6 @@
|
||||
<param name="bar.wrap" value="${lib.dir}/jruby.bar" />
|
||||
</antcall>
|
||||
|
||||
- <antcall target="generate-ri-cache"/>
|
||||
</target>
|
||||
<target name="jarjar" depends="jar-jruby-dist"/>
|
||||
|
||||
@@ -806,13 +804,6 @@
|
||||
--- build.xml.orig Wed Feb 22 09:14:56 2012
|
||||
+++ build.xml Wed Feb 22 14:22:46 2012
|
||||
@@ -809,13 +809,6 @@
|
||||
<env key="GEM_PATH" value=""/> <!-- to ignore any gems installed in ~/.gem -->
|
||||
<arg line="-S gem uninstall --all jruby-launcher"/>
|
||||
</java>
|
||||
@ -42,7 +23,7 @@ exits abnormally.
|
||||
</target>
|
||||
|
||||
<target name="test" depends="
|
||||
@@ -967,7 +958,7 @@
|
||||
@@ -916,7 +909,7 @@
|
||||
<echo message="compile=@{compile.mode}, jit.threshold=@{jit.threshold}, jit.maxsize=@{jit.maxsize}, jit.max=@{jit.max}, objectspace=@{objectspace.enabled} threadpool=@{thread.pooling} reflection=@{reflection} version=@{jruby.version}"/>
|
||||
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" classpath="${build.lib.dir}/junit.jar"/>
|
||||
|
||||
@ -50,4 +31,4 @@ exits abnormally.
|
||||
+ <junit jvm="${jruby.test.jvm}" haltonfailure="false" dir="${basedir}" maxmemory="${jruby.test.memory}" showoutput="true" timeout="1800000">
|
||||
<classpath refid="test.class.path"/>
|
||||
|
||||
<sysproperty key="java.awt.headless" value="true"/>
|
||||
<sysproperty key="jruby.compile.invokedynamic" value="true"/>
|
||||
|
||||
17
lang/jruby/patches/patch-default_build_properties
Normal file
17
lang/jruby/patches/patch-default_build_properties
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-default_build_properties,v 1.1 2012/04/04 20:24:00 jeremy Exp $
|
||||
|
||||
Reduce amount of memory used when launching jruby. It doesn't
|
||||
require 1G, and without this patch you can't build JRuby on a
|
||||
system with only 1G of memory.
|
||||
|
||||
--- default.build.properties.orig Wed Feb 22 15:09:01 2012
|
||||
+++ default.build.properties Wed Feb 22 15:09:23 2012
|
||||
@@ -59,7 +59,7 @@ html.test.results.dir=${test.results.dir}/html
|
||||
html.test.coverage.results.dir=${test.results.dir}/html-coverage
|
||||
javac.version=1.5
|
||||
jruby.compile.memory=384M
|
||||
-jruby.launch.memory=1024M
|
||||
+jruby.launch.memory=512M
|
||||
jruby.test.memory=768M
|
||||
jruby.test.jvm=java
|
||||
rake.args=
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.13 2011/12/09 21:46:15 jeremy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.14 2012/04/04 20:24:00 jeremy Exp $
|
||||
bin/jruby
|
||||
jruby/
|
||||
jruby/bin/
|
||||
@ -20,7 +20,6 @@ jruby/lib/native/include/
|
||||
jruby/lib/native/include/config.h
|
||||
jruby/lib/native/include/ruby/
|
||||
jruby/lib/native/include/ruby.h
|
||||
jruby/lib/native/include/ruby/asprintf.h
|
||||
jruby/lib/native/include/ruby/defines.h
|
||||
jruby/lib/native/include/ruby/dl.h
|
||||
jruby/lib/native/include/ruby/intern.h
|
||||
@ -1550,6 +1549,7 @@ jruby/lib/ruby/site_ruby/1.8/rubygems/server.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/source_index.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/spec_fetcher.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/specification.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/syck_hack.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/test_case.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/test_utilities.rb
|
||||
jruby/lib/ruby/site_ruby/1.8/rubygems/text.rb
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user