r6225 - in glibc-package/trunk/debian: . control.in rules.d
Author: aurel32
Date: 2014-08-14 12:12:13 +0000 (Thu, 14 Aug 2014)
New Revision: 6225
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Don't emit dependencies on libgcc when building stage2. Closes: #755580.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-08-14 12:05:31 UTC (rev 6224)
+++ glibc-package/trunk/debian/changelog 2014-08-14 12:12:13 UTC (rev 6225)
@@ -2,6 +2,7 @@
[ Helmut Grohne ]
* debian/patches/build stage2 without selinux. Closes: #742640.
+ * Don't emit dependencies on libgcc when building stage2. Closes: #755580.
[ Aurelien Jarno ]
* debian/patches/arm64/cvs-includes-cleanup.diff: new patch from upstream to
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2014-08-14 12:05:31 UTC (rev 6224)
+++ glibc-package/trunk/debian/control 2014-08-14 12:12:13 UTC (rev 6225)
@@ -149,7 +149,7 @@
Section: libs
Priority: required
Multi-Arch: same
-Depends: ${shlibs:Depends}, libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
@@ -247,7 +247,7 @@
Section: libs
Priority: required
Multi-Arch: same
-Depends: ${shlibs:Depends}, libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
@@ -345,7 +345,7 @@
Section: libs
Priority: required
Multi-Arch: same
-Depends: ${shlibs:Depends}, libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
@@ -443,7 +443,7 @@
Section: libs
Priority: required
Multi-Arch: same
-Depends: ${shlibs:Depends}, libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2014-08-14 12:05:31 UTC (rev 6224)
+++ glibc-package/trunk/debian/control.in/libc 2014-08-14 12:12:13 UTC (rev 6225)
@@ -3,7 +3,7 @@
Section: libs
Priority: required
Multi-Arch: same
-Depends: ${shlibs:Depends}, libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2014-08-14 12:05:31 UTC (rev 6224)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2014-08-14 12:12:13 UTC (rev 6225)
@@ -180,6 +180,9 @@
# Generate common substvars files.
echo "locale:Depends=$(shell perl debian/debver2localesdep.pl $(LOCALES_DEP_VER))" > tmp.substvars
echo "locale-compat:Depends=$(shell perl debian/debver2localesdep.pl $(LOCALES_COMPAT_VER))" >> tmp.substvars
+ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
+ echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' >> tmp.substvars
+endif
for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \
cp tmp.substvars debian/$$pkg.substvars; \
Reply to: