Commit 7a8d809a authored by "Steven J. Hill"'s avatar "Steven J. Hill"
Browse files

Fix broken packages that try to use __mempcpy. Shame on you.

parent c0267dc4

package/coreutils/coreutils.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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;

package/diffutils/diffutils.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

package/diffutils/diffutils.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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;