diff options
Diffstat (limited to 'patches')
6 files changed, 421 insertions, 0 deletions
diff --git a/patches/elf2flt/9dbc458c6122c495bbdec8dc975a15c9d39e5ff2/0001-Check-for-libz-first.patch b/patches/elf2flt/9dbc458c6122c495bbdec8dc975a15c9d39e5ff2/0001-Check-for-libz-first.patch new file mode 100644 index 0000000..f947e1f --- /dev/null +++ b/patches/elf2flt/9dbc458c6122c495bbdec8dc975a15c9d39e5ff2/0001-Check-for-libz-first.patch @@ -0,0 +1,294 @@ +From 9848b4f5b207d762a75d6cf0ccbb59c6486a1616 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman <stilor@att.net> +Date: Fri, 3 Feb 2017 22:01:48 -0800 +Subject: [PATCH] Check for libz first + +If building statically, linking libz before libbfd results in unresolved symbols +(compress/compressBound in libbfd.a). + +Signed-off-by: Alexey Neyman <stilor@att.net> +--- + configure | 108 +++++++++++++++++++++++++++++++++-------------------------- + configure.ac | 10 +++--- + 2 files changed, 65 insertions(+), 53 deletions(-) + +diff --git a/configure b/configure +index d8d14be..df612cb 100755 +--- a/configure ++++ b/configure +@@ -675,6 +675,7 @@ infodir + docdir + oldincludedir + includedir ++runstatedir + localstatedir + sharedstatedir + sysconfdir +@@ -758,6 +759,7 @@ datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' ++runstatedir='${localstatedir}/run' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE}' +@@ -1010,6 +1012,15 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + ++ -runstatedir | --runstatedir | --runstatedi | --runstated \ ++ | --runstate | --runstat | --runsta | --runst | --runs \ ++ | --run | --ru | --r) ++ ac_prev=runstatedir ;; ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ ++ | --run=* | --ru=* | --r=*) ++ runstatedir=$ac_optarg ;; ++ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -1147,7 +1158,7 @@ fi + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir ++ libdir localedir mandir runstatedir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +@@ -1300,6 +1311,7 @@ Fine tuning of the installation directories: + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +@@ -3779,14 +3791,14 @@ if test "$ac_binutils_build_dir" != "NONE"; then + test "$ac_binutils_include_dir" = "NONE" && ac_binutils_include_dir="$ac_binutils_build_dir/include" + fi + +-if test "$ac_libiberty" = "NONE"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objalloc_create in -liberty" >&5 +-$as_echo_n "checking for objalloc_create in -liberty... " >&6; } +-if ${ac_cv_lib_iberty_objalloc_create+:} false; then : ++if test "$ac_zlib_prefix" = "NONE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 ++$as_echo_n "checking for deflate in -lz... " >&6; } ++if ${ac_cv_lib_z_deflate+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-liberty $LIBS" ++LIBS="-lz $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -3796,47 +3808,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char objalloc_create (); ++char deflate (); + int + main () + { +-return objalloc_create (); ++return deflate (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_iberty_objalloc_create=yes ++ ac_cv_lib_z_deflate=yes + else +- ac_cv_lib_iberty_objalloc_create=no ++ ac_cv_lib_z_deflate=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_objalloc_create" >&5 +-$as_echo "$ac_cv_lib_iberty_objalloc_create" >&6; } +-if test "x$ac_cv_lib_iberty_objalloc_create" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 ++$as_echo "$ac_cv_lib_z_deflate" >&6; } ++if test "x$ac_cv_lib_z_deflate" = xyes; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBIBERTY 1 ++#define HAVE_LIBZ 1 + _ACEOF + +- LIBS="-liberty $LIBS" ++ LIBS="-lz $LIBS" + + fi + +- ac_libiberty=auto + else +- LIBS="$ac_libiberty $LIBS" ++ LIBS="-L$ac_zlib_prefix/lib -lz $LIBS" + fi +-if test "$ac_libbfd" = "NONE"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5 +-$as_echo_n "checking for bfd_openr in -lbfd... " >&6; } +-if ${ac_cv_lib_bfd_bfd_openr+:} false; then : ++if test "$ac_libiberty" = "NONE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objalloc_create in -liberty" >&5 ++$as_echo_n "checking for objalloc_create in -liberty... " >&6; } ++if ${ac_cv_lib_iberty_objalloc_create+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lbfd $LIBS" ++LIBS="-liberty $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -3846,47 +3857,47 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char bfd_openr (); ++char objalloc_create (); + int + main () + { +-return bfd_openr (); ++return objalloc_create (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_bfd_bfd_openr=yes ++ ac_cv_lib_iberty_objalloc_create=yes + else +- ac_cv_lib_bfd_bfd_openr=no ++ ac_cv_lib_iberty_objalloc_create=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 +-$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; } +-if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_objalloc_create" >&5 ++$as_echo "$ac_cv_lib_iberty_objalloc_create" >&6; } ++if test "x$ac_cv_lib_iberty_objalloc_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBBFD 1 ++#define HAVE_LIBIBERTY 1 + _ACEOF + +- LIBS="-lbfd $LIBS" ++ LIBS="-liberty $LIBS" + + fi + +- ac_libbfd=auto ++ ac_libiberty=auto + else +- LIBS="$ac_libbfd $LIBS" ++ LIBS="$ac_libiberty $LIBS" + fi +-if test "$ac_zlib_prefix" = "NONE"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 +-$as_echo_n "checking for deflate in -lz... " >&6; } +-if ${ac_cv_lib_z_deflate+:} false; then : ++if test "$ac_libbfd" = "NONE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5 ++$as_echo_n "checking for bfd_openr in -lbfd... " >&6; } ++if ${ac_cv_lib_bfd_bfd_openr+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++LIBS="-lbfd $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -3896,37 +3907,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char deflate (); ++char bfd_openr (); + int + main () + { +-return deflate (); ++return bfd_openr (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_z_deflate=yes ++ ac_cv_lib_bfd_bfd_openr=yes + else +- ac_cv_lib_z_deflate=no ++ ac_cv_lib_bfd_bfd_openr=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 +-$as_echo "$ac_cv_lib_z_deflate" >&6; } +-if test "x$ac_cv_lib_z_deflate" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 ++$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; } ++if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBZ 1 ++#define HAVE_LIBBFD 1 + _ACEOF + +- LIBS="-lz $LIBS" ++ LIBS="-lbfd $LIBS" + + fi + ++ ac_libbfd=auto + else +- LIBS="-L$ac_zlib_prefix/lib -lz $LIBS" ++ LIBS="$ac_libbfd $LIBS" + fi + + bfd_include_dir= +diff --git a/configure.ac b/configure.ac +index dcf0f92..7dcc082 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,6 +114,11 @@ if test "$ac_binutils_build_dir" != "NONE"; then + fi + + dnl Checks for libraries. ++if test "$ac_zlib_prefix" = "NONE"; then ++ AC_CHECK_LIB(z, deflate) ++else ++ LIBS="-L$ac_zlib_prefix/lib -lz $LIBS" ++fi + if test "$ac_libiberty" = "NONE"; then + AC_CHECK_LIB(iberty, objalloc_create) + ac_libiberty=auto +@@ -126,11 +131,6 @@ if test "$ac_libbfd" = "NONE"; then + else + LIBS="$ac_libbfd $LIBS" + fi +-if test "$ac_zlib_prefix" = "NONE"; then +- AC_CHECK_LIB(z, deflate) +-else +- LIBS="-L$ac_zlib_prefix/lib -lz $LIBS" +-fi + + bfd_include_dir= + if test "$ac_bfd_include_dir" != "NONE"; then +-- +2.9.3 + diff --git a/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch new file mode 100644 index 0000000..9097628 --- /dev/null +++ b/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch @@ -0,0 +1,13 @@ +--- glibc-2.22/sunrpc/rpc_main.c.orig 2015-08-05 07:42:21.000000000 +0100 ++++ glibc-2.22/sunrpc/rpc_main.c 2015-10-21 23:37:31.071268800 +0100 +@@ -51,6 +51,10 @@ + #include "rpc_scan.h" + #include "proto.h" + ++#if defined(__CYGWIN__) ++#define stat64 stat ++#endif ++ + #include "../version.h" + #define PACKAGE _libc_intl_domainname + diff --git a/patches/glibc/2.25/110-sh-fix-gcc6.patch b/patches/glibc/2.25/110-sh-fix-gcc6.patch new file mode 100644 index 0000000..cacf390 --- /dev/null +++ b/patches/glibc/2.25/110-sh-fix-gcc6.patch @@ -0,0 +1,28 @@ +From 279acf7a059f2d2296f690d7f2d886bd0e404f30 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman <stilor@att.net> +Date: Wed, 25 Jan 2017 21:46:53 -0800 +Subject: [PATCH] sh: conditional is false in dl-conflict.c + +... ifdef it out, so that it doesn't create a call to abort(). + +Signed-off-by: Alexey Neyman <stilor@att.net> +--- + sysdeps/sh/dl-machine.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h +index 449deea..2b468af 100644 +--- a/sysdeps/sh/dl-machine.h ++++ b/sysdeps/sh/dl-machine.h +@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, + break; + case R_SH_DIR32: + { +-#ifndef RTLD_BOOTSTRAP ++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP + /* This is defined in rtld.c, but nowhere in the static + libc.a; make the reference weak so static programs can + still link. This declaration cannot be done when +-- +2.9.3 + diff --git a/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch b/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch new file mode 100644 index 0000000..59ab087 --- /dev/null +++ b/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch @@ -0,0 +1,30 @@ +From 3a36c1eea4fa3b6f3b3b43f7eb91152383ae4ad8 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman <stilor@att.net> +Date: Tue, 24 Jan 2017 10:31:40 -0800 +Subject: [PATCH] Fix build with --enable-static-nss + +* nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions + match those around use, to avoid "defined but not used" error. + +Signed-off-by: Alexey Neyman <stilor@att.net> +--- + ChangeLog | 5 +++++ + nss/nsswitch.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/nss/nsswitch.c b/nss/nsswitch.c +index 0a65f6a..8f31658 100644 +--- a/nss/nsswitch.c ++++ b/nss/nsswitch.c +@@ -94,7 +94,7 @@ static name_database *service_table; + static name_database_entry *defconfig_entries; + + +-#ifdef USE_NSCD ++#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED) + /* Nonzero if this is the nscd process. */ + static bool is_nscd; + /* The callback passed to the init functions when nscd is used. */ +-- +2.9.3 + diff --git a/patches/glibc/2.25/910-typedef-caddr.patch b/patches/glibc/2.25/910-typedef-caddr.patch new file mode 100644 index 0000000..fc7979b --- /dev/null +++ b/patches/glibc/2.25/910-typedef-caddr.patch @@ -0,0 +1,15 @@ +diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h +--- glibc-2.23-orig/posix/sys/types.h 2016-02-18 12:54:00.000000000 -0500 ++++ glibc-2.23/posix/sys/types.h 2017-01-06 11:40:05.842147165 -0500 +@@ -113,7 +113,10 @@ + #ifdef __USE_MISC + # ifndef __daddr_t_defined + typedef __daddr_t daddr_t; ++# if ! defined(caddr_t) && ! defined(__caddr_t_defined) + typedef __caddr_t caddr_t; ++# define __caddr_t_defined ++# endif + # define __daddr_t_defined + # endif + #endif + diff --git a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch b/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch new file mode 100644 index 0000000..8bc87ec --- /dev/null +++ b/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch @@ -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 + |