[Pkg-samba-maint] r1684 - in trunk/samba/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-01-04 09:58:26 +0000 (Fri, 04 Jan 2008)
New Revision: 1684

Added:
   trunk/samba/debian/patches/gcc42-arm-workaround.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
   trunk/samba/debian/rules
Log:
* debian/patches/gcc42-arm-workaround.patch: work around an arm compiler
  problem by building rpc_parse/parse_prs.o with -O0 on this architecture.
  Thanks to Martin Michlmayr for helping to pin down the problem file.
  Closes: #445566.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-01-03 07:53:32 UTC (rev 1683)
+++ trunk/samba/debian/changelog	2008-01-04 09:58:26 UTC (rev 1684)
@@ -6,8 +6,12 @@
     so we can use bash array variables and cope with arguments containing
     embedded spaces (such as share names).  Thanks to Julian Gilbey
     <jdg at debian.org> for the patch.  Closes: #457105.
+  * debian/patches/gcc42-arm-workaround.patch: work around an arm compiler
+    problem by building rpc_parse/parse_prs.o with -O0 on this architecture.
+    Thanks to Martin Michlmayr for helping to pin down the problem file.
+    Closes: #445566.
 
- -- Steve Langasek <vorlon at debian.org>  Tue, 25 Dec 2007 09:27:25 -0800
+ -- Steve Langasek <vorlon at debian.org>  Fri, 04 Jan 2008 01:45:02 -0800
 
 samba (3.0.28-1) unstable; urgency=high
 

Added: trunk/samba/debian/patches/gcc42-arm-workaround.patch
===================================================================
--- trunk/samba/debian/patches/gcc42-arm-workaround.patch	                        (rev 0)
+++ trunk/samba/debian/patches/gcc42-arm-workaround.patch	2008-01-04 09:58:26 UTC (rev 1684)
@@ -0,0 +1,22 @@
+Goal: workaround for a bug in gcc4.2 on arm when compiling with -O2
+
+Fixes: #445566
+
+Upstream status: Debian-specific; should be dropped as soon as bug
+#458345 has been fixed in gcc.
+
+Author: Steve Langasek <vorlon at debian.org>
+
+Index: samba-3.0.28/source/Makefile.in
+===================================================================
+--- samba-3.0.28.orig/source/Makefile.in
++++ samba-3.0.28/source/Makefile.in
+@@ -914,6 +914,8 @@
+ 	  mkdir "$$dir" || \
+ 	  exec false; fi || exec false
+ 
++rpc_parse/parse_prs.o: FLAGS+=$(PARSE_PRS_FLAGS)
++
+ .c.o:
+ 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
+ 	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2008-01-03 07:53:32 UTC (rev 1683)
+++ trunk/samba/debian/patches/series	2008-01-04 09:58:26 UTC (rev 1684)
@@ -21,3 +21,4 @@
 chgpasswd.patch
 cups.patch
 disable-weak-auth.patch
+gcc42-arm-workaround.patch

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2008-01-03 07:53:32 UTC (rev 1683)
+++ trunk/samba/debian/rules	2008-01-04 09:58:26 UTC (rev 1684)
@@ -23,6 +23,12 @@
   CFLAGS += -O2
 endif
 
+ifeq ($(DEB_HOST_GNU_TYPE),arm-linux-gnu)
+  PARSE_PRS_FLAGS = -O0
+endif
+
+export PARSE_PRS_FLAGS
+
 include /usr/share/quilt/quilt.make
 
 DESTDIR=`pwd`/debian/tmp