Re: emacs24 got freeze exception, what happens to emacs add-ons?
Rob Browning writes:
> In any case, the fix is trivial, and I'll upload a -3 shortly that
> includes it. After that, I'll foward a diff between -1 and -3 to
> debian-release, and then you can decide what you'd like to do.
I suppose it's probably time to consider whether or not emacs24 should
be included in wheezy.
I uploaded the last FTBS fix yesterday, and following 24.4+1-1, there
have been three changes:
* Restrict libselinux1-dev build dependency to [linux-any] (#679679).
* Don't check errno after fabs() -- fixes i386 builds. (upstream patch).
* Use -O1 on ia64 (fix FTBS) -- this is a reversion to the emacs23 behavior.
Here are the significant bits:
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
libgpm-dev [linux-any], libdbus-1-dev,
autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
- libgnutls-dev, libxml2-dev, libselinux1-dev, libmagick++-dev,
+ libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev,
libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Homepage: http://www.gnu.org/software/emacs/
Standards-Version: 3.7.2
--- a/debian/rules
+++ b/debian/rules
@@ -105,10 +105,12 @@ CFLAGS += -Wall
LDFLAGS = `dpkg-buildflags --get LDFLAGS`
CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
-LDFLAGS += -g
-
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O2
+ ifneq (,$(filter $(DEB_HOST_ARCH),ia64))
+# Fix a problem with newer versions of gcc on ia64.
+# See bugs #582439 and #679986.
+CFLAGS += -O1
+ endif # eq ia64
endif
joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-17 Paul Eggert
+
+ * floatfns.c (Fabs): Do not wrap fabs inside IN_FLOAT (Bug#11913).
+ Unlike the other wrapped functions, fabs has an unspecified
+ effect on errno.
+
2012-06-01 Chong Yidong
* Version 24.1 released.
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -676,7 +676,7 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0,
CHECK_NUMBER_OR_FLOAT (arg);
if (FLOATP (arg))
-IN_FLOAT (arg = make_float (fabs (XFLOAT_DATA (arg))), "abs", arg);
+arg = make_float (fabs (XFLOAT_DATA (arg)));
else if (XINT (arg) < 0)
XSETINT (arg, - XINT (arg));
and here's the full debdiff:
diff -Nru emacs24-24.1+1/debian/.git-dpm emacs24-24.1+1/debian/.git-dpm
--- emacs24-24.1+1/debian/.git-dpm 2012-06-27 21:41:01.0 -0500
+++ emacs24-24.1+1/debian/.git-dpm 2012-07-17 19:23:17.0 -0500
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-c29cccb1d825523faf484808a699959766d71348
-c29cccb1d825523faf484808a699959766d71348
+6ac9d5dbfded9610d8208378a3be49b1ccd8fe9a
+6ac9d5dbfded9610d8208378a3be49b1ccd8fe9a
dccb7aff653035782f95e87102338cabcd318122
dccb7aff653035782f95e87102338cabcd318122
emacs24_24.1+1.orig.tar.bz2
diff -Nru emacs24-24.1+1/debian/changelog emacs24-24.1+1/debian/changelog
--- emacs24-24.1+1/debian/changelog 2012-06-29 16:16:58.0 -0500
+++ emacs24-24.1+1/debian/changelog 2012-07-20 12:51:38.0 -0500
@@ -1,3 +1,27 @@
+emacs24 (24.1+1-4) unstable; urgency=low
+
+ * Fix FTBS on ia64 with -O1. Remove redundant LDFLAGS+=-g and
+CFLAGS+=-O2. See also: #582439. (Closes: #679986)
+
+ -- Rob Browning Fri, 20 Jul 2012 12:51:32 -0500
+
+emacs24 (24.1+1-3) unstable; urgency=low
+
+ * Add 0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch.
+Fix FTBS on i386 by adding an upstream patch to skip fabs() errno
+checking. Since fabs() has no error conditions, it doesn't guarantee
+that it won't clobber errno.
+
+ -- Rob Browning Tue, 17 Jul 2012 19:25:59 -0500
+
+emacs24 (24.1+1-2) unstable; urgency=low
+
+ * Restrict libselinux1-dev build dependency to [linux-any].
+Thanks to James McCoy for the report.
+(Closes: #679679)
+
+ -- Rob Browning Wed, 04 Jul 2012 19:16:00 -0500
+
emacs24 (24.1+1-1) unstable; urgency=low
* Upgrade to upstream version 24.1.
diff -Nru emacs24-24.1+1/debian/control emacs24-24.1+1/debian/control
--- emacs24-24.1+1/debian/control 2012-06-29 16:18:17.0 -0500
+++ emacs24-24.1+1/debian/control 2012-07-20 12:53:48.0 -0500
@@ -8,7 +8,7 @@
libgpm-dev [linux-any], libdbus-1-dev,
autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
- libgnutls-dev, libxml2-dev, libselinux1-dev, libmagick++-dev,
+ libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev,
libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Homepage: http://www.gnu.org/software/emacs/
Standards-Version: 3.7.2
diff -Nru emacs24-24.1+1/debian/control.in emacs24-24.1+1/debian/control.in
--- emacs24-24.1+1/debian/control.in 2012-06-27 21:41:01.
Re: emacs24 got freeze exception, what happens to emacs add-ons?
"Adam D. Barratt" writes: > It would work, but it's not exactly ideal for future updates, > particularly in stable... Right. During debconf, with some help, I was able to track down the problem. It turns out that Emacs was checking errno after a number of floating point operations, including fabs(), but because fabs() doesn't have any error conditions, it's not guaranteed to leave errno alone -- and as you might imagine, on murphy, it wasn't. In any case, the fix is trivial, and I'll upload a -3 shortly that includes it. After that, I'll foward a diff between -1 and -3 to debian-release, and then you can decide what you'd like to do. It will be a very small diff, just the addition of [linux-any] to the libselinux1-dev build-dep, and this fabs/errno adjustment. Thanks for the help -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87ipdmj6ke@trouble.defaultvalue.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
On Tue, 2012-07-10 at 17:41 -0500, Rob Browning wrote: > Rob Browning writes: > > > Also not ideal, but if it's allowed, I could just upload both amd64 and > > i386 (or just i386). So far murphy's the only place we seem to have > > this problem. It would work, but it's not exactly ideal for future updates, particularly in stable... fwiw, the auto-exception was for 24.1+1-1; -2 currently has no such exception. The general policy thus far has been not to grant manual unblocks for source packages which are new for wheezy, although we could possibly be persuaded that there are cases where it makes sense. > So the build in the wheezy chroot, running on the i386 squeeze vm didn't > fail. The host kernel there was linux-image-2.6.32-5-686-bigmem > (2.6.32-45). Whether or not that was close enough to murphy's kernel, I > don't know. (From the murphy build log: "Kernel: Linux > 2.6.32-5-686-bigmem i386 (i686)".) > > At this point, I'm not sure what I should try next. Suggestions? My earlier remembering of one of the i386 buildds being a VM appears to have been mistaken; the most obvious difference is that one is an amd64 host whereas the other is i386. The buildd logs contain a list of all of the packages used during the build. It's often worth comparing those between a failing and successful build to see if there are any possibly relevant differences. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1342555808.14254.18.ca...@jacala.jungle.funky-badger.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Rob Browning writes: > Also not ideal, but if it's allowed, I could just upload both amd64 and > i386 (or just i386). So far murphy's the only place we seem to have > this problem. So the build in the wheezy chroot, running on the i386 squeeze vm didn't fail. The host kernel there was linux-image-2.6.32-5-686-bigmem (2.6.32-45). Whether or not that was close enough to murphy's kernel, I don't know. (From the murphy build log: "Kernel: Linux 2.6.32-5-686-bigmem i386 (i686)".) At this point, I'm not sure what I should try next. Suggestions? Thanks -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/878vernsr1@trouble.defaultvalue.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Moritz Mühlenhoff writes: > I've made a test build in a i386 system and it builds fine there. I > suppose that's some kind of broken buildd environment? I didn't have any trouble in a fresh wheezy i386 kvm vm either, but now I'm testing a suggestion by Adam that the problem might be related to murphy's older host dist/kernel (i.e. the host is running something squeeze-ish). So I have a squeeze i386 kvm vm set up, with a current wheezy schroot, and I'm waiting to see if that fails. If it doesn't, then I'd be happy to hear any other suggestions. Thanks for the help -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87sjczpbeo@trouble.defaultvalue.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
"Adam D. Barratt" writes: > On 10.07.2012 21:27, Moritz Mühlenhoff wrote: >> Du schriebst in gmane.linux.debian.devel.release: >> RMs, can you give-back emacs/24.1+1-2 so that it's build on biber? > > The best we (release team) could do is keep giving it back /until/ > it's built on biber; that'll work, but it's not really ideal longer > term. Also not ideal, but if it's allowed, I could just upload both amd64 and i386 (or just i386). So far murphy's the only place we seem to have this problem. Thanks -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87fw8zpb7s@trouble.defaultvalue.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
On 10.07.2012 21:27, Moritz Mühlenhoff wrote: Du schriebst in gmane.linux.debian.devel.release: Rob Browning writes: Right, that one I can't explain. So far, only murphy hates the package (both revisions). It builds fine on biber, and also here in a wheezy i386 chroot. It looks like one difference between biber and murphy is that the former is amd64 while the latter is strictly i386. So I'll see about digging up an actual i386 host for testing. I've made a test build in a i386 system and it builds fine there. I suppose that's some kind of broken buildd environment? RMs, can you give-back emacs/24.1+1-2 so that it's build on biber? The best we (release team) could do is keep giving it back /until/ it's built on biber; that'll work, but it's not really ideal longer term. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/c832c2849317a0ed57e7bd4978ef7...@mail.adsl.funky-badger.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Du schriebst in gmane.linux.debian.devel.release: > Rob Browning writes: > >> Right, that one I can't explain. So far, only murphy hates the package >> (both revisions). It builds fine on biber, and also here in a wheezy >> i386 chroot. > > It looks like one difference between biber and murphy is that the former > is amd64 while the latter is strictly i386. So I'll see about digging > up an actual i386 host for testing. I've made a test build in a i386 system and it builds fine there. I suppose that's some kind of broken buildd environment? RMs, can you give-back emacs/24.1+1-2 so that it's build on biber? Cheers, Moritz -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120710202750.GA5363@pisco.westfalen.local
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Rob Browning writes: > Right, that one I can't explain. So far, only murphy hates the package > (both revisions). It builds fine on biber, and also here in a wheezy > i386 chroot. It looks like one difference between biber and murphy is that the former is amd64 while the latter is strictly i386. So I'll see about digging up an actual i386 host for testing. Thanks -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/878vet6d1w@trouble.defaultvalue.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Cyril Brulebois writes: > Apparently emacs24 isn't quite in testing yet, since it got uploaded > again: > http://packages.qa.debian.org/e/emacs24/news/20120705T013216Z.html True, though the only change was to fix builds on non-linux systems. I added a [linux-any] to the libselinux1-dev build-dep: --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib libgpm-dev [linux-any], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42), debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, - libgnutls-dev, libxml2-dev, libselinux1-dev, libmagick++-dev, + libgnutls-dev, libxml2-dev, libselinux1-dev [linux-any], libmagick++-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64] Homepage: http://www.gnu.org/software/emacs/ Standards-Version: 3.7.2 > And there are strange things happening, even on i386: > https://buildd.debian.org/status/logs.php?pkg=emacs24&arch=i386 Right, that one I can't explain. So far, only murphy hates the package (both revisions). It builds fine on biber, and also here in a wheezy i386 chroot. Thanks -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87bojp7svq@trouble.defaultvalue.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Cyril Brulebois writes: > I'm not sure we're going to let any new packages enter testing at this > point… No problem. I'm only asking that _if_ emacs24 is released with wheezy then I'd like to have a freeze exception for magit 1.1.1-3. -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/84y5mtlv04@sauna.l.org
Re: emacs24 got freeze exception, what happens to emacs add-ons?
Timo Juhani Lindfors (03/07/2012): > just after freeze I heard that emacs24 got a freeze-exception [1]. I > maintain magit which is an add-on to emacs. Since magit does not support > xemacs21 or emacs22 it has to maintain an explicit list of supported > emacs versions as per debian emacs policy [2]. > > If we release wheezy with emacs24 I think we should update all emacs > add-on packages that maintain such explicit version lists. If we don't > do that users will be quite puzzled when they find out that their > favourite add-ons stop working after they upgrade to emacs24. > > I uploaded magit 1.1.1-3 now to unstable with minimal changes [3]. Apparently emacs24 isn't quite in testing yet, since it got uploaded again: http://packages.qa.debian.org/e/emacs24/news/20120705T013216Z.html And there are strange things happening, even on i386: https://buildd.debian.org/status/logs.php?pkg=emacs24&arch=i386 I'm not sure we're going to let any new packages enter testing at this point… Mraw, KiBi. signature.asc Description: Digital signature
