From b72ab22ca5b78a3205c5fba4d7b8785ff09224a9 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 4 Jul 2015 20:25:54 -0400 Subject: [PATCH] make.conf: switch CHOST from uclibc to glibc. --- core/etc/grs/world.conf | 8 ++------ core/etc/portage/make.conf.CYCLE.1 | 2 +- core/etc/portage/make.conf.CYCLE.2 | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 63df540..512fa4f 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -122,7 +122,7 @@ package.use/app-admin_xstow_0 : app-admin/xstow:0 ncurses package.use/app-admin_yaala_0 : app-admin/yaala:0 -gd -storable [app-antivirus/clamav:0] -package.use/app-antivirus_clamav_0 : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux bzip2 iconv ipv6 static-libs uclibc +package.use/app-antivirus_clamav_0 : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux -uclibc bzip2 iconv ipv6 static-libs [app-arch/bzip2:0] package.use/app-arch_bzip2_0 : app-arch/bzip2:0 -static static-libs @@ -7528,10 +7528,6 @@ package.use/sys-libs_tevent_0 : sys-libs/tevent:0 python [sys-libs/timezone-data:0] package.use/sys-libs_timezone-data_0 : sys-libs/timezone-data:0 -nls -right_timezone -[sys-libs/uclibc:0] -package.use/sys-libs_uclibc_0 : sys-libs/uclibc:0 -debug -hardened -iconv -ipv6 -nptl -rpc -ssp -uclibc-compat -wordexp savedconfig -package.accept_keywords/sys-libs_uclibc_0 : =sys-libs/uclibc-0.9.33.9999 ** - [sys-libs/zlib:0] package.use/sys-libs_zlib_0 : sys-libs/zlib:0 minizip static-libs @@ -8395,7 +8391,7 @@ package.use/x11-wm_enlightenment_0 : x11-wm/enlightenment:0 -doc -nls -pango -pu package.use/x11-wm_fvwm_0 : x11-wm/fvwm:0 -debug -doc -gtk2-perl -lock -netpbm -nls -rplay -stroke -truetype bidi perl png readline svg tk vanilla xinerama [x11-wm/icewm:0] -package.use/x11-wm_icewm_0 : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype bidi uclibc xinerama +package.use/x11-wm_icewm_0 : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype -uclibc bidi xinerama [x11-wm/jwm:0] package.use/x11-wm_jwm_0 : x11-wm/jwm:0 -debug -truetype bidi jpeg png xinerama xpm diff --git a/core/etc/portage/make.conf.CYCLE.1 b/core/etc/portage/make.conf.CYCLE.1 index 2706b1e..3cd9913 100644 --- a/core/etc/portage/make.conf.CYCLE.1 +++ b/core/etc/portage/make.conf.CYCLE.1 @@ -1,6 +1,6 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" -CHOST="x86_64-gentoo-linux-uclibc" +CHOST="x86_64-pc-linux-gnu" MAKEOPTS="-j17" PAX_MARKINGS="XT" PYTHON_TARGETS="python2_7 python3_4" diff --git a/core/etc/portage/make.conf.CYCLE.2 b/core/etc/portage/make.conf.CYCLE.2 index 844a47f..27c9047 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-pc-linux-gnu" MAKEOPTS="-j17" PAX_MARKINGS="XT" PYTHON_TARGETS="python2_7 python3_4"