r5340 - in glibc-package/branches/eglibc-2.16/debian: . rules.d
Author: adconrad
Date: 2012-10-26 01:18:48 +0000 (Fri, 26 Oct 2012)
New Revision: 5340
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/rules
glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk
Log:
Make DEB_BUILD_PROFILE=bootstrap support more complete
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 00:47:33 UTC (rev 5339)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 01:18:48 UTC (rev 5340)
@@ -355,6 +355,8 @@
* Move ldconfig to ldconfig.real, install ldconfig wrapper, and set up
a dpkg trigger for libc-bin to avoid excessive calls to ldconfig
* Don't build nscd during when doing a bootstrap DEB_BUILD_PROFILE
+ * Make our DEB_BUILD_PROFILE=bootstrap support look more like Ubuntu's
+ previously known-working DEB_STAGE=stage1 support for the time being.
-- Aurelien Jarno <aurel32@debian.org> Wed, 25 Jul 2012 23:45:58 +0200
Modified: glibc-package/branches/eglibc-2.16/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules 2012-10-26 00:47:33 UTC (rev 5339)
+++ glibc-package/branches/eglibc-2.16/debian/rules 2012-10-26 01:18:48 UTC (rev 5340)
@@ -135,20 +135,19 @@
curpass = $(filter-out %_,$(subst _,_ ,$@))
ifeq ($(DEB_BUILD_PROFILE),bootstrap)
-DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev libc-bin libc-dev-bin multiarch-support
-DEB_INDEP_REGULAR_PACKAGES = eglibc-source
-DEB_UDEB_PACKAGES =
+ DEB_ARCH_REGULAR_PACKAGES = $(libc)-dev
+ 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_INDEP_REGULAR_PACKAGES = glibc-doc eglibc-source locales
-DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
+ DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin multiarch-support
+ 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
+ ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+ DEB_ARCH_REGULAR_PACKAGES += locales-all
+ endif
endif
-## Locales can only be pre-generated during native compiles
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-DEB_ARCH_REGULAR_PACKAGES += locales-all
-endif
-
# Generic kernel version check
define kernel_check
(if [ $(CURRENT_KERNEL_VERSION) -lt $(1) ]; then \
Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-10-26 00:47:33 UTC (rev 5339)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-10-26 01:18:48 UTC (rev 5340)
@@ -11,6 +11,10 @@
(exec 3>&1; exit `( ( ( $(2) ) 2>&1 3>&-; echo $$? >&4) | tee $(1) >&3) 4>&1`)
endef
+ifeq ($(DEB_BUILD_PROFILE),bootstrap)
+ libc_extra_config_options = $(extra_config_options) --disable-sanity-checks \
+ --enable-hacker-mode
+endif
$(patsubst %,mkbuilddir_%,$(EGLIBC_PASSES)) :: mkbuilddir_% : $(stamp)mkbuilddir_%
$(stamp)mkbuilddir_%: $(stamp)patch $(KERNEL_HEADER_DIR)
@@ -83,6 +87,10 @@
$(patsubst %,build_%,$(EGLIBC_PASSES)) :: build_% : $(stamp)build_%
$(stamp)build_%: $(stamp)configure_%
@echo Building $(curpass)
+
+ifeq ($(DEB_BUILD_PROFILE),bootstrap)
+ $(MAKE) cross-compiling=yes -C $(DEB_BUILDDIR) $(NJOBS) csu/subdir_lib
+else
$(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS))
$(call logme, -a $(log_build), echo "---------------" ; echo -n "Build ended: " ; date --rfc-2822)
if [ $(curpass) = libc ]; then \
@@ -92,6 +100,7 @@
$(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) \
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/build-tree/locales-all \
localedata/install-locales; \
+ sync; \
cd $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \
fdupes -1 -H -q -R . | while read line ; do \
set -- $${line} ; \
@@ -105,6 +114,7 @@
done ; \
done ; \
fi
+endif
touch $@
$(patsubst %,check_%,$(EGLIBC_PASSES)) :: check_% : $(stamp)check_%
@@ -143,6 +153,22 @@
$(stamp)install_%: $(stamp)check_%
@echo Installing $(curpass)
rm -rf $(CURDIR)/debian/tmp-$(curpass)
+ifeq ($(DEB_BUILD_PROFILE),bootstrap)
+ $(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 )
+
+ install -d $(CURDIR)/debian/tmp-$(curpass)/lib
+ install -m 644 $(DEB_BUILDDIR)/csu/crt[1in].o $(CURDIR)/debian/tmp-$(curpass)/lib
+ ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+ -o $(CURDIR)/debian/tmp-$(curpass)/lib/libc.so
+else
+ case "$(curpass)" in \
+ armhf) \
+ cp -p /lib/arm-linux-gnueabihf/libgcc_s.so.1 $(DEB_BUILDDIR)/ ;; \
+ armel) \
+ cp -p /lib/arm-linux-gnueabi/libgcc_s.so.1 $(DEB_BUILDDIR)/ ;; \
+ esac
$(MAKE) -C $(DEB_BUILDDIR) \
install_root=$(CURDIR)/debian/tmp-$(curpass) install
@@ -223,6 +249,7 @@
fi
$(call xx,extra_install)
+endif
touch $@
$(stamp)doc: $(stamp)patch
Reply to: