mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	($(all-subdirs-targets)): Use it in place of -C option. * Rules: Use $(..) instead of ../ if it's already defined. * Makeconfig (subdir-srcdirs): New variable. * csu/Makefile (all-Banner-files): Use it. * configure.in (--enable-add-ons): Set to "yes" by default. Handle absolute add-on directory names when looking for configure fragments. Also look for sysdeps/*/preconfigure fragments in add-ons. Require add-on configure to set $libc_add_on_canonical, use that in $add_ons_sfx. Substitute add_on_subdirs with computed list of subdir names each add-on configure set in libc_add_on_subdirs. * configure: Regenerated. * Makefile (%/preconfigure: %/preconfigure.in): New pattern rule. * config.make.in (add-on-subdirs): New substituted variable. * Makeconfig (all-subdirs): Include $(add-on-subdirs). Remove $(add-ons), $(sysdep-subdirs). Don't filter out $(sysdep-inhibit-subdirs). ($(common-objpfx)sysd-dirs): Target removed. Don't include it. ($(common-objpfx)sysd-sorted): Rewritten to feed Depend and Subdirs files together to gen-sorted.awk, and $(subdirs) via -v. (subdirs): Remove magic reordering for mach and hurd. * scripts/gen-sorted.awk: Use subdirs from command line. Process Subdirs and Depend files directly. Let Subdirs files use "first dir" and "inhibit dir". Always move elf to the end of the list. * hurd/Depend: New file. * sysdeps/mach/Subdirs: Use "first mach". * Makefile (dist-separate): Remove linuxthreads. (dist-separate-linuxthreads): Variable removed. (glibc-%.tar rule): Use $(sysdeps-add-ons). * Makerules ($(common-objpfx)Versions.v.i): Use $(subdirs), not $(all-subdirs). (sysdep-makefiles): Use $(sysdirs). (sysdirs): Remove export. ($(+sysdir_pfx)sysd-rules): Handle absolute directory names in $(config-sysdirs). (+sysdir_pfx): Variable removed. (sysd-rules): Use $(common-objpfx) in place of it. (sysdirs): Variable moved to ... * Makeconfig (sysdirs): ... here. Handle absolute directory names in $(config-sysdirs). (full_config_sysdirs): Variable removed. * csu/Makefile: Use $(sysdirs) in vpath directive. * math/Makefile (ulps-file): Use $(sysdirs). * sysdeps/gnu/Makefile (errlist-c): Likewise. ($(objpfx)errlist-compat.c): Likewise. * Makeconfig (all-Subdirs-files): Likewise. ($(common-objpfx)config.status): Likewise. * configure.in (sysnames): Handle absolute add-on directory names. (sysdeps_add_ons): New variable, AC_SUBST it. Compute which add-ons contributed sysdeps directories. * configure: Regenerated. * config.make.in (sysdeps-add-ons): New substituted variable. * Makerules (+sysdep_dirs, +sysdep-includes): Variables moved ... * Makeconfig: ... to here. (+sysdep_dirs): Append $(sysdeps-add-ons) here. (+includes): Remove $(objpfx) include, already in $(+sysdep_dirs). Remove $(includes). (sysdep-makeconfigs): Use $(+sysdep_dirs). ($(common-objpfx)shlib-versions.v.i): Likewise. * Makeconfig: Remove hair to set Makeconfig-add-on. * sysdeps/unix/Makefile (sysdirs): Remove export. (asm_CPP): Variable removed. ($(common-objpfx)sysd-syscalls): Pass them directly for the script. * sysdeps/posix/Makefile: New file. * Makerules (L_tmpnam, TMP_MAX, L_ctermid, L_cuserid): Set non-posix values here with ?=. * stdlib/gen-mpn-copy: File removed. * stdlib/Makefile (distribute): Remove it. * configure.in: Don't grok --with-gmp. * configure: Regenerated. * configure.in (libc_cv_idn): Don't check it; libidn/configure does it. * configure: Regenerated. * bare: Directory removed, saved in ports repository.
		
			
				
	
	
		
			140 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			Awk
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			140 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			Awk
		
	
	
		
			Executable File
		
	
	
	
	
| #! /usr/bin/awk -f
 | |
| # Generate sorted list of directories.  The sorting is stable but with
 | |
| # dependencies between directories resolved by moving dependees in front.
 | |
| # (C) Copyright 1998 Free Software Foundation, Inc.
 | |
| # Written by Ulrich Drepper <drepper@cygnus.com>, 1998.
 | |
| 
 | |
| BEGIN {
 | |
|   cnt = split(subdirs, all) + 1
 | |
|   dnt = 0
 | |
| }
 | |
| 
 | |
| # Let input files have comments.
 | |
| { sub(/[ 	]*#.*$/, "") }
 | |
| NF == 0 { next }
 | |
| 
 | |
| {
 | |
|   subdir = type = FILENAME;
 | |
|   sub(/^.*\//, "", type);
 | |
|   sub(/\/[^/]+$/, "", subdir);
 | |
|   sub(/^.*\//, "", subdir);
 | |
|   thisdir = "";
 | |
| }
 | |
| 
 | |
| type == "Depend" && NF == 1 {
 | |
|   from[dnt] = subdir;
 | |
|   to[dnt] = $1;
 | |
|   ++dnt;
 | |
|   next
 | |
| }
 | |
| 
 | |
| type == "Subdirs" && NF == 1 { thisdir = $1 }
 | |
| 
 | |
| type == "Subdirs" && NF == 2 && $1 == "first" {
 | |
|   thisdir = $2;
 | |
|   # Make the first dir in the list depend on this one.
 | |
|   from[dnt] = all[1];
 | |
|   to[dnt] = thisdir;
 | |
|   ++dnt;
 | |
| }
 | |
| 
 | |
| type == "Subdirs" && NF == 2 && $1 == "inhibit" {
 | |
|   inhibit[$2] = subdir;
 | |
|   next
 | |
| }
 | |
| 
 | |
| type == "Subdirs" && thisdir {
 | |
|   all[cnt++] = thisdir;
 | |
| 
 | |
|   if (FILENAME ~ (srcpfx ? /^\.\.\/sysdeps\// : /^sysdeps\//) \
 | |
|       || system("test -d " srcpfx thisdir) == 0) {
 | |
|     # This Subdirs file is in the main source tree,
 | |
|     # or this subdirectory exists in the main source tree.
 | |
|     this_srcdir = srcpfx thisdir
 | |
|   }
 | |
|   else {
 | |
|     # The Subdirs file comes from an add-on that should have the subdirectory.
 | |
|     dir = FILENAME;
 | |
|     do
 | |
|       sub(/\/[^/]+$/, "", dir);
 | |
|     while (dir !~ /\/sysdeps$/);
 | |
|     sub(/\/sysdeps$/, "", dir);
 | |
|     if (system("test -d " dir "/" thisdir) == 0)
 | |
|       dir = dir "/" thisdir;
 | |
|     else {
 | |
|       sub(/\/[^/]+$/, "", dir);
 | |
|       if (system("test -d " dir "/" thisdir) == 0)
 | |
|         dir = dir "/" thisdir;
 | |
|       else {
 | |
| 	print FILENAME ":" FNR ":", "cannot find", thisdir > "/dev/stderr";
 | |
| 	exit 2
 | |
|       }
 | |
|     }
 | |
|     file = dir "/Depend";
 | |
|     if (srcpfx)
 | |
|       sub(/^\.\.\//, "", dir);
 | |
|     if (dir !~ /^\/.*$/)
 | |
|       dir = "$(..)" dir;
 | |
|     print thisdir "-srcdir", ":=", dir;
 | |
|   }
 | |
|   file = this_srcdir "/Depend";
 | |
|   if (system("test -f " file) == 0) {
 | |
|     ARGV[ARGC++] = file;
 | |
|     # Emit a dependency on the implicitly-read file.
 | |
|     if (srcpfx)
 | |
|       sub(/^\.\.\//, "", file);
 | |
|     if (file !~ /^\/.*$/)
 | |
|       file = "$(..)" file;
 | |
|     print "$(common-objpfx)sysd-sorted:", "$(wildcard", file ")";
 | |
|   }
 | |
|   next
 | |
| }
 | |
| 
 | |
| {
 | |
|   print FILENAME ":" FNR ":", "what type of file is this?" > "/dev/stderr";
 | |
|   exit 2
 | |
| }
 | |
| 
 | |
| END {
 | |
|   do {
 | |
|     moved = 0
 | |
|     for (i = 0; i < dnt; ++i) {
 | |
|       for (j = 1; j < cnt; ++j) {
 | |
| 	if (all[j] == from[i]) {
 | |
| 	  for (k = j + 1; k < cnt; ++k) {
 | |
| 	    if (all[k] == to[i]) {
 | |
| 	      break;
 | |
| 	    }
 | |
| 	  }
 | |
| 	  if (k < cnt) {
 | |
| 	    for (l = k - 1; l >= j; --l) {
 | |
| 	      all[l + 1] = all[l]
 | |
| 	    }
 | |
| 	    all[j] = to[i]
 | |
| 	    break;
 | |
| 	  }
 | |
| 	}
 | |
|       }
 | |
|       if (j < cnt) {
 | |
| 	moved = 1
 | |
| 	break
 | |
|       }
 | |
|     }
 | |
|   } while (moved);
 | |
| 
 | |
|   # Make sure we list "elf" last.
 | |
|   saw_elf = 0;
 | |
|   printf "sorted-subdirs :=";
 | |
|   for (i = 1; i < cnt; ++i) {
 | |
|     if (all[i] in inhibit)
 | |
|       continue;
 | |
|     if (all[i] == "elf")
 | |
|       saw_elf = 1;
 | |
|     else
 | |
|       printf " %s", all[i];
 | |
|   }
 | |
|   printf "%s\n", saw_elf ? " elf" : "";
 | |
| 
 | |
|   print "sysd-sorted-done := t"
 | |
| }
 |