summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/defaultsetup.conf2
-rw-r--r--meta/conf/distro/include/security_flags.inc4
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc40
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc40
-rw-r--r--meta/conf/distro/include/tclibc-musl.inc4
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc4
-rw-r--r--meta/conf/distro/include/tcmode-default.inc18
7 files changed, 56 insertions, 56 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 4437267ff3..71c65b1462 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -6,7 +6,7 @@ include conf/distro/include/world-broken.inc
6TCMODE ?= "default" 6TCMODE ?= "default"
7require conf/distro/include/tcmode-${TCMODE}.inc 7require conf/distro/include/tcmode-${TCMODE}.inc
8 8
9TCLIBC ?= "eglibc" 9TCLIBC ?= "glibc"
10require conf/distro/include/tclibc-${TCLIBC}.inc 10require conf/distro/include/tclibc-${TCLIBC}.inc
11 11
12# Allow single libc distros to disable this code 12# Allow single libc distros to disable this code
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index fa604fd5a4..60156c0514 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -23,8 +23,8 @@ SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CLAGS}"
23SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" 23SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie"
24SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" 24SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}"
25SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" 25SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}"
26SECURITY_CFLAGS_pn-eglibc = "" 26SECURITY_CFLAGS_pn-glibc = ""
27SECURITY_CFLAGS_pn-eglibc-initial = "" 27SECURITY_CFLAGS_pn-glibc-initial = ""
28SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" 28SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}"
29SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" 29SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}"
30SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" 30SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}"
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
deleted file mode 100644
index 15f5ee5a30..0000000000
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ /dev/null
@@ -1,40 +0,0 @@
1#
2# eglibc specific configuration
3#
4
5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
6
7# Add glibc overrides to the overrides for eglibc.
8LIBCOVERRIDE = ":libc-glibc"
9OVERRIDES .= "${LIBCOVERRIDE}"
10
11PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
12PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc"
13PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc"
14PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
15PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
16PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc"
17PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale"
18
19CXXFLAGS += "-fvisibility-inlines-hidden"
20
21LIBC_DEPENDENCIES = "libsegfault \
22 eglibc \
23 eglibc-dbg \
24 eglibc-dev \
25 eglibc-utils \
26 eglibc-thread-db \
27 ${@get_libc_locales_dependencies(d)}"
28
29LIBC_LOCALE_DEPENDENCIES = "\
30 eglibc-localedata-i18n \
31 eglibc-gconv-ibm850 \
32 eglibc-gconv-cp1252 \
33 eglibc-gconv-iso8859-1 \
34 eglibc-gconv-iso8859-15"
35
36def get_libc_locales_dependencies(d):
37 if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :
38 return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or ''
39 else:
40 return ''
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
new file mode 100644
index 0000000000..649918fd2b
--- /dev/null
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -0,0 +1,40 @@
1#
2# glibc specific configuration
3#
4
5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
6
7# Add glibc overrides to the overrides for glibc.
8LIBCOVERRIDE = ":libc-glibc"
9OVERRIDES .= "${LIBCOVERRIDE}"
10
11PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
12PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
13PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc"
14PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
15PREFERRED_PROVIDER_virtual/libc ?= "glibc"
16PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc"
17PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale"
18
19CXXFLAGS += "-fvisibility-inlines-hidden"
20
21LIBC_DEPENDENCIES = "libsegfault \
22 glibc \
23 glibc-dbg \
24 glibc-dev \
25 glibc-utils \
26 glibc-thread-db \
27 ${@get_libc_locales_dependencies(d)}"
28
29LIBC_LOCALE_DEPENDENCIES = "\
30 glibc-localedata-i18n \
31 glibc-gconv-ibm850 \
32 glibc-gconv-cp1252 \
33 glibc-gconv-iso8859-1 \
34 glibc-gconv-iso8859-15"
35
36def get_libc_locales_dependencies(d):
37 if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :
38 return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or ''
39 else:
40 return ''
diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
index d375d8d31d..d1272a39a0 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/meta/conf/distro/include/tclibc-musl.inc
@@ -11,8 +11,8 @@ OVERRIDES .= "${LIBCOVERRIDE}"
11PREFERRED_PROVIDER_virtual/libc ?= "musl" 11PREFERRED_PROVIDER_virtual/libc ?= "musl"
12PREFERRED_PROVIDER_virtual/libiconv ?= "musl" 12PREFERRED_PROVIDER_virtual/libiconv ?= "musl"
13PREFERRED_PROVIDER_virtual/libintl ?= "gettext" 13PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
14PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" 14PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc"
15PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" 15PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
16 16
17USE_NLS ?= "no" 17USE_NLS ?= "no"
18 18
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index a4d8c3920d..14c3cdbb8a 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -11,8 +11,8 @@ OVERRIDES .= "${LIBCOVERRIDE}"
11PREFERRED_PROVIDER_virtual/libc ?= "uclibc" 11PREFERRED_PROVIDER_virtual/libc ?= "uclibc"
12PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" 12PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
13PREFERRED_PROVIDER_virtual/libintl ?= "gettext" 13PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
14PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" 14PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc"
15PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" 15PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
16 16
17USE_NLS ?= "no" 17USE_NLS ?= "no"
18 18
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 74e8f43851..6c0f102ed4 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
25GCCVERSION ?= "4.9%" 25GCCVERSION ?= "4.9%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.24" 27BINUVERSION ?= "2.24"
28EGLIBCVERSION ?= "2.19" 28GLIBCVERSION ?= "2.20"
29UCLIBCVERSION ?= "0.9.33+git%" 29UCLIBCVERSION ?= "0.9.33+git%"
30LINUXLIBCVERSION ?= "3.16" 30LINUXLIBCVERSION ?= "3.16"
31 31
@@ -47,14 +47,14 @@ PREFERRED_VERSION_binutils-crosssdk-${SDK_ARCH} ?= "${BINUVERSION}"
47PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" 47PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
48PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" 48PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
49PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" 49PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"
50PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}" 50PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}"
51PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}" 51PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}"
52PREFERRED_VERSION_eglibc-mtrace ?= "${EGLIBCVERSION}" 52PREFERRED_VERSION_glibc-mtrace ?= "${GLIBCVERSION}"
53PREFERRED_VERSION_eglibc-scripts ?= "${EGLIBCVERSION}" 53PREFERRED_VERSION_glibc-scripts ?= "${GLIBCVERSION}"
54PREFERRED_VERSION_nativesdk-eglibc ?= "${EGLIBCVERSION}" 54PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}"
55PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}" 55PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
56PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${EGLIBCVERSION}" 56PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}"
57PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}" 57PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}"
58PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" 58PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}"
59PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" 59PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
60PREFERRED_VERSION_elfutils ?= "0.148" 60PREFERRED_VERSION_elfutils ?= "0.148"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-17 09:22:58 +0000