mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

toolchain: Add glibc 2.22

Browse Source 
Signed-off-by: Michael Marley <michael@michaelmarley.com>

SVN-Revision: 48383
This commit is contained in:
Felix Fietkau 2016-01-19 22:58:51 +00:00
parent 7c2356e2a0
commit f6e4badfe4
6 changed files with 79 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/libs/toolchain/Makefile
View File

@ -366,9 +366,9 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/usr/lib/
endef
use_libutil=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
use_libnsl=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
use_nsswitch=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
use_libutil=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
use_libnsl=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
use_nsswitch=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
define Package/glibc/install
$(CP) ./glibc-files/* $(1)/

4
toolchain/glibc/Config.in
View File

@ -13,6 +13,10 @@ choice
bool "glibc 2.21"
select GLIBC_VERSION_2_21
config GLIBC_USE_VERSION_2_22
bool "glibc 2.22"
select GLIBC_VERSION_2_22
endchoice
menu "eglibc configuration"

5
toolchain/glibc/Config.version
View File

@ -4,6 +4,7 @@ config GLIBC_VERSION
string
default "2.19" if EGLIBC_VERSION_2_19
default "2.21" if GLIBC_VERSION_2_21
default "2.22" if GLIBC_VERSION_2_22
config EGLIBC_VERSION_2_19
default y if !TOOLCHAINOPTS
@ -12,10 +13,14 @@ config EGLIBC_VERSION_2_19
config GLIBC_VERSION_2_21
bool
config GLIBC_VERSION_2_22
bool
config GLIBC_REVISION
string
default "25243" if EGLIBC_VERSION_2_19
default "4e42b5b8f8" if GLIBC_VERSION_2_21
default "78bd7499af" if GLIBC_VERSION_2_22
default ""
endif

2
toolchain/glibc/common.mk
View File

@ -97,7 +97,7 @@ endef
define Host/Prepare
$(call Host/Prepare/Default)
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
ifeq ($(CONFIG_GLIBC_VERSION_2_21),)
ifeq ($(CONFIG_GLIBC_VERSION_2_21)$(CONFIG_GLIBC_VERSION_2_22),)
$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
endif
endef

52
toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch Normal file
View File

@ -0,0 +1,52 @@
--- a/sunrpc/rpc/types.h
+++ b/sunrpc/rpc/types.h
@@ -75,18 +75,23 @@ typedef unsigned long rpcport_t;
#endif
#ifndef __u_char_defined
-typedef __u_char u_char;
-typedef __u_short u_short;
-typedef __u_int u_int;
-typedef __u_long u_long;
-typedef __quad_t quad_t;
-typedef __u_quad_t u_quad_t;
-typedef __fsid_t fsid_t;
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+typedef unsigned int u_int;
+typedef unsigned long u_long;
+#if __WORDSIZE == 64
+typedef long int quad_t;
+typedef unsigned long int u_quad_t;
+#elif defined __GLIBC_HAVE_LONG_LONG
+typedef long long int quad_t;
+typedef unsigned long long int u_quad_t;
+#endif
+typedef u_quad_t fsid_t;
# define __u_char_defined
#endif
-#ifndef __daddr_t_defined
-typedef __daddr_t daddr_t;
-typedef __caddr_t caddr_t;
+#if !defined(__daddr_t_defined) && defined(linux)
+typedef long int daddr_t;
+typedef char *caddr_t;
# define __daddr_t_defined
#endif
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -958,9 +958,10 @@ mkfile_output (struct commandline *cmd)
abort ();
temp = rindex (cmd->infile, '.');
cp = stpcpy (mkfilename, "Makefile.");
- if (temp != NULL)
- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
- else
+ if (temp != NULL) {
+ strncpy(cp, cmd->infile, temp - cmd->infile);
+ cp[temp - cmd->infile - 1] = 0;
+ } else
stpcpy (cp, cmd->infile);
}

14
toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch Normal file
View File

@ -0,0 +1,14 @@
add /usr/lib to default search path for the dynamic linker
--- a/Makeconfig
+++ b/Makeconfig
@@ -501,6 +501,9 @@ else
default-rpath = $(libdir)
endif
+# Add /usr/lib to default search path for the dynamic linker
+user-defined-trusted-dirs := /usr/lib
+
ifndef link-extra-libs
link-extra-libs = $(LDLIBS-$(@F))
link-extra-libs-static = $(link-extra-libs)