| [598efa5d] | 1 | Submitted By: Mark Vels <mark.vels@fundem.net>
|
|---|
| 2 | Date: 2007-07-20
|
|---|
| 3 | Initial Package Version: 2.6
|
|---|
| 4 | Origin: original patch glibc-2.6-mawk_fix-1.patch by Jim Gifford <jim@linuxfromscratch.org>
|
|---|
| 5 | Upstream Status: Not submitted
|
|---|
| 6 | Description: Fixes build if host distro is using mawk.
|
|---|
| 7 | Distro's known to have this issue are Debian
|
|---|
| 8 | and Ubuntu
|
|---|
| 9 |
|
|---|
| 10 | Changes wrt version 1: added two more cases.
|
|---|
| 11 |
|
|---|
| 12 | diff -Naur glibc-2.6.orig/scripts/gen-sorted.awk glibc-2.6/scripts/gen-sorted.awk
|
|---|
| 13 | --- glibc-2.6.orig/scripts/gen-sorted.awk 2006-02-28 07:05:57.000000000 +0000
|
|---|
| 14 | +++ glibc-2.6/scripts/gen-sorted.awk 2007-07-20 21:03:50.000000000 +0000
|
|---|
| 15 | @@ -16,7 +16,7 @@
|
|---|
| 16 | {
|
|---|
| 17 | subdir = type = FILENAME;
|
|---|
| 18 | sub(/^.*\//, "", type);
|
|---|
| 19 | - sub(/\/[^/]+$/, "", subdir);
|
|---|
| 20 | + sub(/\/[^\/]+$/, "", subdir);
|
|---|
| 21 | sub(/^.*\//, "", subdir);
|
|---|
| 22 | thisdir = "";
|
|---|
| 23 | }
|
|---|
| 24 | @@ -56,13 +56,13 @@
|
|---|
| 25 | # The Subdirs file comes from an add-on that should have the subdirectory.
|
|---|
| 26 | dir = FILENAME;
|
|---|
| 27 | do
|
|---|
| 28 | - sub(/\/[^/]+$/, "", dir);
|
|---|
| 29 | + sub(/\/[^\/]+$/, "", dir);
|
|---|
| 30 | while (dir !~ /\/sysdeps$/);
|
|---|
| 31 | sub(/\/sysdeps$/, "", dir);
|
|---|
| 32 | if (system("test -d " dir "/" thisdir) == 0)
|
|---|
| 33 | dir = dir "/" thisdir;
|
|---|
| 34 | else {
|
|---|
| 35 | - sub(/\/[^/]+$/, "", dir);
|
|---|
| 36 | + sub(/\/[^\/]+$/, "", dir);
|
|---|
| 37 | if (system("test -d " dir "/" thisdir) == 0)
|
|---|
| 38 | dir = dir "/" thisdir;
|
|---|
| 39 | else {
|
|---|
