Commit 1b5271d7 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated diffutils to 3.8

parent f78d51c1
all: all:
tar xf diffutils-3.7.tar.xz tar xf diffutils-3.8.tar.xz
patch -Np1 -d diffutils-3.7 < diffutils-3.7-gnulib-perror-tests.patch cd diffutils-3.8 && ./configure --build=$(CLFS_TARGET) --prefix=/usr
cd diffutils-3.7 && ./configure --build=$(CLFS_TARGET) --prefix=/usr $(MAKE) -C diffutils-3.8
$(MAKE) -C diffutils-3.7
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
$(MAKE) -C diffutils-3.7 check ; \ $(MAKE) -C diffutils-3.8 check ; \
fi fi
$(MAKE) -C diffutils-3.7 install $(MAKE) -C diffutils-3.8 install
rm -rf diffutils-3.7 rm -rf diffutils-3.8
<project name="diffutils"> <project name="diffutils">
<target name="temporary-diffutils"> <target name="temporary-diffutils">
<property name="makedir" value="${builddir}/diffutils-3.7"/> <property name="makedir" value="${builddir}/diffutils-3.8"/>
<exec executable="tar" failonerror="true"> <exec executable="tar" failonerror="true">
<arg line="xf packages/diffutils/diffutils-3.7.tar.xz -C ${builddir}"/> <arg line="xf packages/diffutils/diffutils-3.8.tar.xz -C ${builddir}"/>
</exec> </exec>
<exec executable="./configure" dir="${makedir}" failonerror="true"> <exec executable="./configure" dir="${makedir}" failonerror="true">
<env key="PATH" path="${PATH}"/> <env key="PATH" path="${PATH}"/>
......
diff -uNr diffutils-3.7/gnulib-tests/test-perror2.c diffutils-3.7-gnulib-perror-tests/gnulib-tests/test-perror2.c
--- diffutils-3.7/gnulib-tests/test-perror2.c 2018-01-07 11:15:53.000000000 +1030
+++ diffutils-3.7-gnulib-perror-tests/gnulib-tests/test-perror2.c 2023-09-07 14:29:14.670331075 +0930
@@ -79,9 +79,6 @@
errno = -5;
perror ("");
ASSERT (!ferror (stderr));
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
diff -uNr diffutils-3.7/gnulib-tests/test-strerror_r.c diffutils-3.7-gnulib-perror-tests/gnulib-tests/test-strerror_r.c
--- diffutils-3.7/gnulib-tests/test-strerror_r.c 2018-01-07 11:15:53.000000000 +1030
+++ diffutils-3.7-gnulib-perror-tests/gnulib-tests/test-strerror_r.c 2023-09-07 14:29:14.670331075 +0930
@@ -165,9 +165,6 @@
strerror_r (EACCES, buf, sizeof buf);
strerror_r (-5, buf, sizeof buf);
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment