浏览代码

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

"Steven J. Hill" 19 年之前
父节点
当前提交
7a8d809a3a
共有 3 个文件被更改,包括 25 次插入0 次删除
  1. 12 0
      package/coreutils/coreutils.patch
  2. 1 0
      package/diffutils/diffutils.mk
  3. 12 0
      package/diffutils/diffutils.patch

+ 12 - 0
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;

+ 1 - 0
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

+ 12 - 0
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;