Package: src:eglibc Version: 2.19-3 Severity: wishlist Tags: patch User: helm...@debian.org Usertags: rebootstrap
Dear eglibc maintainers, You asked me to prepare a patch that maps the "old" ways of selecting bootstrap stages to the current build profile specification (https://wiki.debian.org/BuildProfileSpec). I therefore prepared the attached patch. It keeps supporting the following environment variables: * DEB_STAGE=stage1 * DEB_BUILD_PROFILE=bootstrap It selects the original behaviour of DEB_BUILD_PROFILE=bootstrap and implements it as DEB_BUILD_PROFILES=stage1 (in accordance with the above specification). The code for the original DEB_STAGE=stage1 is dropped. This patch does not yet annotate Build-Depends with build profiles, because that would prevent the package from being uploaded due to #744246. Helmut
diff -Nru eglibc-2.19/debian/changelog eglibc-2.19/debian/changelog --- eglibc-2.19/debian/changelog 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/changelog 2014-06-18 17:06:15.000000000 +0200 @@ -1,3 +1,11 @@ +eglibc (2.19-3.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Rename the bootstrap stage to DEB_BUILD_PROFILES=stage1 to conform with + https://wiki.debian.org/BuildProfileSpec. Closes: #-1 + + -- Helmut Grohne <hel...@subdivi.de> Wed, 18 Jun 2014 17:05:21 +0200 + eglibc (2.19-3) unstable; urgency=medium [ Aurelien Jarno ] diff -Nru eglibc-2.19/debian/control.in/amd64 eglibc-2.19/debian/control.in/amd64 --- eglibc-2.19/debian/control.in/amd64 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/amd64 2014-06-24 00:01:51.000000000 +0200 @@ -4,6 +4,7 @@ Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} Conflicts: amd64-libs (<= 1.2) +Build-Profiles: !stage1 Description: Embedded GNU C Library: 64bit Shared libraries for AMD64 This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the 64bit version diff -Nru eglibc-2.19/debian/control.in/armel eglibc-2.19/debian/control.in/armel --- eglibc-2.19/debian/control.in/armel 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/armel 2014-06-24 00:02:05.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: ARM softfp shared libraries for armhf This package includes shared versions of the standard C library and the standard math library, as well as many others. diff -Nru eglibc-2.19/debian/control.in/armhf eglibc-2.19/debian/control.in/armhf --- eglibc-2.19/debian/control.in/armhf 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/armhf 2014-06-24 00:02:18.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: ARM hard float shared libraries for armel This package includes shared versions of the standard C library and the standard math library, as well as many others. diff -Nru eglibc-2.19/debian/control.in/i386 eglibc-2.19/debian/control.in/i386 --- eglibc-2.19/debian/control.in/i386 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/i386 2014-06-24 00:02:24.000000000 +0200 @@ -5,6 +5,7 @@ Depends: libc6 (= ${binary:Version}), ${misc:Depends} Replaces: libc6-dev-i386 Breaks: fakeroot (<< 1.12.3), gnu-efi (<< 3.0e-3), fakechroot (<< 2.9-1.1), fglrx-glx-ia32 (<< 1:9-6-1), ia32-libs (<< 20090804), ia32-libs-gtk (<< 20090804), lib32asound2 (<< 1.0.20-3), lib32asound2-dev (<< 1.0.20-3), lib32bz2-1.0 (<< 1.0.5-3), lib32bz2-dev (<< 1.0.5-3), lib32ffi-dev (<< 3.0.9~rc9-1), lib32ffi5 (<< 3.0.9~rc9-1), lib32g2c0 (<< 1:3.4.6-10), lib32gcc1 (<< 1:4.4.0-7), lib32gfortran3 (<< 4.4.0-7), lib32gmp3 (<< 2:4.3.1+dfsg-3), lib32gmp3-dev (<< 2:4.3.1+dfsg-3), lib32gmpxx4 (<< 2:4.3.1+dfsg-3), lib32gomp1 (<< 4.4.0-7), lib32icu-dev (<< 4.0.1-3), lib32icu40 (<< 4.0.1-3), lib32mudflap0 (<< 4.4.0-7), lib32ncurses5 (<< 5.7+20090523-1), lib32ncurses5-dev (<< 5.7+20090530-1), lib32ncursesw5 (<< 5.7+20090530-1), lib32ncursesw5-dev (<< 5.7+20090530-1), lib32nss-mdns (<< 0.10-3.1), lib32objc2 (<< 4.4.0-7), lib32readline5 (<< 5.2-5), lib32readline5-dev (<< 5.2-5), lib32stdc++6 (<< 4.4.0-7), lib32stdc++6-4.4-dbg (<< 4.4.0-7), lib32z1 (<< 1:1.2.3.3.dfsg-14), lib32z1-dev (<< 1:1.2.3.3.dfsg-14), libc6-dev-i386 (<< 2.9-15), nvidia-glx-ia32 (<< 185.18.14-2), nvidia-libvdpau1-ia32 (<< 185.18.14-2) +Build-Profiles: !stage1 Description: Embedded GNU C Library: 32-bit shared libraries for AMD64 This package includes shared versions of the standard C library and the standard math library, as well as many others. diff -Nru eglibc-2.19/debian/control.in/kfreebsd-i386 eglibc-2.19/debian/control.in/kfreebsd-i386 --- eglibc-2.19/debian/control.in/kfreebsd-i386 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/kfreebsd-i386 2014-06-24 00:02:29.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc0.1 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 32bit shared libraries for AMD64 This package includes shared versions of the standard C library and the standard math library, as well as many others. diff -Nru eglibc-2.19/debian/control.in/libc eglibc-2.19/debian/control.in/libc --- eglibc-2.19/debian/control.in/libc 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/libc 2014-06-24 00:02:56.000000000 +0200 @@ -21,6 +21,7 @@ libc6-mipsn32 [mipsn32 mipsn32el], libc6-mips32 [mips mipsel], hurd (<< 20120408-3) [hurd-i386] +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C library @@ -49,6 +50,7 @@ Multi-Arch: same Provides: libc-dbg Depends: @libc@ (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: detached debugging symbols This package contains the detached debugging symbols for the GNU C library. @@ -59,6 +61,7 @@ Priority: extra Multi-Arch: same Depends: @libc@ (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Profiling Libraries Static libraries compiled with profiling info (-pg) suitable for use with gprof. @@ -71,6 +74,7 @@ Conflicts: libc-pic Provides: libc-pic, glibc-pic Depends: @libc@ (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: PIC archive library Contains an archive library (ar file) composed of individual shared objects. This is used for creating a library which is a smaller subset of the @@ -83,6 +87,7 @@ Section: debian-installer Priority: extra Provides: @libc@, libc-udeb, ${locale-compat:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries - udeb Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C library diff -Nru eglibc-2.19/debian/control.in/libnss-dns-udeb eglibc-2.19/debian/control.in/libnss-dns-udeb --- eglibc-2.19/debian/control.in/libnss-dns-udeb 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/libnss-dns-udeb 2014-06-24 00:02:59.000000000 +0200 @@ -3,6 +3,7 @@ Architecture: any Section: debian-installer Priority: extra +Build-Profiles: !stage1 Description: Embedded GNU C Library: NSS helper for DNS - udeb Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C library diff -Nru eglibc-2.19/debian/control.in/libnss-files-udeb eglibc-2.19/debian/control.in/libnss-files-udeb --- eglibc-2.19/debian/control.in/libnss-files-udeb 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/libnss-files-udeb 2014-06-24 00:03:02.000000000 +0200 @@ -3,6 +3,7 @@ Architecture: any Section: debian-installer Priority: extra +Build-Profiles: !stage1 Description: Embedded GNU C Library: NSS helper for files - udeb Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C library diff -Nru eglibc-2.19/debian/control.in/main eglibc-2.19/debian/control.in/main --- eglibc-2.19/debian/control.in/main 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/main 2014-06-24 00:03:36.000000000 +0200 @@ -27,6 +27,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, hurd (>= 20070606-1+SVN) [hurd-i386] Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10) Replaces: libc0.1, libc0.3, libc6, libc6.1 +Build-Profiles: !stage1 Description: Embedded GNU C Library: Binaries This package contains utility programs related to the GNU C Library. . @@ -46,6 +47,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: manpages-dev Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev +Build-Profiles: !stage1 Description: Embedded GNU C Library: Development binaries This package contains utility programs related to the GNU C Library development package. @@ -57,6 +59,7 @@ Multi-Arch: foreign Depends: ${misc:Depends} Suggests: glibc-doc-reference +Build-Profiles: !stage1 Description: Embedded GNU C Library: Documentation Contains man pages for libpthread functions and the complete GNU C Library ChangeLog. The GNU C Library Reference manual has been moved into @@ -69,6 +72,7 @@ Multi-Arch: foreign Depends: ${misc:Depends} Recommends: xz-utils +Build-Profiles: !stage1 Description: Embedded GNU C Library: sources This package contains the sources and patches which are needed to build eglibc. @@ -80,6 +84,7 @@ Depends: ${locale:Depends}, ${misc:Depends}, debconf | debconf-2.0 Conflicts: base-config, belocs-locales-bin, belocs-locales-data Replaces: base-config, lliurex-belocs-locales-data +Build-Profiles: !stage1 Description: Embedded GNU C Library: National Language (locale) data [support] Machine-readable data files, shared objects and programs used by the C library for localization (l10n) and internationalization (i18n) support. @@ -99,6 +104,7 @@ Depends: ${locale:Depends}, ${misc:Depends} Breaks: locales (<< 2.13-17) Provides: locales +Build-Profiles: !stage1 Description: Embedded GNU C Library: Precompiled locale data This package contains the precompiled locale data for all supported locales. A better alternative is to install the locales package and only select @@ -111,6 +117,7 @@ Multi-Arch: foreign Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Name Service Cache Daemon A daemon which handles passwd, group and host lookups for running programs and caches the results for the next @@ -129,6 +136,7 @@ libc0.3 (>= 2.13-5) [hurd-i386], libc0.1 (>= 2.13-5) [kfreebsd-i386], Priority: required +Build-Profiles: !stage1 Description: Transitional package to ensure multiarch compatibility This is a transitional package used to ensure multiarch support is present in ld.so before unpacking libraries to the multiarch directories. It can diff -Nru eglibc-2.19/debian/control.in/mips32 eglibc-2.19/debian/control.in/mips32 --- eglibc-2.19/debian/control.in/mips32 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/mips32 2014-06-24 00:03:46.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: o32 Shared libraries for MIPS This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the o32 version diff -Nru eglibc-2.19/debian/control.in/mips64 eglibc-2.19/debian/control.in/mips64 --- eglibc-2.19/debian/control.in/mips64 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/mips64 2014-06-24 00:03:49.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 64bit Shared libraries for MIPS64 This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the 64bit version diff -Nru eglibc-2.19/debian/control.in/mipsn32 eglibc-2.19/debian/control.in/mipsn32 --- eglibc-2.19/debian/control.in/mipsn32 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/mipsn32 2014-06-24 00:03:52.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: n32 Shared libraries for MIPS64 This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the n32 version diff -Nru eglibc-2.19/debian/control.in/opt eglibc-2.19/debian/control.in/opt --- eglibc-2.19/debian/control.in/opt 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/opt 2014-06-24 00:04:16.000000000 +0200 @@ -5,6 +5,7 @@ Multi-Arch: same Pre-Depends: libc6 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries [i686 optimized] Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C @@ -23,6 +24,7 @@ Multi-Arch: same Pre-Depends: libc6 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries [Xen version] Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C @@ -38,6 +40,7 @@ Multi-Arch: same Pre-Depends: libc0.1 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries [i686 optimized] Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C @@ -56,6 +59,7 @@ Multi-Arch: same Pre-Depends: libc0.3 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries [i686 optimized] Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C @@ -74,6 +78,7 @@ Multi-Arch: same Pre-Depends: libc0.3 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries [Xen version] Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C @@ -89,6 +94,7 @@ Multi-Arch: same Pre-Depends: libc6.1 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries (EV67 optimized) Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C @@ -105,6 +111,7 @@ Multi-Arch: same Pre-Depends: libc6 (= ${binary:Version}) Depends: ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: Shared libraries (Loongson 2F optimized) Contains the standard libraries that are used by nearly all programs on the system. This package includes shared versions of the standard C diff -Nru eglibc-2.19/debian/control.in/powerpc eglibc-2.19/debian/control.in/powerpc --- eglibc-2.19/debian/control.in/powerpc 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/powerpc 2014-06-24 00:04:20.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 32bit powerpc shared libraries for ppc64 This package includes shared versions of the standard C library and the standard math library, as well as many others. diff -Nru eglibc-2.19/debian/control.in/ppc64 eglibc-2.19/debian/control.in/ppc64 --- eglibc-2.19/debian/control.in/ppc64 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/ppc64 2014-06-24 00:04:23.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 64bit Shared libraries for PowerPC64 This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the 64bit version diff -Nru eglibc-2.19/debian/control.in/s390 eglibc-2.19/debian/control.in/s390 --- eglibc-2.19/debian/control.in/s390 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/s390 2014-06-24 00:04:26.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 32bit Shared libraries for IBM zSeries This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the 32bit version diff -Nru eglibc-2.19/debian/control.in/sparc eglibc-2.19/debian/control.in/sparc --- eglibc-2.19/debian/control.in/sparc 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/sparc 2014-06-24 00:04:29.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 32bit Shared libraries for SPARC This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the 32bit version diff -Nru eglibc-2.19/debian/control.in/sparc64 eglibc-2.19/debian/control.in/sparc64 --- eglibc-2.19/debian/control.in/sparc64 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/sparc64 2014-06-24 00:04:32.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: 64bit Shared libraries for UltraSPARC This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the 64bit version diff -Nru eglibc-2.19/debian/control.in/x32 eglibc-2.19/debian/control.in/x32 --- eglibc-2.19/debian/control.in/x32 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/control.in/x32 2014-06-24 00:04:38.000000000 +0200 @@ -3,6 +3,7 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Build-Profiles: !stage1 Description: Embedded GNU C Library: X32 ABI Shared libraries for AMD64 This package includes shared versions of the standard C library and the standard math library, as well as many others. This is the X32 ABI version diff -Nru eglibc-2.19/debian/rules eglibc-2.19/debian/rules --- eglibc-2.19/debian/rules 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/rules 2014-06-18 17:17:27.000000000 +0200 @@ -137,11 +137,16 @@ # Some architectures don't get libc-profile ported right away: no_libc_profile := -# Provide backward compatibility for the old DEB_STAGE for now +# Provide backward compatibility for the old DEB_STAGE and DEB_BUILD_PROFILE for now ifeq ($(DEB_STAGE),stage1) - DEB_BUILD_PROFILE = bootstrap -endif + DEB_BUILD_PROFILES+=stage1 +else ifeq ($(DEB_BUILD_PROFILE),bootstrap) + DEB_BUILD_PROFILES+=stage1 +endif +endif + +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) DEB_ARCH_REGULAR_PACKAGES = $(libc)-dev DEB_INDEP_REGULAR_PACKAGES = DEB_UDEB_PACKAGES = @@ -190,7 +195,7 @@ NODEBUG_libc6-mips64 = 1 NODEBUG_nscd = 1 -ifneq ($(DEB_BUILD_PROFILE),bootstrap) +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) ifeq ($(threads),yes) DEB_ARCH_REGULAR_PACKAGES += nscd endif diff -Nru eglibc-2.19/debian/rules.d/build.mk eglibc-2.19/debian/rules.d/build.mk --- eglibc-2.19/debian/rules.d/build.mk 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/rules.d/build.mk 2014-06-18 17:18:58.000000000 +0200 @@ -11,7 +11,7 @@ (exec 3>&1; exit `( ( ( $(2) ) 2>&1 3>&-; echo $$? >&4) | tee $(1) >&3) 4>&1`) endef -ifeq ($(DEB_BUILD_PROFILE),bootstrap) +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) libc_extra_config_options = $(extra_config_options) --disable-sanity-checks \ --enable-hacker-mode endif @@ -99,7 +99,7 @@ $(stamp)build_%: $(stamp)configure_% @echo Building $(curpass) -ifeq ($(DEB_BUILD_PROFILE),bootstrap) +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) $(MAKE) cross-compiling=yes -C $(DEB_BUILDDIR) $(NJOBS) csu/subdir_lib else $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS)) @@ -158,7 +158,7 @@ $(stamp)install_%: $(stamp)check_% @echo Installing $(curpass) rm -rf $(CURDIR)/debian/tmp-$(curpass) -ifeq ($(DEB_BUILD_PROFILE),bootstrap) +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) \ cross-compiling=yes install_root=$(CURDIR)/debian/tmp-$(curpass) \ install-bootstrap-headers=yes install-headers ) diff -Nru eglibc-2.19/debian/rules.d/debhelper.mk eglibc-2.19/debian/rules.d/debhelper.mk --- eglibc-2.19/debian/rules.d/debhelper.mk 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/rules.d/debhelper.mk 2014-06-18 17:18:28.000000000 +0200 @@ -184,7 +184,7 @@ touch $@ -ifeq ($(DEB_BUILD_PROFILE),bootstrap) +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) $(patsubst %,debhelper_%,$(EGLIBC_PASSES)) :: debhelper_% : $(stamp)debhelper_% $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_% libdir=$(call xx,libdir) ; \ diff -Nru eglibc-2.19/debian/rules.d/stage1.mk eglibc-2.19/debian/rules.d/stage1.mk --- eglibc-2.19/debian/rules.d/stage1.mk 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/rules.d/stage1.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -## This reuses various macros from the debian/rules.d/build.mk file - -ifeq ($(DEB_STAGE),stage1) - -override EGLIBC_PASSES = libc -override DEB_ARCH_REGULAR_PACKAGES = $(libc)-dev -override DEB_INDEP_REGULAR_PACKAGES = -override DEB_UDEB_PACKAGES = - -## Development libraries we need to fake -stage1_libfake.so := \ - libc.so - -stage1_libfake.a := \ - libanl.a \ - libBrokenLocale.a \ - libc.a \ - libc_nonshared.a \ - libcrypt.a \ - libdl.a \ - libg.a \ - libieee.a \ - libm.a \ - libmcheck.a \ - libnsl.a \ - libpthread.a \ - libpthread_nonshared.a \ - libresolv.a \ - librpcsvc.a \ - librt.a \ - libutil.a \ - -$(stamp)build_libc: $(stamp)configure_libc - @echo Building $(curpass) - @## Build the crtX.o init routines - $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) csu/subdir_lib) - $(call logme, -a $(log_build), $(AR) qcs $(DEB_BUILDDIR)/libfake.a) - $(call logme, -a $(log_build), $(CC) -nostdlib -nostartfiles -shared \ - -o $(DEB_BUILDDIR)/libfake.so $(DEB_BUILDDIR)/libfake.a) - $(call logme, -a $(log_build), echo "---------------" ; echo -n "Build ended: " ; date --rfc-2822) - touch $@ - -$(stamp)check_libc: $(stamp)build_libc - @echo Nothing to test for $(curpass) - touch $@ - -$(stamp)install_libc: DESTDIR=$(CURDIR)/debian/tmp-$(curpass) -$(stamp)install_libc: $(stamp)check_libc - @echo Installing $(curpass) - rm -rf $(CURDIR)/debian/tmp-$(curpass) - ## These libc/ld-linux binaries are total garbage, but they allow - ## a subsequent stage2 GCC build to succeed. - install -d $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) - for lib_a in $(stage1_libfake.a); do \ - install -T $(DEB_BUILDDIR)/libfake.a $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/$$lib_a; \ - done - for lib_so in $(stage1_libfake.so); do \ - install -T $(DEB_BUILDDIR)/libfake.so $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/$$lib_so; \ - done - $(MAKE) -C $(DEB_BUILDDIR) install_root=$(DESTDIR) install-bootstrap-headers=yes \ - csu/subdir_install install-headers - mkdir -p $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - mv $(DESTDIR)/usr/include/bits $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - mv $(DESTDIR)/usr/include/gnu $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - mv $(DESTDIR)/usr/include/sys $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - mv $(DESTDIR)/usr/include/fpu_control.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - mv $(DESTDIR)/usr/include/a.out.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - mv $(DESTDIR)/usr/include/ieee754.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH) - $(call xx,extra_install) - touch $@ - -endif diff -Nru eglibc-2.19/debian/sysdeps/linux.mk eglibc-2.19/debian/sysdeps/linux.mk --- eglibc-2.19/debian/sysdeps/linux.mk 2014-06-17 18:58:21.000000000 +0200 +++ eglibc-2.19/debian/sysdeps/linux.mk 2014-06-18 17:18:39.000000000 +0200 @@ -9,7 +9,7 @@ threads = yes libc_add-ons = nptl $(add-ons) -ifeq ($(DEB_BUILD_PROFILE),bootstrap) +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) libc_extra_config_options = $(extra_config_options) else libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options)