diff options
Diffstat (limited to 'debian/patches/any/local-test-install.diff')
| -rw-r--r-- | debian/patches/any/local-test-install.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/any/local-test-install.diff b/debian/patches/any/local-test-install.diff index a91d5535..dbb0e6e3 100644 --- a/debian/patches/any/local-test-install.diff +++ b/debian/patches/any/local-test-install.diff @@ -1,16 +1,16 @@ Description: Use install_root for test destination override, not DESTDIR Author: Adam Conrad <adconrad@ubuntu.com> Forwarded: no -Last-Update: 2019-09-16 +Last-Update: 2020-02-08 --- glibc-2.30.orig/Makefile +++ glibc-2.30/Makefile -@@ -418,7 +418,7 @@ ifeq ($(run-built-tests),yes) - $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ - done - endif +@@ -618,7 +618,7 @@ endif + # Setting INSTALL_UNCOMPRESSED causes localedata/Makefile to + # install the charmaps uncompressed, as the testroot does not + # provide a gunzip program. - $(MAKE) install DESTDIR=$(objpfx)testroot.pristine \ + $(MAKE) install install_root=$(objpfx)testroot.pristine \ - subdirs='$(sorted-subdirs)' + INSTALL_UNCOMPRESSED=yes subdirs='$(sorted-subdirs)' + rm -f $(symbolic-link-list) touch $(objpfx)testroot.pristine/install.stamp - |