haiku.git

author	Adrien Destugues <pulkomandy@pulkomandy.ath.cx>	2011-06-11 7:10:48.0 +00:00:00
committer	Adrien Destugues <pulkomandy@pulkomandy.ath.cx>	2011-06-11 7:10:48.0 +00:00:00
commit	c113cd7bca5742867e2cd12ccbb4f1884940aed1 [patch]
tree	e4055adb5687c7718acb53c45c9b2862e6261b55
parent	cbca4da9bcb77f88ce5e5a516e8f43d16971ac00
download	c113cd7bca5742867e2cd12ccbb4f1884940aed1.tar.gz

Merge 42071

git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42095 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 build/jam/OptionalPackages | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 257da40..a28f0ce 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -601,15 +601,15 @@
		Echo "No optional package DevelopmentJava available for gcc2" ;
	} else {
		InstallOptionalHaikuImagePackage
			gnu-classpath-0.98-x86-gcc4-2011-03-01.zip
			: $(baseURL)/gnu-classpath-0.98-x86-gcc4-2011-03-01.zip ;
			gnu-classpath-0.98-r1a3-x86-gcc4-2011-06-08.zip
			: $(baseURL)/gnu-classpath-0.98-r1a3-x86-gcc4-2011-06-08.zip ;
		InstallOptionalHaikuImagePackage
			jamvm-1.5.4-x86-gcc4-2011-02-13.zip
			: $(baseURL)/jamvm-1.5.4-x86-gcc4-2011-02-13.zip ;
			jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip
			: $(baseURL)/jamvm-1.5.4-r1a3-x86-gcc4-2011-06-08.zip ;
		AddSymlinkToHaikuImage common bin : /boot/common/bin/jamvm : java ;
		InstallOptionalHaikuImagePackage
			ecj-3.6.2-haiku-2011-03-05.zip
			: $(baseURL)/ecj-3.6.2-haiku-2011-03-05.zip ;
			ecj-3.6.2-haiku-2011-06-08.zip
			: $(baseURL)/ecj-3.6.2-haiku-2011-06-08.zip ;
	}
}