r5446 - in glibc-package/branches/eglibc-2.17/debian: . control.in rules.d
Author: adconrad
Date: 2013-01-23 05:35:28 +0000 (Wed, 23 Jan 2013)
New Revision: 5446
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/control
glibc-package/branches/eglibc-2.17/debian/control.in/libc
glibc-package/branches/eglibc-2.17/debian/rules
glibc-package/branches/eglibc-2.17/debian/rules.d/control.mk
Log:
debian/{rules,rules.d/control.mk,control.in/libc}: Allow turning off
libc-prof arbitrarily, and disable it for arm64, which lacks support.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 01:27:18 UTC (rev 5445)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-23 05:35:28 UTC (rev 5446)
@@ -1,5 +1,6 @@
eglibc (2.17-0experimental0) UNRELEASED; urgency=low
+ [ Adam Conrad ]
* New upstream release: version 2.17, orig tarball built at SVN r22169:
- Restricts ld.so self-loading checks to normal mode (LP: #1088677)
- debian/rules.d/tarball.mk: ports is no longer external to libc.
@@ -64,6 +65,10 @@
* debian/patches/any/unsubmitted-tst-array-as-needed.diff: Fix tst-array2
and tst-array5 to build with --no-as-needed to prevent test regression.
+ [ Matthias Klose ]
+ * debian/{rules,rules.d/control.mk,control.in/libc}: Allow turning off
+ libc-prof arbitrarily, and disable it for arm64, which lacks support.
+
-- Adam Conrad <adconrad@0c3.net> Mon, 26 Nov 2012 02:20:40 -0700
eglibc (2.16-0experimental1) experimental; urgency=low
Modified: glibc-package/branches/eglibc-2.17/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/control 2013-01-23 01:27:18 UTC (rev 5445)
+++ glibc-package/branches/eglibc-2.17/debian/control 2013-01-23 05:35:28 UTC (rev 5446)
@@ -189,7 +189,7 @@
library.
Package: libc6-prof
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4 x32
Section: libdevel
Priority: extra
Multi-Arch: same
Modified: glibc-package/branches/eglibc-2.17/debian/control.in/libc
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/control.in/libc 2013-01-23 01:27:18 UTC (rev 5445)
+++ glibc-package/branches/eglibc-2.17/debian/control.in/libc 2013-01-23 05:35:28 UTC (rev 5446)
@@ -51,7 +51,7 @@
library.
Package: @libc@-prof
-Architecture: @archs@
+Architecture: @parchs@
Section: libdevel
Priority: extra
Multi-Arch: same
Modified: glibc-package/branches/eglibc-2.17/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/rules 2013-01-23 01:27:18 UTC (rev 5445)
+++ glibc-package/branches/eglibc-2.17/debian/rules 2013-01-23 05:35:28 UTC (rev 5446)
@@ -134,6 +134,9 @@
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
+# Some architectures don't get libc-profile ported right away:
+no_libc_profile := arm64
+
# Provide backward compatibility for the old DEB_STAGE for now
ifeq ($(DEB_STAGE),stage1)
DEB_BUILD_PROFILE = bootstrap
@@ -143,7 +146,10 @@
DEB_INDEP_REGULAR_PACKAGES =
DEB_UDEB_PACKAGES =
else
- DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin multiarch-support
+ DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-pic libc-bin libc-dev-bin multiarch-support
+ ifeq (,$(filter $(DEB_HOST_ARCH),$(no_libc_profile)))
+ DEB_ARCH_REGULAR_PACKAGES += $(libc)-prof
+ endif
DEB_INDEP_REGULAR_PACKAGES = glibc-doc eglibc-source locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
## Locales can only be pre-generated during native compiles
Modified: glibc-package/branches/eglibc-2.17/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/rules.d/control.mk 2013-01-23 01:27:18 UTC (rev 5445)
+++ glibc-package/branches/eglibc-2.17/debian/rules.d/control.mk 2013-01-23 05:35:28 UTC (rev 5446)
@@ -9,6 +9,7 @@
$(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
sed -e "s%@libc@%$*%g" \
-e "s%@archs@%$($(subst .,_,$*)_archs)%g" \
+ -e "s%@parchs@%$(filter-out $(no_libc_profile),$($(subst .,_,$*)_archs))%g" \
-e "s%@libc-dev-conflict@%$(foreach arch,$(filter-out $*,$(libc_packages)),$(arch)-dev,)%g" \
< $< > $@
Reply to: