diff options
| author |   Javier Villavicencio <the_paya@gentoo.org> | 2009-01-24 21:46:04 +0000 |
|---|---|---|
| committer | Javier Villavicencio <the_paya@gentoo.org> | 2009-01-24 21:46:04 +0000 |
| commit | 6ef671581c5231b4be39665b17f9ec4eea844b64 (patch) | |
| tree | 29ce20e8b35fe5bb893d0f797f565bf729ebb484 /eclass | |
| parent | Add patch to correctly link dynamic Yap (diff) | |
| download | gentoo-2-6ef671581c5231b4be39665b17f9ec4eea844b64.tar.gz gentoo-2-6ef671581c5231b4be39665b17f9ec4eea844b64.tar.bz2 gentoo-2-6ef671581c5231b4be39665b17f9ec4eea844b64.zip | |
Updated install-sh patches from bug 196728 to fix parallel make install failures.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ELT-patches/install-sh/1.5 | 7 | ||||
| -rw-r--r-- | eclass/ELT-patches/install-sh/1.5.4 | 7 | ||||
| -rw-r--r-- | eclass/ELT-patches/install-sh/1.5.6 | 11 |
3 files changed, 17 insertions, 8 deletions
diff --git a/eclass/ELT-patches/install-sh/1.5 b/eclass/ELT-patches/install-sh/1.5 index 06d0f1431a18..1b8b20bebdac 100644 --- a/eclass/ELT-patches/install-sh/1.5 +++ b/eclass/ELT-patches/install-sh/1.5 @@ -1,11 +1,14 @@ --- install-sh 2007-07-04 14:36:49 +0100 +++ install-sh 2007-09-14 11:00:41 +0100 -@@ -192,7 +192,7 @@ +@@ -192,7 +192,10 @@ if [ x"$dir_arg" != x ] then - $doit $instcmd $dst && -+ { test -d $dst || $doit $instcmd $dst; } && ++ { $doit $instcmd "$dst" || lasterr=$? ++ # It's ok for mkdir to fail if the directory already exists. ++ test -d "$dst" || { (exit ${lasterr-1}); exit; } ++ } && if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && diff --git a/eclass/ELT-patches/install-sh/1.5.4 b/eclass/ELT-patches/install-sh/1.5.4 index 64fe20ad3f02..0b1c22043bff 100644 --- a/eclass/ELT-patches/install-sh/1.5.4 +++ b/eclass/ELT-patches/install-sh/1.5.4 @@ -1,11 +1,14 @@ --- install-sh 2006-03-25 20:04:46 +0000 +++ install-sh 2007-09-14 10:53:29 +0100 -@@ -246,7 +246,7 @@ +@@ -246,7 +246,10 @@ fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ -+ { test -d "$dst" || $doit $mkdircmd "$dst"; } \ ++ { $doit $mkdircmd "$dst" || lasterr=$? ++ # It's ok for mkdir to fail if the directory already exists. ++ test -d "$dst" || { (exit ${lasterr-1}); exit; } ++ } \ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ diff --git a/eclass/ELT-patches/install-sh/1.5.6 b/eclass/ELT-patches/install-sh/1.5.6 index 1404e2318116..d107740d1b2c 100644 --- a/eclass/ELT-patches/install-sh/1.5.6 +++ b/eclass/ELT-patches/install-sh/1.5.6 @@ -1,11 +1,14 @@ ---- install-sh 2007-10-23 12:10:41 +0100 -+++ install-sh 2007-10-23 12:12:06 +0100 -@@ -240,7 +240,7 @@ +--- install-sh 2006-03-14 12:57:54 -0300 ++++ install-sh 2008-06-19 22:23:04 -0300 +@@ -240,7 +240,10 @@ fi if test -n "$dir_arg"; then - $doit $instcmd "$dst" \ -+ { test -d "$dst" || $doit $instcmd "$dst"; } \ ++ { $doit $instcmd "$dst" || lasterr=$? ++ # It's ok for mkdir to fail if the directory already exists. ++ test -d "$dst" || { (exit ${lasterr-1}); exit; } ++ } \ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |