Author: nbd Date: 2016-01-19 23:58:51 +0100 (Tue, 19 Jan 2016) New Revision: 48383
Added: trunk/toolchain/glibc/patches/2.22/ trunk/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch trunk/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch Modified: trunk/package/libs/toolchain/Makefile trunk/toolchain/glibc/Config.in trunk/toolchain/glibc/Config.version trunk/toolchain/glibc/common.mk Log: toolchain: Add glibc 2.22 Signed-off-by: Michael Marley <[email protected]> Modified: trunk/package/libs/toolchain/Makefile =================================================================== --- trunk/package/libs/toolchain/Makefile 2016-01-19 22:53:21 UTC (rev 48382) +++ trunk/package/libs/toolchain/Makefile 2016-01-19 22:58:51 UTC (rev 48383) @@ -366,9 +366,9 @@ $(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)/ Modified: trunk/toolchain/glibc/Config.in =================================================================== --- trunk/toolchain/glibc/Config.in 2016-01-19 22:53:21 UTC (rev 48382) +++ trunk/toolchain/glibc/Config.in 2016-01-19 22:58:51 UTC (rev 48383) @@ -13,6 +13,10 @@ 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" Modified: trunk/toolchain/glibc/Config.version =================================================================== --- trunk/toolchain/glibc/Config.version 2016-01-19 22:53:21 UTC (rev 48382) +++ trunk/toolchain/glibc/Config.version 2016-01-19 22:58:51 UTC (rev 48383) @@ -4,6 +4,7 @@ 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 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 Modified: trunk/toolchain/glibc/common.mk =================================================================== --- trunk/toolchain/glibc/common.mk 2016-01-19 22:53:21 UTC (rev 48382) +++ trunk/toolchain/glibc/common.mk 2016-01-19 22:58:51 UTC (rev 48383) @@ -97,7 +97,7 @@ 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 Copied: trunk/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch (from rev 48380, trunk/toolchain/glibc/patches/2.21/100-fix_cross_rpcgen.patch) =================================================================== --- trunk/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch (rev 0) +++ trunk/toolchain/glibc/patches/2.22/100-fix_cross_rpcgen.patch 2016-01-19 22:58:51 UTC (rev 48383) @@ -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); + + } Copied: trunk/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch (from rev 48380, trunk/toolchain/glibc/patches/2.21/200-add-dl-search-paths.patch) =================================================================== --- trunk/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch (rev 0) +++ trunk/toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch 2016-01-19 22:58:51 UTC (rev 48383) @@ -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) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
