[pkg-java] r4314 - in trunk/kaffe/debian: . patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-10-06 20:18:11 +0000 (Sat, 06 Oct 2007)
New Revision: 4314

Added:
   trunk/kaffe/debian/patches/10_pagesize.patch
Modified:
   trunk/kaffe/debian/changelog
   trunk/kaffe/debian/control
   trunk/kaffe/debian/rules
Log:
kaffe (2:1.1.8-2) unstable; urgency=low

  * Fix glibj.zip link for pthreads. Closes: #445469.
  * Added debian/patches/10_pagesize.patch.
  * Touch $(BUILD_TREE)/config/parisc/linux/md.c. Fixes Build on hppa.

 -- Michael Koch <konqueror at gmx.de>  Sat, 06 Oct 2007 21:51:18 +0200



Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog	2007-10-06 17:08:35 UTC (rev 4313)
+++ trunk/kaffe/debian/changelog	2007-10-06 20:18:11 UTC (rev 4314)
@@ -1,3 +1,11 @@
+kaffe (2:1.1.8-2) unstable; urgency=low
+
+  * Fix glibj.zip link for pthreads. Closes: #445469.
+  * Added debian/patches/10_pagesize.patch.
+  * Touch $(BUILD_TREE)/config/parisc/linux/md.c. Fixes Build on hppa.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 06 Oct 2007 21:51:18 +0200
+
 kaffe (2:1.1.8-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/kaffe/debian/control
===================================================================
--- trunk/kaffe/debian/control	2007-10-06 17:08:35 UTC (rev 4313)
+++ trunk/kaffe/debian/control	2007-10-06 20:18:11 UTC (rev 4314)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-Build-Depends: debhelper (>= 5), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, fastjar, ecj (>= 3.3), ecj-gcj (>= 3.3) [alpha arm hppa i386 ia64 powerpc s390 sparc], gij-4.2, libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, libice-dev, libxt-dev, libgconf2-dev
+Build-Depends: debhelper (>= 5), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, fastjar, ecj (>= 3.3), ecj-gcj (>= 3.3) [alpha hppa i386 ia64 powerpc s390 sparc], gij-4.2, libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, libice-dev, libxt-dev, libgconf2-dev
 Standards-Version: 3.7.2
 
 Package: kaffe

Added: trunk/kaffe/debian/patches/10_pagesize.patch
===================================================================
--- trunk/kaffe/debian/patches/10_pagesize.patch	                        (rev 0)
+++ trunk/kaffe/debian/patches/10_pagesize.patch	2007-10-06 20:18:11 UTC (rev 4314)
@@ -0,0 +1,15 @@
+diff -u -r1.29 -r1.30
+--- kaffe-1.1.8/kaffe/kaffevm/systems/unix-pthreads/signal.c	2007/08/09 01:24:56	1.29
++++ kaffe-1.1.8/kaffe/kaffevm/systems/unix-pthreads/signal.c	2007/10/06 11:49:26	1.30
+@@ -480,11 +480,6 @@
+ 	    kaffeNoopFunc(*guessPointer);
+ 	  }
+ 	}
+-	else {
+-#if defined(STACK_GROWS_UP)
+-	  guessPointer += pageSize;
+-#endif
+-	}
+ 
+ 	/* Here we have detected one the boundary of the stack.
+ 	 * If stack grows up then it is the upper boundary. In the other

Modified: trunk/kaffe/debian/rules
===================================================================
--- trunk/kaffe/debian/rules	2007-10-06 17:08:35 UTC (rev 4313)
+++ trunk/kaffe/debian/rules	2007-10-06 20:18:11 UTC (rev 4314)
@@ -98,13 +98,22 @@
 
 $(STAMP_DIR)/build-pthreads: $(STAMP_DIR)/build-jthreads
 
-$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-glibj-zip=$(CURDIR)/build/jthreads/libraries/javalib/external/classpath/lib/glibj.zip --enable-jvmpi --enable-gtk-cairo
+$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-glibj-zip=$(CURDIR)/build/jthreads/libraries/javalib/external/classpath/lib/glibj.zip \
+					      --enable-jvmpi \
+					      --enable-gtk-cairo
 
 configure: $(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS))
 $(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS)): $(STAMP_DIR)/configure-%: $(patched)
 	dh_testdir
+
+	# Hack to make hppa compile
+	touch $(CURDIR)/$(BUILD_TREE)/config/parisc/linux/md.c
+
 	mkdir -p build/$*
-	cd build/$* && CC="$(CC)" $(CURDIR)/$(BUILD_TREE)/configure $(CONFFLAGS) --with-threads=unix-$(word 1,$(subst -,$(space),$*)) --prefix=/usr/lib/kaffe/$* --sharedstatedir=/var/lib/kaffe/$*
+	cd build/$* && CC="$(CC)" $(CURDIR)/$(BUILD_TREE)/configure $(CONFFLAGS) \
+		--with-threads=unix-$(word 1,$(subst -,$(space),$*)) \
+		--prefix=/usr/lib/kaffe/$* \
+		--sharedstatedir=/var/lib/kaffe/$*
 	touch $@
 
 build: $(patsubst %,$(STAMP_DIR)/build-%,$(SYSTEMS))
@@ -143,10 +152,15 @@
 	rm -rf debian/install
 	# Install for all systems into debian/install
 	for i in $(SYSTEMS); do $(MAKE) -C build/$$i install DESTDIR=$(CURDIR)/debian/install; done
+	
+	# Hack to fix glibj.zip for pthreads
+	rm $(CURDIR)/debian/install/usr/lib/kaffe/pthreads/jre/lib/glibj.zip
+	cp $(CURDIR)/debian/install/usr/lib/kaffe/jthreads/jre/lib/glibj.zip $(CURDIR)/debian/install/usr/lib/kaffe/pthreads/jre/lib/glibj.zip
+	
 	perl debian/file-actions.pl -v $(CURDIR)/debian/install
 	# Install jikes-kaffe wrapper
 	install -m 755 $(CURDIR)/debian/wrappers/jikes-kaffe $(CURDIR)/debian/jikes-kaffe/usr/bin/jikes-kaffe
-        # Various reorganization to use system provided tools	
+	# Various reorganization to use system provided tools	
 	# Remove javadoc and make it a symlink to gjdoc
 	# Remove jar and make it a symlink to fastjar,ecj
 	# make a rt.jar symlink to glibj.zip