ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-22 06:07:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #574 from stilor/uclibc-obstack

Browse Source 
3 unrelated uClibc changes, see individual commits
This commit is contained in:
Alexey Neyman 2017-02-05 20:42:02 -08:00 committed by GitHub
commit a459a33936
5 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/libc/uClibc.in
View File

@ -35,7 +35,8 @@ choice
prompt "uClibc Version Name"
config LIBC_UCLIBC_CUSTOM_UCLIBC
bool "uClibc"
bool "uClibc (OBSOLETE)"
depends on OBSOLETE
select LIBC_UCLIBC_0_9_33_2_or_later
config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
@ -100,7 +101,8 @@ config LIBC_UCLIBC_NG_V_1_0_20
config LIBC_UCLIBC_V_0_9_33_2
bool
prompt "0.9.33.2"
prompt "0.9.33.2 (OBSOLETE)"
depends on OBSOLETE
select LIBC_UCLIBC_0_9_33_2_or_later
endchoice

1
contrib/uClibc-defconfigs/uClibc-ng.config
View File

@ -5,7 +5,6 @@ KERNEL_HEADERS="/usr/src/linux/include"
LDSO_RUNPATH=y
LDSO_RUNPATH_OF_EXECUTABLE=y
MALLOC_GLIBC_COMPAT=y
UCLIBC_HAS_OBSTACK=y
UCLIBC_HAS_UTMPX=y
UCLIBC_HAS_UTMP=y
UCLIBC_SUSV2_LEGACY=y

41
patches/uClibc/0.9.33.2/999-make-olddefconfig.patch Normal file
View File

@ -0,0 +1,41 @@
diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config/conf.c
--- uClibc-0.9.33.2.orig/extra/config/conf.c 2017-02-04 12:57:38.488808014 -0800
+++ uClibc-0.9.33.2/extra/config/conf.c 2017-02-04 20:26:28.613244457 -0800
@@ -435,6 +435,7 @@ int main(int ac, char **av)
const char *name;
const char *configname = conf_get_configname();
struct stat tmpstat;
+ int olddefconfig = 0;
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
@@ -451,6 +452,7 @@ int main(int ac, char **av)
break;
case 'd':
input_mode = set_default;
+ olddefconfig = 1;
break;
case 'D':
input_mode = set_default;
@@ -514,7 +516,7 @@ int main(int ac, char **av)
switch (input_mode) {
case set_default:
if (!defconfig_file)
- defconfig_file = conf_get_default_confname();
+ defconfig_file = olddefconfig ? NULL : conf_get_default_confname();
if (conf_read(defconfig_file)) {
printf(_("***\n"
"*** Can't find default configuration \"%s\"!\n"
diff -urpN uClibc-0.9.33.2.orig/Makefile.in uClibc-0.9.33.2/Makefile.in
--- uClibc-0.9.33.2.orig/Makefile.in 2017-02-04 12:57:38.484807980 -0800
+++ uClibc-0.9.33.2/Makefile.in 2017-02-04 12:59:34.625789324 -0800
@@ -460,6 +460,9 @@ allyesconfig: $(conf)
allnoconfig: $(conf)
$(Q)$< -n extra/Configs/Config.in
+olddefconfig: $(conf)
+ $(Q)$< -d extra/Configs/Config.in
+
defconfig: $(conf)
$(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ extra/Configs/Config.in

2
scripts/build/libc/uClibc.sh
View File

@ -138,7 +138,7 @@ do_libc_backend_once() {
fi
manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" .config "${multi_flags}"
CT_DoYes | CT_DoExecLog ALL make "${make_args[@]}" oldconfig
CT_DoExecLog ALL make "${make_args[@]}" olddefconfig
# Now filter the multilib flags. manage_uClibc_config did the opposite of
# what Rules.mak in uClibc would do: by the multilib's CFLAGS, it determined

8
scripts/functions
View File

@ -585,14 +585,6 @@ CT_DoForceRmdir() {
done
}
# Echoes the specified string on stdout until the pipe breaks.
# Doesn't fail
# $1: string to echo
# Usage: CT_DoYes "" |make oldconfig
CT_DoYes() {
yes "$1" || true
}
# Add the specified directory to LD_LIBRARY_PATH, and export it
# If the specified patch is already present, just export
# $1: path to add