diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-02-11 13:03:07 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-02-11 20:34:26 +0100 |
| commit | f4d9d7a26b40db14c5d6a87f19df55dfb9000170 (patch) | |
| tree | a22afe8be4db566ea2db5fc34e49c5209b8a18ff /toolchain/glibc/patches/2.24 | |
| parent | 657418db68fe2be89bdba2a147a08168d7a760ba (diff) | |
| download | mtk-20170518-f4d9d7a26b40db14c5d6a87f19df55dfb9000170.zip mtk-20170518-f4d9d7a26b40db14c5d6a87f19df55dfb9000170.tar.gz mtk-20170518-f4d9d7a26b40db14c5d6a87f19df55dfb9000170.tar.bz2 | |
glibc: use default PATCH_DIR
Version configuration is gone, so version specific patch directories are
not necessary either.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'toolchain/glibc/patches/2.24')
| -rw-r--r-- | toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch | 52 | ||||
| -rw-r--r-- | toolchain/glibc/patches/2.24/200-add-dl-search-paths.patch | 14 |
2 files changed, 0 insertions, 66 deletions
diff --git a/toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch b/toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch deleted file mode 100644 index 6a5e537..0000000 --- a/toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- 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); - - } diff --git a/toolchain/glibc/patches/2.24/200-add-dl-search-paths.patch b/toolchain/glibc/patches/2.24/200-add-dl-search-paths.patch deleted file mode 100644 index d65a0bc..0000000 --- a/toolchain/glibc/patches/2.24/200-add-dl-search-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -add /usr/lib to default search path for the dynamic linker - ---- a/Makeconfig -+++ b/Makeconfig -@@ -526,6 +526,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) |