r5341 - in glibc-package/branches/eglibc-2.16/debian: . rules.d
Author: adconrad
Date: 2012-10-26 01:27:29 +0000 (Fri, 26 Oct 2012)
New Revision: 5341
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk
Log:
Merge WITH_SYSROOT option from Ubuntu
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 01:18:48 UTC (rev 5340)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 01:27:29 UTC (rev 5341)
@@ -357,6 +357,8 @@
* 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.
+ * debian/rules.d/build.mk: If WITH_SYSROOT is passed to debian/rules,
+ then pass --with-headers=$(WITH_SYSROOT)/$(includedir) to the build.
-- Aurelien Jarno <aurel32@debian.org> Wed, 25 Jul 2012 23:45:58 +0200
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 01:18:48 UTC (rev 5340)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-10-26 01:27:29 UTC (rev 5341)
@@ -16,6 +16,10 @@
--enable-hacker-mode
endif
+ifdef WITH_SYSROOT
+ libc_extra_config_options += --with-headers=$(WITH_SYSROOT)/$(includedir)
+endif
+
$(patsubst %,mkbuilddir_%,$(EGLIBC_PASSES)) :: mkbuilddir_% : $(stamp)mkbuilddir_%
$(stamp)mkbuilddir_%: $(stamp)patch $(KERNEL_HEADER_DIR)
@echo Making builddir for $(curpass)
Reply to: