r5848 - in glibc-package/branches/eglibc-2.18/debian: . rules.d
Author: aurel32
Date: 2013-12-01 21:20:24 +0000 (Sun, 01 Dec 2013)
New Revision: 5848
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk
Log:
* debian/rules.d/build.mk: define the installation in configparms to avoid
broken glibc makefiles to spuriously trigger install rules trying to
overwrite system headers.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-01 21:03:01 UTC (rev 5847)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-01 21:20:24 UTC (rev 5848)
@@ -169,6 +169,9 @@
* testsuite-checking/expected-results-sparc*-linux-gnu-*: cleanup.
* patches/s390/cvs-s390-tls-got-pointer.diff: new patch from upstream to fix
the TLS GOT pointer setup on s390.
+ * debian/rules.d/build.mk: define the installation in configparms to avoid
+ broken glibc makefiles to spuriously trigger install rules trying to
+ overwrite system headers.
-- Adam Conrad <adconrad@ubuntu.com> Sat, 09 Nov 2013 12:48:20 +0100
Modified: glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk 2013-12-01 21:03:01 UTC (rev 5847)
+++ glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk 2013-12-01 21:20:24 UTC (rev 5848)
@@ -57,6 +57,11 @@
echo "slibdir = $(call xx,slibdir)" >> $(DEB_BUILDDIR)/configparms
echo "rtlddir = $(call xx,rtlddir)" >> $(DEB_BUILDDIR)/configparms
+ # Define the installation directory for all calls to make. This avoid
+ # broken glibc makefiles to spuriously trigger install rules trying to
+ # overwrite system headers.
+ echo "install_root = $(CURDIR)/debian/tmp-$(curpass)" >> $(DEB_BUILDDIR)/configparms
+
# Prevent autoconf from running unexpectedly by setting it to false.
# Also explicitly pass CC down - this is needed to get -m64 on
# Sparc, et cetera.
Reply to: