tag 651112 patch pending tag 630209 patch pending tag 617659 patch pending thanks
Hi! Am 06.12.2011 13:34, schrieb Alexander Reichle-Schmehl: >>> So adding automake-1.9 to the build depends would solve the FTBFS on the >>> buildds? >> Probably. >> Or extend 01_support_kfreebsd_properly.patch >> for needed changes in pdnsd-1.2.8/src/Makefile.in > I just installed a virtual kfreebsd, and can reproduce the error. Even > having automake-1.9 installed doesn't solve the issue. So I'm now > trying to solve it properly. Okay, I must confess I'm kind of weak when it comes to auto-foo stuff. However, I think I fixed it. Attached you'll find an NMUdiff I uploaded to delayed/14. Beside creating some noise by changing timestamps, it basically does the following to pdnsd-1.2.8/src/Makefile.in: -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(thread_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ It builds now also on my virtual kfreebsd machine, which previously failed, and it still builds on linux amd64, so I guess it could be ugly, but not wrong ;) I uploaded the amd64 package, to make sure it will hit the buildds. Best regards, Alexander
diff -Nru pdnsd-1.2.8-par/debian/changelog pdnsd-1.2.8-par/debian/changelog --- pdnsd-1.2.8-par/debian/changelog 2011-12-02 21:06:53.000000000 +0100 +++ pdnsd-1.2.8-par/debian/changelog 2011-12-06 14:04:45.000000000 +0100 @@ -1,3 +1,12 @@ +pdnsd (1.2.8-par-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Refresh debian/patches/01_support_kfreebsd_properly.patch to also use + $(thread_CFLAGS) during linking. Fixes FTBFS on kfreeBSD-* (Closes: #651112, #630209) + * Apparently the previous FTBFS for kfreeBSD-* got also fixed (Closes: #617659) + + -- Alexander Reichle-Schmehl <toli...@debian.org> Tue, 06 Dec 2011 14:01:47 +0100 + pdnsd (1.2.8-par-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru pdnsd-1.2.8-par/debian/patches/01_support_kfreebsd_properly.patch pdnsd-1.2.8-par/debian/patches/01_support_kfreebsd_properly.patch --- pdnsd-1.2.8-par/debian/patches/01_support_kfreebsd_properly.patch 2011-03-17 01:22:25.000000000 +0100 +++ pdnsd-1.2.8-par/debian/patches/01_support_kfreebsd_properly.patch 2011-12-06 13:59:29.000000000 +0100 @@ -2,10 +2,10 @@ Author: Pierre Habouzit <madco...@debian.org> Bug-Debian: http://bugs.debian.org/617659 -Index: pdnsd-1.2.8/src/Makefile.am +Index: pdnsd-1.2.8-par/src/Makefile.am =================================================================== ---- pdnsd-1.2.8.orig/src/Makefile.am 2011-03-13 00:10:03.067355823 +0700 -+++ pdnsd-1.2.8/src/Makefile.am 2011-03-13 00:08:58.866854087 +0700 +--- pdnsd-1.2.8-par.orig/src/Makefile.am 2011-12-06 13:57:52.000000000 +0100 ++++ pdnsd-1.2.8-par/src/Makefile.am 2011-12-06 13:57:56.000000000 +0100 @@ -2,7 +2,7 @@ sbin_PROGRAMS = pdnsd @@ -24,10 +24,10 @@ ## Try to do this last SUBDIRS = pdnsd-ctl rc test -Index: pdnsd-1.2.8/src/helpers.c +Index: pdnsd-1.2.8-par/src/helpers.c =================================================================== ---- pdnsd-1.2.8.orig/src/helpers.c 2011-03-13 00:10:03.682842295 +0700 -+++ pdnsd-1.2.8/src/helpers.c 2011-03-13 00:09:58.322841446 +0700 +--- pdnsd-1.2.8-par.orig/src/helpers.c 2011-12-06 13:57:52.000000000 +0100 ++++ pdnsd-1.2.8-par/src/helpers.c 2011-12-06 13:57:56.000000000 +0100 @@ -432,7 +432,7 @@ /* Appropriately set our random device */ @@ -37,3 +37,16 @@ # define R_ARC4RANDOM 1 # else # define R_RANDOM 1 +Index: pdnsd-1.2.8-par/src/Makefile.in +=================================================================== +--- pdnsd-1.2.8-par.orig/src/Makefile.in 2010-02-22 11:10:18.000000000 +0100 ++++ pdnsd-1.2.8-par/src/Makefile.in 2011-12-06 13:59:20.000000000 +0100 +@@ -67,7 +67,7 @@ + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(thread_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(pdnsd_SOURCES) + DIST_SOURCES = $(pdnsd_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
