commit: f8b7eadda059ed226d73aa305c1a6353273cd9df
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 22:30:01 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 22:30:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=f8b7eadd
Fix up /etc/portage or musl.
core/etc/portage/env/dev-vcs_git_0 | 1 -
core/etc/portage/make.conf.CYCLE.1 | 4 +-
core/etc/portage/make.conf.CYCLE.2 | 2 +-
core/etc/portage/make.conf.CYCLE.3 | 2 +-
core/etc/portage/make.profile | 2 +-
.../package.accept_keywords/sys-libs_uclibc_0 | 1 -
core/etc/portage/package.env/dev-vcs_git_0 | 1 -
core/etc/portage/package.use/sys-libs_uclibc_0 | 1 -
...ldso-libdl-libdl.c-do-not-unmap-libraries.patch | 25 ---------
.../sys-libs/uclibc/99-libc-add-isfdtype.patch | 65 ----------------------
10 files changed, 4 insertions(+), 100 deletions(-)
diff --git a/core/etc/portage/env/dev-vcs_git_0
b/core/etc/portage/env/dev-vcs_git_0
deleted file mode 100644
index 50fcbfb..0000000
--- a/core/etc/portage/env/dev-vcs_git_0
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS="-liconv"
diff --git a/core/etc/portage/make.conf.CYCLE.1
b/core/etc/portage/make.conf.CYCLE.1
index 312fd6d..0a6c29e 100644
--- a/core/etc/portage/make.conf.CYCLE.1
+++ b/core/etc/portage/make.conf.CYCLE.1
@@ -1,7 +1,5 @@
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-gentoo-linux-uclibc"
+CHOST="x86_64-gentoo-linux-musl"
MAKEOPTS="-j17"
PAX_MARKINGS="XT"
-
-USE="-gpg"
diff --git a/core/etc/portage/make.conf.CYCLE.2
b/core/etc/portage/make.conf.CYCLE.2
index e30c2ea..3502b08 100644
--- a/core/etc/portage/make.conf.CYCLE.2
+++ b/core/etc/portage/make.conf.CYCLE.2
@@ -1,6 +1,6 @@
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-gentoo-linux-uclibc"
+CHOST="x86_64-gentoo-linux-musl"
MAKEOPTS="-j17"
PAX_MARKINGS="XT"
PYTHON_TARGETS="python2_7 python3_4"
diff --git a/core/etc/portage/make.conf.CYCLE.3
b/core/etc/portage/make.conf.CYCLE.3
index 4ab3769..074d110 100644
--- a/core/etc/portage/make.conf.CYCLE.3
+++ b/core/etc/portage/make.conf.CYCLE.3
@@ -1,6 +1,6 @@
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-gentoo-linux-uclibc"
+CHOST="x86_64-gentoo-linux-musl"
MAKEOPTS="-j17"
PAX_MARKINGS="XT"
PYTHON_TARGETS="python2_7 python3_4"
diff --git a/core/etc/portage/make.profile b/core/etc/portage/make.profile
index e40252c..d0c9e57 120000
--- a/core/etc/portage/make.profile
+++ b/core/etc/portage/make.profile
@@ -1 +1 @@
-../../usr/portage/profiles/hardened/linux/uclibc/amd64
\ No newline at end of file
+../../usr/portage/profiles/hardened/linux/musl/amd64
\ No newline at end of file
diff --git a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
b/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
deleted file mode 100644
index 4425c84..0000000
--- a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
+++ /dev/null
@@ -1 +0,0 @@
-=sys-libs/uclibc-0.9.33.9999 **
diff --git a/core/etc/portage/package.env/dev-vcs_git_0
b/core/etc/portage/package.env/dev-vcs_git_0
deleted file mode 100644
index 2ae36b3..0000000
--- a/core/etc/portage/package.env/dev-vcs_git_0
+++ /dev/null
@@ -1 +0,0 @@
-dev-vcs/git:0 dev-vcs_git_0
diff --git a/core/etc/portage/package.use/sys-libs_uclibc_0
b/core/etc/portage/package.use/sys-libs_uclibc_0
deleted file mode 100644
index 0715d0b..0000000
--- a/core/etc/portage/package.use/sys-libs_uclibc_0
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig
diff --git
a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
b/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
deleted file mode 100644
index 5f68c99..0000000
---
a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 579dcdbc8aab966b22f6324a16dbf8fd08a607c3 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <[email protected]>
-Date: Fri, 17 Apr 2015 16:51:43 -0400
-Subject: [PATCH] ldso/libdl/libdl.c: do not unmap libraries.
-
----
- ldso/libdl/libdl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 49711a8..2c43c07 100644
---- a/ldso/libdl/libdl.c
-+++ b/ldso/libdl/libdl.c
-@@ -977,7 +977,7 @@ static int do_dlclose(void *vhandle, int need_fini)
-
- end = (end + ADDR_ALIGN) & PAGE_ALIGN;
- start = start & ~ADDR_ALIGN;
-- DL_LIB_UNMAP (tpnt, end - start);
-+ //DL_LIB_UNMAP (tpnt, end - start);
- /* Free elements in RTLD_LOCAL scope list */
- for (runp = tpnt->rtld_local; runp; runp = tmp) {
- tmp = runp->next;
---
-2.0.5
-
diff --git
a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
b/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
deleted file mode 100644
index 007ec33..0000000
--- a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f22cca4722fa66e424562e69f4afa2bca0af871d Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <[email protected]>
-Date: Sun, 28 Jul 2013 09:08:34 -0400
-Subject: [PATCH] libc: add isfdtype()
-
-isfdtype(int fd, int fdtype) check whether a file descriptor fd is
-of type fdtype, where the types are defined in stat(2). It is
-supported in glibc and BSD, and used by utilities such as acpid.
-
-Signed-off-by: Anthony G. Basile <[email protected]>
-Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
----
- libc/misc/file/isfdtype.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
- create mode 100644 libc/misc/file/isfdtype.c
-
-diff --git a/libc/misc/file/isfdtype.c b/libc/misc/file/isfdtype.c
-new file mode 100644
-index 0000000..4d9199b
---- /dev/null
-+++ libc/misc/file/isfdtype.c
-@@ -0,0 +1,40 @@
-+/* Determine whether descriptor has given property.
-+ Copyright (C) 1996-2013 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <http://www.gnu.org/licenses/>. */
-+
-+#include <errno.h>
-+#include <sys/stat.h>
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#ifdef __UCLIBC_HAS_LFS__
-+# include <_lfs_64.h>
-+#else
-+# define stat64 stat
-+# define fstat64 fstat
-+#endif
-+
-+int
-+isfdtype (int fildes, int fdtype)
-+{
-+ struct stat64 st;
-+ int save_error = errno;
-+ int result = fstat64 (fildes, &st);
-+ __set_errno (save_error);
-+ if (result)
-+ return result;
-+ return (st.st_mode & S_IFMT) == (mode_t) fdtype;
-+}
---
-1.8.3.2.733.gf8abaeb
-
