| 1 |
commit: 48b366594ab49dd0be7a6807561f31e82d0d82d0 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 22 21:17:02 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 21:17:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48b36659 |
| 7 |
|
| 8 |
sys-devel/binutils-config: drop ~ppc-aix |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/760057 |
| 11 |
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
.../binutils-config/binutils-config-5.1-r3.ebuild | 2 +- |
| 15 |
sys-devel/binutils-config/files/ldwrapper.c | 23 ---------------------- |
| 16 |
2 files changed, 1 insertion(+), 24 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild |
| 19 |
index fd26184271..dc28f6c5a4 100644 |
| 20 |
--- a/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild |
| 21 |
+++ b/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild |
| 22 |
@@ -13,7 +13,7 @@ WRAPPER_REV="${PV%%.*}.3.4" |
| 23 |
|
| 24 |
LICENSE="GPL-2" |
| 25 |
SLOT="0" |
| 26 |
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 27 |
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 28 |
IUSE="" |
| 29 |
|
| 30 |
# We also RDEPEND on sys-apps/findutils which is in base @system |
| 31 |
|
| 32 |
diff --git a/sys-devel/binutils-config/files/ldwrapper.c b/sys-devel/binutils-config/files/ldwrapper.c |
| 33 |
index 3ff5a0bc3e..7410afd334 100644 |
| 34 |
--- a/sys-devel/binutils-config/files/ldwrapper.c |
| 35 |
+++ b/sys-devel/binutils-config/files/ldwrapper.c |
| 36 |
@@ -210,7 +210,6 @@ main(int argc, char *argv[]) |
| 37 |
char is_cross = 0; |
| 38 |
char is_darwin = 0; |
| 39 |
char darwin_use_rpath = 1; |
| 40 |
- char is_aix = 0; |
| 41 |
char *p; |
| 42 |
size_t len; |
| 43 |
int i; |
| 44 |
@@ -269,7 +268,6 @@ main(int argc, char *argv[]) |
| 45 |
snprintf(ctarget, sizeof(ctarget), "%s", CHOST); |
| 46 |
|
| 47 |
is_darwin = strstr(ctarget, "-darwin") != NULL; |
| 48 |
- is_aix = strstr(ctarget, "-aix") != NULL; |
| 49 |
|
| 50 |
/* cannonicanise wrapper step2: strip CTARGET from wrapper */ |
| 51 |
len = strlen(ctarget); |
| 52 |
@@ -349,11 +347,6 @@ main(int argc, char *argv[]) |
| 53 |
/* add the 4 paths we want (-L + -R) */ |
| 54 |
newargc += 8; |
| 55 |
} |
| 56 |
- |
| 57 |
- if (is_aix) { |
| 58 |
- /* AIX ld accepts -R only with -bsvr4 */ |
| 59 |
- newargc++; /* -bsvr4 */ |
| 60 |
- } |
| 61 |
} |
| 62 |
|
| 63 |
/* account the original arguments */ |
| 64 |
@@ -396,19 +389,6 @@ main(int argc, char *argv[]) |
| 65 |
/* position k right after the original arguments */ |
| 66 |
k = j - 1 + argc; |
| 67 |
for (i = 1; i < argc; i++, j++) { |
| 68 |
- if (is_aix) { |
| 69 |
- /* AIX ld has this problem: |
| 70 |
- * $ /usr/ccs/bin/ld -bsvr4 -bE:xx.exp -bnoentry xx.o |
| 71 |
- * ld: 0706-005 Cannot find or open file: l |
| 72 |
- * ld:open(): No such file or directory |
| 73 |
- * Simplest workaround is to put -bsvr4 last. |
| 74 |
- */ |
| 75 |
- if (strcmp(argv[i], "-bsvr4") == 0) { |
| 76 |
- --j; --k; |
| 77 |
- continue; |
| 78 |
- } |
| 79 |
- } |
| 80 |
- |
| 81 |
newargv[j] = argv[i]; |
| 82 |
|
| 83 |
if (is_cross || (is_darwin && !darwin_use_rpath)) |
| 84 |
@@ -484,9 +464,6 @@ main(int argc, char *argv[]) |
| 85 |
newargv[k++] = "-L" EPREFIX "/lib"; |
| 86 |
newargv[k++] = "-R" EPREFIX "/lib"; |
| 87 |
} |
| 88 |
- |
| 89 |
- if (is_aix) |
| 90 |
- newargv[k++] = "-bsvr4"; /* last one, see above */ |
| 91 |
} |
| 92 |
newargv[k] = NULL; |
Archives