| 1 |
commit: b72ab22ca5b78a3205c5fba4d7b8785ff09224a9 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 5 00:25:54 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 5 00:25:54 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=b72ab22c |
| 7 |
|
| 8 |
make.conf: switch CHOST from uclibc to glibc. |
| 9 |
|
| 10 |
core/etc/grs/world.conf | 8 ++------ |
| 11 |
core/etc/portage/make.conf.CYCLE.1 | 2 +- |
| 12 |
core/etc/portage/make.conf.CYCLE.2 | 2 +- |
| 13 |
3 files changed, 4 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf |
| 16 |
index 63df540..512fa4f 100644 |
| 17 |
--- a/core/etc/grs/world.conf |
| 18 |
+++ b/core/etc/grs/world.conf |
| 19 |
@@ -122,7 +122,7 @@ package.use/app-admin_xstow_0 : app-admin/xstow:0 ncurses |
| 20 |
package.use/app-admin_yaala_0 : app-admin/yaala:0 -gd -storable |
| 21 |
|
| 22 |
[app-antivirus/clamav:0] |
| 23 |
-package.use/app-antivirus_clamav_0 : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux bzip2 iconv ipv6 static-libs uclibc |
| 24 |
+package.use/app-antivirus_clamav_0 : app-antivirus/clamav:0 -clamdtop -metadata-analysis-api -milter -selinux -uclibc bzip2 iconv ipv6 static-libs |
| 25 |
|
| 26 |
[app-arch/bzip2:0] |
| 27 |
package.use/app-arch_bzip2_0 : app-arch/bzip2:0 -static static-libs |
| 28 |
@@ -7528,10 +7528,6 @@ package.use/sys-libs_tevent_0 : sys-libs/tevent:0 python |
| 29 |
[sys-libs/timezone-data:0] |
| 30 |
package.use/sys-libs_timezone-data_0 : sys-libs/timezone-data:0 -nls -right_timezone |
| 31 |
|
| 32 |
-[sys-libs/uclibc:0] |
| 33 |
-package.use/sys-libs_uclibc_0 : sys-libs/uclibc:0 -debug -hardened -iconv -ipv6 -nptl -rpc -ssp -uclibc-compat -wordexp savedconfig |
| 34 |
-package.accept_keywords/sys-libs_uclibc_0 : =sys-libs/uclibc-0.9.33.9999 ** |
| 35 |
- |
| 36 |
[sys-libs/zlib:0] |
| 37 |
package.use/sys-libs_zlib_0 : sys-libs/zlib:0 minizip static-libs |
| 38 |
|
| 39 |
@@ -8395,7 +8391,7 @@ package.use/x11-wm_enlightenment_0 : x11-wm/enlightenment:0 -doc -nls -pango -pu |
| 40 |
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 |
| 41 |
|
| 42 |
[x11-wm/icewm:0] |
| 43 |
-package.use/x11-wm_icewm_0 : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype bidi uclibc xinerama |
| 44 |
+package.use/x11-wm_icewm_0 : x11-wm/icewm:0 -debug -gnome -minimal -nls -truetype -uclibc bidi xinerama |
| 45 |
|
| 46 |
[x11-wm/jwm:0] |
| 47 |
package.use/x11-wm_jwm_0 : x11-wm/jwm:0 -debug -truetype bidi jpeg png xinerama xpm |
| 48 |
|
| 49 |
diff --git a/core/etc/portage/make.conf.CYCLE.1 b/core/etc/portage/make.conf.CYCLE.1 |
| 50 |
index 2706b1e..3cd9913 100644 |
| 51 |
--- a/core/etc/portage/make.conf.CYCLE.1 |
| 52 |
+++ b/core/etc/portage/make.conf.CYCLE.1 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
CFLAGS="-O2 -pipe" |
| 55 |
CXXFLAGS="${CFLAGS}" |
| 56 |
-CHOST="x86_64-gentoo-linux-uclibc" |
| 57 |
+CHOST="x86_64-pc-linux-gnu" |
| 58 |
MAKEOPTS="-j17" |
| 59 |
PAX_MARKINGS="XT" |
| 60 |
PYTHON_TARGETS="python2_7 python3_4" |
| 61 |
|
| 62 |
diff --git a/core/etc/portage/make.conf.CYCLE.2 b/core/etc/portage/make.conf.CYCLE.2 |
| 63 |
index 844a47f..27c9047 100644 |
| 64 |
--- a/core/etc/portage/make.conf.CYCLE.2 |
| 65 |
+++ b/core/etc/portage/make.conf.CYCLE.2 |
| 66 |
@@ -1,6 +1,6 @@ |
| 67 |
CFLAGS="-O2 -pipe" |
| 68 |
CXXFLAGS="${CFLAGS}" |
| 69 |
-CHOST="x86_64-gentoo-linux-uclibc" |
| 70 |
+CHOST="x86_64-pc-linux-gnu" |
| 71 |
MAKEOPTS="-j17" |
| 72 |
PAX_MARKINGS="XT" |
| 73 |
PYTHON_TARGETS="python2_7 python3_4" |
Archives