summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/bash-4.4.local.patch (renamed from patches/bash-4.4-rc2.local.patch)16
-rw-r--r--patches/coreutils-8.27.local.patch (renamed from patches/coreutils-8.26.local.patch)50
-rw-r--r--patches/glib-2.46.2.local.patch159
3 files changed, 36 insertions, 189 deletions
diff --git a/patches/bash-4.4-rc2.local.patch b/patches/bash-4.4.local.patch
index 6b8a97ed..14130372 100644
--- a/patches/bash-4.4-rc2.local.patch
+++ b/patches/bash-4.4.local.patch
@@ -1,5 +1,5 @@
---- bash-4.4-rc2/configure.orig 2016-08-05 22:29:55.000000000 +0200
-+++ bash-4.4-rc2/configure 2016-12-17 21:32:44.745849000 +0100
+--- bash-4.4/configure.orig 2016-08-05 22:29:55.000000000 +0200
++++ bash-4.4/configure 2016-12-17 21:32:44.745849000 +0100
@@ -2869,6 +2869,7 @@
*-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by Microsoft
*-nsk*) opt_bash_malloc=no ;; # HP NonStop
@@ -8,7 +8,7 @@
esac
# memory scrambling on free()
-@@ -5156,13 +5157,13 @@
+@@ -5157,13 +5158,13 @@
if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
bash_cv_termcap_lib=libcurses
else
@@ -26,7 +26,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -5182,18 +5183,18 @@
+@@ -5183,18 +5184,18 @@
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -51,7 +51,7 @@
else
bash_cv_termcap_lib=gnutermcap
fi
-@@ -5224,8 +5225,8 @@
+@@ -5225,8 +5226,8 @@
elif test $bash_cv_termcap_lib = libtinfo; then
TERMCAP_LIB=-ltinfo
TERMCAP_DEP=
@@ -62,7 +62,7 @@
TERMCAP_DEP=
elif test $bash_cv_termcap_lib = libc; then
TERMCAP_LIB=
-@@ -15811,13 +15812,13 @@
+@@ -15850,13 +15851,13 @@
if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
bash_cv_termcap_lib=libcurses
else
@@ -80,7 +80,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -15837,18 +15838,18 @@
+@@ -15876,18 +15877,18 @@
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -105,7 +105,7 @@
else
bash_cv_termcap_lib=gnutermcap
fi
-@@ -15879,8 +15880,8 @@
+@@ -15918,8 +15919,8 @@
elif test $bash_cv_termcap_lib = libtinfo; then
TERMCAP_LIB=-ltinfo
TERMCAP_DEP=
diff --git a/patches/coreutils-8.26.local.patch b/patches/coreutils-8.27.local.patch
index e68f87b2..5ba9ac7c 100644
--- a/patches/coreutils-8.26.local.patch
+++ b/patches/coreutils-8.27.local.patch
@@ -1,6 +1,7 @@
---- coreutils-8.26/configure.orig 2016-11-30 19:12:35.000000000 +0100
-+++ coreutils-8.26/configure 2016-12-17 21:40:01.397534600 +0100
-@@ -67855,3 +67855,11 @@
+diff -ru coreutils-8.27.orig/configure coreutils-8.27/configure
+--- coreutils-8.27.orig/configure 2017-03-09 06:00:50.000000000 +0100
++++ coreutils-8.27/configure 2017-08-11 19:04:46.135115372 +0200
+@@ -68318,3 +68318,12 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
@@ -12,20 +13,11 @@
+
+ sed -i -e 's/@cross_compiling@/'$cross_compiling'/g' Makefile || exit 2
+fi
---- coreutils-8.26/src/fs.h.orig 2016-11-30 14:59:20.000000000 +0100
-+++ coreutils-8.26/src/fs.h 2016-12-17 21:40:01.400534600 +0100
-@@ -2,7 +2,7 @@
- Please send additions to bug-coreutils@gnu.org and meskes@debian.org.
- This file is generated automatically from ./src/stat.c. */
-
--#if defined __linux__
-+#if defined __linux__ || defined __midipix__
- # define S_MAGIC_ACFS 0x61636673
- # define S_MAGIC_ADFS 0xADF5
- # define S_MAGIC_AFFS 0xADFF
---- coreutils-8.26/Makefile.in.orig 2016-11-30 19:34:55.000000000 +0100
-+++ coreutils-8.26/Makefile.in 2016-12-18 00:35:47.375117500 +0100
-@@ -3439,7 +3439,7 @@
++
+diff -ru coreutils-8.27.orig/Makefile.in coreutils-8.27/Makefile.in
+--- coreutils-8.27.orig/Makefile.in 2017-03-09 06:24:51.000000000 +0100
++++ coreutils-8.27/Makefile.in 2017-08-11 19:09:39.000000000 +0200
+@@ -3454,7 +3454,7 @@
INET_PTON_LIB = @INET_PTON_LIB@
INSTALL = $(cu_install_program) -c
INSTALL_DATA = @INSTALL_DATA@
@@ -34,7 +26,7 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
-@@ -5018,12 +5018,14 @@
+@@ -5040,12 +5040,14 @@
$(bin_SCRIPTS) \
$(EXTRA_PROGRAMS)
@@ -45,20 +37,22 @@
@CROSS_COMPILING_FALSE@cu_install_program = src/ginstall
# Use the just-built 'ginstall', when not cross-compiling.
--@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL_PROGRAM@
+-@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL@
+@CROSS_COMPILING_TRUE@cu_install_program = install
info_TEXINFOS = doc/coreutils.texi
doc_coreutils_TEXINFOS = \
doc/perm.texi \
-@@ -14636,6 +14638,7 @@
+@@ -14773,7 +14775,8 @@
$$argv$(EXEEXT)) \
&& : $${SOURCE_DATE_EPOCH=`cat $(srcdir)/.timestamp 2>/dev/null || :`} \
&& export SOURCE_DATE_EPOCH && $(run_help2man) \
+- --source='$(PACKAGE_STRING)' \
+ --no-discard-stderr \
- --source='$(PACKAGE_STRING)' \
++ --source='$(PACKAGE_STRING)' \
--include=$(srcdir)/man/$$name.x \
--output=$$t/$$name.1 \
-@@ -14649,6 +14652,7 @@
+ --info-page='\(aq(coreutils) '$$name' invocation\(aq' \
+@@ -14786,6 +14789,7 @@
&& chmod a-w $@-t \
&& mv $@-t $@
.PHONY: check-root
@@ -66,3 +60,15 @@
check-root:
$(MAKE) check TESTS='$(root_tests)' SUBDIRS=.
+diff -ru coreutils-8.27.orig/src/fs.h coreutils-8.27/src/fs.h
+--- coreutils-8.27.orig/src/fs.h 2017-03-09 05:44:05.000000000 +0100
++++ coreutils-8.27/src/fs.h 2017-08-11 19:05:05.283026746 +0200
+@@ -2,7 +2,7 @@
+ Please send additions to bug-coreutils@gnu.org and meskes@debian.org.
+ This file is generated automatically from ./src/stat.c. */
+
+-#if defined __linux__
++#if defined __linux__ || defined __midipix__
+ # define S_MAGIC_ACFS 0x61636673
+ # define S_MAGIC_ADFS 0xADF5
+ # define S_MAGIC_AFFS 0xADFF
diff --git a/patches/glib-2.46.2.local.patch b/patches/glib-2.46.2.local.patch
index 8153cb8a..6b6809c6 100644
--- a/patches/glib-2.46.2.local.patch
+++ b/patches/glib-2.46.2.local.patch
@@ -1,162 +1,3 @@
---- glib-2.46.2/configure.orig 2015-11-06 22:28:54.000000000 +0000
-+++ glib-2.46.2/configure 2016-03-06 18:55:06.490493143 +0000
-@@ -21737,33 +21737,7 @@
- if ${glib_cv_stack_grows+:} false; then :
- $as_echo_n "(cached) " >&6
- else
--
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
-- volatile int *a = 0, *b = 0;
-- void f (int i) { volatile int x = 5; if (i == 0) b = &x; else f (i - 1); }
-- int main () { volatile int y = 7; a = &y; f (100); return b > a ? 0 : 1; }
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
- glib_cv_stack_grows=yes
--
--else
-- glib_cv_stack_grows=no
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_stack_grows" >&5
- $as_echo "$glib_cv_stack_grows" >&6; }
-@@ -25142,37 +25116,7 @@
- if ${glib_cv_uscore+:} false; then :
- $as_echo_n "(cached) " >&6
- else
--
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include <dlfcn.h>
-- int glib_underscore_test (void) { return 42; }
-- int main() {
-- void *f1 = (void*)0, *f2 = (void*)0, *handle;
-- handle = dlopen ((void*)0, 0);
-- if (handle) {
-- f1 = dlsym (handle, "glib_underscore_test");
-- f2 = dlsym (handle, "_glib_underscore_test");
-- } return (!f2 || f1);
-- }
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
- glib_cv_uscore=yes
--else
-- glib_cv_uscore=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-- rm -f plugin.c plugin.$ac_objext plugin.lo
--
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_uscore" >&5
- $as_echo "$glib_cv_uscore" >&6; }
-@@ -26503,37 +26447,7 @@
- if ${ac_cv_func_posix_getpwuid_r+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <errno.h>
--#include <pwd.h>
--int main () {
-- char buffer[10000];
-- struct passwd pwd, *pwptr = &pwd;
-- int error;
-- errno = 0;
-- error = getpwuid_r (0, &pwd, buffer,
-- sizeof (buffer), &pwptr);
-- return (error < 0 && errno == ENOSYS)
-- || error == ENOSYS;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_posix_getpwuid_r=yes
--else
-- ac_cv_func_posix_getpwuid_r=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_posix_getpwuid_r" >&5
- $as_echo "$ac_cv_func_posix_getpwuid_r" >&6; }
-@@ -26594,37 +26508,7 @@
- if ${ac_cv_func_posix_getgrgid_r+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <errno.h>
--#include <grp.h>
--int main () {
-- char buffer[10000];
-- struct group grp, *grpptr = &grp;
-- int error;
-- errno = 0;
-- error = getgrgid_r (0, &grp, buffer,
-- sizeof (buffer), &grpptr);
-- return (error < 0 && errno == ENOSYS)
-- || error == ENOSYS;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_posix_getgrgid_r=yes
--else
-- ac_cv_func_posix_getgrgid_r=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_posix_getgrgid_r" >&5
- $as_echo "$ac_cv_func_posix_getgrgid_r" >&6; }
-@@ -27053,7 +26937,7 @@
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-- glib_cv_eventfd=yes
-+ glib_cv_eventfd=no
- else
- glib_cv_eventfd=no
- fi
--- glib-2.46.2/gio/inotify/Makefile.in.orig 2015-11-06 23:28:59.000000000 +0100
+++ glib-2.46.2/gio/inotify/Makefile.in 2016-09-07 05:20:16.670049836 +0200
@@ -180,7 +180,7 @@
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 15:57:31 +0000