[Pkg-john-commits] r176 - in trunk/debian: . patches

[hanska-guest at alioth.debian.org]

Author: hanska-guest
Date: 2008-06-02 15:15:17 +0000 (Mon, 02 Jun 2008)
New Revision: 176

Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
   trunk/debian/rules
Log:
conditionally unset OPT_NORMAL (i.e. remove -funroll-loops) on arm
machines

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-02 14:58:28 UTC (rev 175)
+++ trunk/debian/changelog	2008-06-02 15:15:17 UTC (rev 176)
@@ -20,12 +20,13 @@
   * debian/rules updated:
     - binary-common target added, binary-{arch,indep} depending on it
       (Closes: #477450)
-    - conditionally add -funroll-loops on !arm machines
+    - conditionally unset OPT_NORMAL (i.e. remove -funroll-loops) on arm
+      machines
   * debian/compat bumped to 6
   * debian/copyright updated:
     - included files created by patches
 
- -- David Paleino <d.paleino at gmail.com>  Mon, 02 Jun 2008 16:56:33 +0200
+ -- David Paleino <d.paleino at gmail.com>  Mon, 02 Jun 2008 17:15:03 +0200
 
 john (1.7.2-2) unstable; urgency=low
 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2008-06-02 14:58:28 UTC (rev 175)
+++ trunk/debian/patches/series	2008-06-02 15:15:17 UTC (rev 176)
@@ -1,4 +1,4 @@
-00-remove_funroll-loops.patch
+#00-remove_funroll-loops.patch
 01-add_NTLM-MD4.patch
 02-add_MS-Credential-Cache.patch
 03-add_NetLM-NetNTLM.patch

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-06-02 14:58:28 UTC (rev 175)
+++ trunk/debian/rules	2008-06-02 15:15:17 UTC (rev 176)
@@ -20,12 +20,6 @@
 	STRIP += -s
 endif
 
-# GCC segfaults on ARM if -funroll-loops is used.
-# Please see #476460
-ifneq ($(CPU),arm)
-	CFLAGS += -funroll-loops
-endif
-
 ifeq ($(ARCH),i386)
 	TARGET := linux-x86-any
 else
@@ -39,7 +33,15 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+
+	# GCC segfaults on ARM if -funroll-loops is used.
+	# Please see #476460
+ifeq ($(CPU),arm)
+	$(MAKE) OPT_NORMAL= CFLAGS="$(CFLAGS)" -C src/ $(TARGET)
+else
 	$(MAKE) CFLAGS="$(CFLAGS)" -C src/ $(TARGET)
+endif
+
 ifeq ($(ARCH),i386)
 	mv $(CURDIR)/run/john $(CURDIR)/run/john-any
 	$(MAKE) -C src/ clean