Author: yavor-guest Date: 2009-12-09 12:32:37 +0000 (Wed, 09 Dec 2009) New Revision: 4441
Modified: trunk/packages/adun.app/trunk/debian/changelog trunk/packages/adun.app/trunk/debian/rules Log: debian/rules (build-stamp): Pass GNUSTEP_MAKE_PARALLEL_BUILDING=no; fixes FTBFS with gnustep-make/2.2.0. Modified: trunk/packages/adun.app/trunk/debian/changelog =================================================================== --- trunk/packages/adun.app/trunk/debian/changelog 2009-12-08 15:01:08 UTC (rev 4440) +++ trunk/packages/adun.app/trunk/debian/changelog 2009-12-09 12:32:37 UTC (rev 4441) @@ -1,3 +1,10 @@ +adun.app (0.81-2) UNRELEASED; urgency=low + + * debian/rules (build-stamp): Pass GNUSTEP_MAKE_PARALLEL_BUILDING=no; + fixes FTBFS with gnustep-make/2.2.0. + + -- Yavor Doganov <[email protected]> Wed, 09 Dec 2009 14:14:33 +0200 + adun.app (0.81-1) unstable; urgency=low [ Andreas Tille ] Modified: trunk/packages/adun.app/trunk/debian/rules =================================================================== --- trunk/packages/adun.app/trunk/debian/rules 2009-12-08 15:01:08 UTC (rev 4440) +++ trunk/packages/adun.app/trunk/debian/rules 2009-12-09 12:32:37 UTC (rev 4441) @@ -21,8 +21,20 @@ build-stamp: dh_testdir +# Upstream's makefiles have conditionals based on $(MAKELEVEL) so that +# building separate components and the whole package from toplevel +# works. They all evaluate to false when building the Debian package, +# because debian/rules is itself a makefile -- resetting MAKELEVEL +# does the trick. +# GNUstep Make 2.2.0 gained support for parallel (-jN) building, which +# is implemented by delegating the actual compilation to sub-makes +# which run in parallel (i.e. the build system invokes +# $(MAKE) -f GNUmakefile ...). This is the default mode of operation, +# even if no -j option is used. GNUSTEP_MAKE_PARALLEL_BUILDING=no +# prevents messing the MAKELEVEL again. GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles MAKELEVEL=0 \ - $(MAKE) OPTFLAG=$(OPTFLAG) LDFLAGS="$(LDFLAGS)" messages=yes + $(MAKE) GNUSTEP_MAKE_PARALLEL_BUILDING=no OPTFLAG=$(OPTFLAG) \ + LDFLAGS="$(LDFLAGS)" messages=yes convert UL/Resources/icon.tiff -resize 32x32 adun.xpm touch $@ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
