[ecj] 08/145: Import Debian changes 3.1.1-3

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit eea1ed00b37ef4f9ae275ae9fd42913ebe6308a7
Author: Matthias Klose <doko at debian.org>
Date:   Thu Oct 20 19:08:20 2005 +0000

    Import Debian changes 3.1.1-3
    
    ecj-bootstrap (3.1.1-3) unstable; urgency=low
    
      * On arm and hppa, don't rebuild ecj using gij.
---
 debian/changelog |  6 ++++++
 debian/rules     | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aea8aec..e2987b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj-bootstrap (3.1.1-3) unstable; urgency=low
+
+  * On arm and hppa, don't rebuild ecj using gij.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 20 Oct 2005 19:08:20 +0000
+
 ecj-bootstrap (3.1.1-2) unstable; urgency=low
 
   * Add a javac alternative (priority higher than gcj).
diff --git a/debian/rules b/debian/rules
index a303082..5626459 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,13 @@ GIJ = gij-$(gcc_version)
 #endif
 
 with_native := yes
+with_rebuild := yes
+ifeq ($(DEB_HOST_ARCH),arm)
+  with_rebuild := no
+endif
+ifeq ($(DEB_HOST_ARCH),hppa)
+  with_rebuild := no
+endif
 
 default: build
 
@@ -67,8 +74,9 @@ build/stamp:
 
 	mkdir -p build/bootstrap
 	fastjar -c -C build/bin . -f build/bootstrap/ecj.jar
-	rm -rf build/bin
 
+ifeq ($(with_rebuild),yes)
+	rm -rf build/bin
 	mkdir -p build/bin
 	cp -r src/org.eclipse.jdt.core/org build/bin/
 
@@ -83,6 +91,10 @@ build/stamp:
 
 	mkdir -p build/dist
 	fastjar -c -C build/bin . -f build/dist/ecj.jar
+else
+	mkdir -p build/dist
+	cp -p build/bootstrap/ecj.jar build/dist/ecj.jar
+endif
 	rm -rf build/bin
 
 ifeq ($(with_native),yes)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git