This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] test-container: Install with $(sorted-subdirs) [BZ #24794]


On 25/07/2019 01:03, Tulio Magno Quites Machado Filho wrote:
> Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an
> incomplete list of subdirs based on $(all-subdirs) causing
> testroot.pristine to miss files from nss.
> 
> Tested if the list of files in testroot.pristine remains the same.

fwiw with this patch aarch64 buildbot would go back to green.

> 
> 2019-07-24  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
> 
> 	[BZ #24794]
> 	* Makeconfig (all-subdirs): Improved source comments.
> 	* Makefile (testroot.pristine/install.stamp): Pass
> 	subdirs='$(sorted-subdirs)' to make install.
> ---
>  Makeconfig | 6 +++---
>  Makefile   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Makeconfig b/Makeconfig
> index 0e386fbc19..fd36c58c04 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -1267,9 +1267,9 @@ else
>  libsupport = $(common-objpfx)support/libsupport.a
>  endif
>  
> -# These are the subdirectories containing the library source.  The order
> -# is more or less arbitrary.  The sorting step will take care of the
> -# dependencies.
> +# This is a partial list of subdirectories containing the library source.
> +# The order is more or less arbitrary.  The sorting step will take care of the
> +# dependencies and generate sorted-subdirs dynamically.
>  all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
>  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
>  	      grp pwd posix io termios resource misc socket sysvipc gmon    \
> diff --git a/Makefile b/Makefile
> index 9fbf705200..ac1125853b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -402,7 +402,7 @@ ifeq ($(run-built-tests),yes)
>  	  done
>  endif
>  	$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
> -	  subdirs='$(all-subdirs)'
> +	  subdirs='$(sorted-subdirs)'
>  	touch $(objpfx)testroot.pristine/install.stamp
>  
>  tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
> 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]