From 524d86ceca709a6c7d02eae3cf7f9dec77ff3a63 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Mon, 18 Jul 2016 05:49:05 -0400 Subject: [PATCH] Revert "tools-uclibc: build wget with LDFLAGS=-liconv", bug #587620 This reverts commit 6d3139efcf71d2ffd389419c9f38120e9ecf52ca. --- tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0 | 1 - tools-uclibc/portage.amd64.hardened/package.env | 1 - tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0 | 1 - tools-uclibc/portage.amd64.vanilla/package.env | 1 - tools-uclibc/portage.i686.hardened/env/net-misc_wget_0 | 1 - .../portage.i686.hardened/env/{dev-lang_perl_0 => perl.conf} | 0 tools-uclibc/portage.i686.hardened/package.env | 3 +-- tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0 | 1 - tools-uclibc/portage.i686.vanilla/package.env | 1 - 9 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0 delete mode 100644 tools-uclibc/portage.amd64.hardened/package.env delete mode 100644 tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0 delete mode 100644 tools-uclibc/portage.amd64.vanilla/package.env delete mode 100644 tools-uclibc/portage.i686.hardened/env/net-misc_wget_0 rename tools-uclibc/portage.i686.hardened/env/{dev-lang_perl_0 => perl.conf} (100%) delete mode 100644 tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0 delete mode 100644 tools-uclibc/portage.i686.vanilla/package.env diff --git a/tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0 b/tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0 deleted file mode 100644 index a00505d6..00000000 --- a/tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0 +++ /dev/null @@ -1 +0,0 @@ -LDFLAGS=-liconv diff --git a/tools-uclibc/portage.amd64.hardened/package.env b/tools-uclibc/portage.amd64.hardened/package.env deleted file mode 100644 index 67fe0dff..00000000 --- a/tools-uclibc/portage.amd64.hardened/package.env +++ /dev/null @@ -1 +0,0 @@ -net-misc/wget net-misc_wget_0 diff --git a/tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0 b/tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0 deleted file mode 100644 index a00505d6..00000000 --- a/tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0 +++ /dev/null @@ -1 +0,0 @@ -LDFLAGS=-liconv diff --git a/tools-uclibc/portage.amd64.vanilla/package.env b/tools-uclibc/portage.amd64.vanilla/package.env deleted file mode 100644 index 67fe0dff..00000000 --- a/tools-uclibc/portage.amd64.vanilla/package.env +++ /dev/null @@ -1 +0,0 @@ -net-misc/wget net-misc_wget_0 diff --git a/tools-uclibc/portage.i686.hardened/env/net-misc_wget_0 b/tools-uclibc/portage.i686.hardened/env/net-misc_wget_0 deleted file mode 100644 index a00505d6..00000000 --- a/tools-uclibc/portage.i686.hardened/env/net-misc_wget_0 +++ /dev/null @@ -1 +0,0 @@ -LDFLAGS=-liconv diff --git a/tools-uclibc/portage.i686.hardened/env/dev-lang_perl_0 b/tools-uclibc/portage.i686.hardened/env/perl.conf similarity index 100% rename from tools-uclibc/portage.i686.hardened/env/dev-lang_perl_0 rename to tools-uclibc/portage.i686.hardened/env/perl.conf diff --git a/tools-uclibc/portage.i686.hardened/package.env b/tools-uclibc/portage.i686.hardened/package.env index 194a3ae0..0fc1e424 100644 --- a/tools-uclibc/portage.i686.hardened/package.env +++ b/tools-uclibc/portage.i686.hardened/package.env @@ -1,2 +1 @@ -dev-lang/perl dev-lang_perl_0 -net-misc/wget net-misc_wget_0 +dev-lang/perl perl.conf diff --git a/tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0 b/tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0 deleted file mode 100644 index a00505d6..00000000 --- a/tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0 +++ /dev/null @@ -1 +0,0 @@ -LDFLAGS=-liconv diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env deleted file mode 100644 index 67fe0dff..00000000 --- a/tools-uclibc/portage.i686.vanilla/package.env +++ /dev/null @@ -1 +0,0 @@ -net-misc/wget net-misc_wget_0