From 7a8d809a3a9d1b66bcce96a4b1f9df916ba93099 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Thu, 8 Dec 2005 06:47:07 +0000 Subject: [PATCH] Fix broken packages that try to use __mempcpy. Shame on you. --- package/coreutils/coreutils.patch | 12 ++++++++++++ package/diffutils/diffutils.mk | 1 + package/diffutils/diffutils.patch | 12 ++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 package/coreutils/coreutils.patch create mode 100644 package/diffutils/diffutils.patch diff --git a/package/coreutils/coreutils.patch b/package/coreutils/coreutils.patch new file mode 100644 index 0000000000..0cc2f1a0e8 --- /dev/null +++ b/package/coreutils/coreutils.patch @@ -0,0 +1,12 @@ +diff -urN coreutils-5.3.0/lib/regex.c coreutils-5.3.0-patched/lib/regex.c +--- coreutils-5.3.0/lib/regex.c 2004-10-05 01:30:48.000000000 -0500 ++++ coreutils-5.3.0-patched/lib/regex.c 2005-12-08 00:40:30.500238000 -0600 +@@ -8179,7 +8179,7 @@ + if (msg_size > errbuf_size) + { + #if defined HAVE_MEMPCPY || defined _LIBC +- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; ++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; + #else + memcpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 56d17eb66f..5a5645c2b2 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -17,6 +17,7 @@ diffutils-source: $(DL_DIR)/$(DIFFUTILS_SOURCE) $(DIFFUTILS_DIR)/.unpacked: $(DL_DIR)/$(DIFFUTILS_SOURCE) $(DIFFUTILS_CAT) $(DL_DIR)/$(DIFFUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(DIFFUTILS_DIR) package/diffutils/ diffutils*.patch touch $(DIFFUTILS_DIR)/.unpacked $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked diff --git a/package/diffutils/diffutils.patch b/package/diffutils/diffutils.patch new file mode 100644 index 0000000000..fba2b84a85 --- /dev/null +++ b/package/diffutils/diffutils.patch @@ -0,0 +1,12 @@ +diff -ur diffutils-2.8.4/lib/regex.c diffutils-2.8.4-patched/lib/regex.c +--- diffutils-2.8.4/lib/regex.c 2002-03-01 01:44:52.000000000 -0600 ++++ diffutils-2.8.4-patched/lib/regex.c 2005-12-08 00:44:03.101524750 -0600 +@@ -8314,7 +8314,7 @@ + if (msg_size > errbuf_size) + { + #if defined HAVE_MEMPCPY || defined _LIBC +- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; ++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; + #else + memcpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; -- 2.30.2