* [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.amd64.hardened/env/, ...
@ 2016-07-18 9:49 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2016-07-18 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 524d86ceca709a6c7d02eae3cf7f9dec77ff3a63
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 09:49:05 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 09:49:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=524d86ce
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 -
tools-uclibc/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(-)
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 a00505d..0000000
--- 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 67fe0df..0000000
--- 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 a00505d..0000000
--- 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 67fe0df..0000000
--- 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 a00505d..0000000
--- 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 194a3ae..0fc1e42 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 a00505d..0000000
--- 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 67fe0df..0000000
--- a/tools-uclibc/portage.i686.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/wget net-misc_wget_0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.amd64.hardened/env/, ...
@ 2018-10-28 15:01 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2018-10-28 15:01 UTC (permalink / raw
To: gentoo-commits
commit: a7850c4bf2a2e890e3382f069e09f0c86cf305a0
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 15:01:29 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 15:01:29 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a7850c4b
tools-uclibc: workaround multilib-strict for file
tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0 | 1 +
tools-uclibc/portage.amd64.hardened/package.accept_keywords | 2 +-
tools-uclibc/portage.amd64.hardened/package.env | 1 +
tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0 | 1 +
tools-uclibc/portage.amd64.vanilla/package.accept_keywords | 2 +-
tools-uclibc/portage.amd64.vanilla/package.env | 1 +
tools-uclibc/portage.i686.hardened/env/sys-apps_file_0 | 1 +
tools-uclibc/portage.i686.hardened/package.accept_keywords | 2 +-
tools-uclibc/portage.i686.hardened/package.env | 2 +-
tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0 | 1 +
tools-uclibc/portage.i686.vanilla/package.accept_keywords | 2 +-
tools-uclibc/portage.i686.vanilla/package.env | 1 +
12 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0 b/tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0
new file mode 100644
index 00000000..6490f7bb
--- /dev/null
+++ b/tools-uclibc/portage.amd64.hardened/env/sys-apps_file_0
@@ -0,0 +1 @@
+FEATURES="-multilib-strict"
diff --git a/tools-uclibc/portage.amd64.hardened/package.accept_keywords b/tools-uclibc/portage.amd64.hardened/package.accept_keywords
index 70b1b9dc..d3121c24 100644
--- a/tools-uclibc/portage.amd64.hardened/package.accept_keywords
+++ b/tools-uclibc/portage.amd64.hardened/package.accept_keywords
@@ -1 +1 @@
->=sys-apps/iproute2-4.18.0 ~amd64
+=sys-apps/iproute2-4.18.0 ~amd64
diff --git a/tools-uclibc/portage.amd64.hardened/package.env b/tools-uclibc/portage.amd64.hardened/package.env
index dd59e5f1..2d99438b 100644
--- a/tools-uclibc/portage.amd64.hardened/package.env
+++ b/tools-uclibc/portage.amd64.hardened/package.env
@@ -1 +1,2 @@
net-misc/iputils net-misc_iputils_0
+sys-apps/file sys-apps_file_0
diff --git a/tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0 b/tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0
new file mode 100644
index 00000000..6490f7bb
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/env/sys-apps_file_0
@@ -0,0 +1 @@
+FEATURES="-multilib-strict"
diff --git a/tools-uclibc/portage.amd64.vanilla/package.accept_keywords b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords
index 70b1b9dc..d3121c24 100644
--- a/tools-uclibc/portage.amd64.vanilla/package.accept_keywords
+++ b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords
@@ -1 +1 @@
->=sys-apps/iproute2-4.18.0 ~amd64
+=sys-apps/iproute2-4.18.0 ~amd64
diff --git a/tools-uclibc/portage.amd64.vanilla/package.env b/tools-uclibc/portage.amd64.vanilla/package.env
index dd59e5f1..2d99438b 100644
--- a/tools-uclibc/portage.amd64.vanilla/package.env
+++ b/tools-uclibc/portage.amd64.vanilla/package.env
@@ -1 +1,2 @@
net-misc/iputils net-misc_iputils_0
+sys-apps/file sys-apps_file_0
diff --git a/tools-uclibc/portage.i686.hardened/env/sys-apps_file_0 b/tools-uclibc/portage.i686.hardened/env/sys-apps_file_0
new file mode 100644
index 00000000..6490f7bb
--- /dev/null
+++ b/tools-uclibc/portage.i686.hardened/env/sys-apps_file_0
@@ -0,0 +1 @@
+FEATURES="-multilib-strict"
diff --git a/tools-uclibc/portage.i686.hardened/package.accept_keywords b/tools-uclibc/portage.i686.hardened/package.accept_keywords
index d4072570..e6b927af 100644
--- a/tools-uclibc/portage.i686.hardened/package.accept_keywords
+++ b/tools-uclibc/portage.i686.hardened/package.accept_keywords
@@ -1 +1 @@
->=sys-apps/iproute2-4.18.0 ~x86
+=sys-apps/iproute2-4.18.0 ~x86
diff --git a/tools-uclibc/portage.i686.hardened/package.env b/tools-uclibc/portage.i686.hardened/package.env
index 1dfa69a0..2d99438b 100644
--- a/tools-uclibc/portage.i686.hardened/package.env
+++ b/tools-uclibc/portage.i686.hardened/package.env
@@ -1,2 +1,2 @@
-dev-lang/perl dev-lang_perl_0
net-misc/iputils net-misc_iputils_0
+sys-apps/file sys-apps_file_0
diff --git a/tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0 b/tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0
new file mode 100644
index 00000000..6490f7bb
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/env/sys-apps_file_0
@@ -0,0 +1 @@
+FEATURES="-multilib-strict"
diff --git a/tools-uclibc/portage.i686.vanilla/package.accept_keywords b/tools-uclibc/portage.i686.vanilla/package.accept_keywords
index d4072570..e6b927af 100644
--- a/tools-uclibc/portage.i686.vanilla/package.accept_keywords
+++ b/tools-uclibc/portage.i686.vanilla/package.accept_keywords
@@ -1 +1 @@
->=sys-apps/iproute2-4.18.0 ~x86
+=sys-apps/iproute2-4.18.0 ~x86
diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env
index dd59e5f1..2d99438b 100644
--- a/tools-uclibc/portage.i686.vanilla/package.env
+++ b/tools-uclibc/portage.i686.vanilla/package.env
@@ -1 +1,2 @@
net-misc/iputils net-misc_iputils_0
+sys-apps/file sys-apps_file_0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-28 15:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-18 9:49 [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.amd64.hardened/env/, Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2018-10-28 15:01 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox