On Sun, Jan 08, 2012 at 11:37:10PM +0100, Josip Rodin wrote:
> > > > --- maildrop-2.2.0.orig/debian/rules 2012-01-08 19:22:00.000000000
> > > > +0100
> > > > +++ maildrop-2.2.0/debian/rules 2012-01-08 19:22:52.000000000 +0100
> > > > @@ -1,12 +1,5 @@
> > > > #!/usr/bin/make -f
> > > >
> > > > -CFLAGS = -g
> > > > -CXXFLAGS = -g
> > > > -ifneq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "arm"
> > > > - CFLAGS += -O2
> > > > - CXXFLAGS += -O2
> > > > -endif
> > >
> > > And you would be reverting this because...?
> >
> > Because dpkg-buildflags emits these by default and compat level 9 injects
> > them into the build system:
>
> It looks like you misread them - it's if*N*eq arm.
Sorry, my bad. Updated patch attached.
It probably makes sense to drop the diverging build flags in the next
unstable upload anyway, given that more than two years of toolchaim
development have occured since the workaround was added?
Cheers,
Moritz
diff -aur maildrop-2.2.0.orig/debian/compat maildrop-2.2.0/debian/compat
--- maildrop-2.2.0.orig/debian/compat 2012-01-08 23:41:05.000000000 +0100
+++ maildrop-2.2.0/debian/compat 2012-01-08 23:42:39.000000000 +0100
@@ -1 +1 @@
-7
+9
diff -aur maildrop-2.2.0.orig/debian/rules maildrop-2.2.0/debian/rules
--- maildrop-2.2.0.orig/debian/rules 2012-01-08 23:41:05.000000000 +0100
+++ maildrop-2.2.0/debian/rules 2012-01-08 23:43:52.000000000 +0100
@@ -1,14 +1,12 @@
#!/usr/bin/make -f
-CFLAGS = -g
-CXXFLAGS = -g
-ifneq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "arm"
- CFLAGS += -O2
- CXXFLAGS += -O2
-endif
-
#export DH_VERBOSE=1
+ifeq "$(shell dpkg-architecture -qDEB_HOST_ARCH)" "arm"
+ DEB_CFLAGS_MAINT_APPEND=-O0
+ DEB_CXXFLAGS_MAINT_APPEND=-O0
+endif
+
%:
dh $@
@@ -17,7 +15,6 @@
autoconf
automake
# trust on the auto-detect of qmail failing (for sendmail compability)
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
Nur in maildrop-2.2.0/debian: rules~.
