r43524 - in /trunk/libdevel-declare-perl/debian: changelog rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Sep  2 20:09:16 2009
New Revision: 43524

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=43524
Log:
rules: build with -O1 on sparc and Perl before 5.10.1; fixes alignment error (triggerred during tests)
Closes: 543573; Thanks to Niko Tyni for investigation and fix proposal

Modified:
    trunk/libdevel-declare-perl/debian/changelog
    trunk/libdevel-declare-perl/debian/rules

Modified: trunk/libdevel-declare-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-declare-perl/debian/changelog?rev=43524&op=diff
==============================================================================
--- trunk/libdevel-declare-perl/debian/changelog (original)
+++ trunk/libdevel-declare-perl/debian/changelog Wed Sep  2 20:09:16 2009
@@ -1,6 +1,11 @@
 libdevel-declare-perl (0.005011-2) UNRELEASED; urgency=low
 
+  [ Ryan Niebur ]
   * Update jawnsy's email address
+
+  [ Damyan Ivanov ]
+  * rules: build with -O1 on sparc and Perl before 5.10.1; fixes alignment error (triggerred during tests)
+    Closes: 543573; Thanks to Niko Tyni for investigation and fix proposal
 
  -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 01 Sep 2009 21:18:42 -0700
 

Modified: trunk/libdevel-declare-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-declare-perl/debian/rules?rev=43524&op=diff
==============================================================================
--- trunk/libdevel-declare-perl/debian/rules (original)
+++ trunk/libdevel-declare-perl/debian/rules Wed Sep  2 20:09:16 2009
@@ -1,4 +1,35 @@
 #!/usr/bin/make -f
+
+DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
+PERL ?= /usr/bin/perl
+
+# there are some alignment problems on sparc, fixed in perl 5.10.1
+# we work around them by using -O1, but only on sparc and only for perls before 5.10.1
+PERL_VER=$(shell $(PERL) -e 'my ($$rev, $$ver, $$subver) = $$] =~ /(\d+)\.(\d\d\d)(\d\d\d)/; print join(".", $$rev+0, $$ver+0, $$subver+0)')
+GOOD_PERL=$(shell if dpkg --compare-versions $(PERL_VER) -gt 5.10.1~; then echo "yes"; fi)
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    ifeq (sparc,$(DEB_HOST_ARCH))
+        ifeq (yes,$(GOOD_PERL))
+            $(info Building on sparc, with Perl $(PERL_VER), use -O2)
+            CFLAGS+="-O2"
+        else
+            $(info Building on sparc, with Perl $(PERL_VER), use -O1)
+            CFLAGS+="-O1"
+        endif
+    else
+        $(info Not building on sparc (Perl $(PERL_VER)), use -O2)
+        CFLAGS+="-O2"
+    endif
+endif
+
+override_dh_auto_configure:
+	dh_auto_configure -- OPTIMIZE="$(CFLAGS)"
+
+# end of sparc alignment workaround
 
 %:
 	dh --with quilt $@