[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#780431: 2.19-16 breaks stage2 build



On Fri, Mar 13, 2015 at 09:36:01PM +0100, Helmut Grohne wrote:
> I verified that the attached patch solves the issue.

As Adam pointed out, my patch was missing. Sorry.

But it really is equivalent to what is already in SVN. So this mostly is
a confirmation.

Helmut
diff -Nru glibc-2.19/debian/changelog glibc-2.19/debian/changelog
--- glibc-2.19/debian/changelog	2015-03-12 22:00:48.000000000 +0100
+++ glibc-2.19/debian/changelog	2015-03-13 20:16:44.000000000 +0100
@@ -1,3 +1,10 @@
+glibc (2.19-16.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Unbreak stage2 build. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Fri, 13 Mar 2015 20:16:06 +0100
+
 glibc (2.19-16) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru glibc-2.19/debian/rules.d/debhelper.mk glibc-2.19/debian/rules.d/debhelper.mk
--- glibc-2.19/debian/rules.d/debhelper.mk	2015-03-08 22:29:32.000000000 +0100
+++ glibc-2.19/debian/rules.d/debhelper.mk	2015-03-13 20:16:03.000000000 +0100
@@ -180,6 +180,8 @@
 	# Generate common substvars files.
 ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
 	echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' > tmp.substvars
+else
+	touch tmp.substvars
 endif
 
 	for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \

Reply to: