From 6ade9e0e8a72f9096c85a9f6d69af255db8b6da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 5 May 2024 10:09:59 +0100 Subject: [PATCH] Fix patch makefile and unfuzzy some early patches. --- steps/bash-2.05b/patches/dev-tty.patch | 1 + steps/bzip2-1.0.8/patches/coreutils.patch | 6 +++--- steps/flex-2.5.11/patches/scan_l.patch | 4 ++-- steps/patch-2.5.9/mk/main.mk | 2 +- steps/patch-2.5.9/patch-2.5.9.checksums | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/steps/bash-2.05b/patches/dev-tty.patch b/steps/bash-2.05b/patches/dev-tty.patch index 61d67c8d..8c381a85 100644 --- a/steps/bash-2.05b/patches/dev-tty.patch +++ b/steps/bash-2.05b/patches/dev-tty.patch @@ -17,3 +17,4 @@ diff --color -ru shell.c - #ifdef __CYGWIN__ _cygwin32_check_tmp (); + #endif /* __CYGWIN__ */ diff --git a/steps/bzip2-1.0.8/patches/coreutils.patch b/steps/bzip2-1.0.8/patches/coreutils.patch index 942f600d..25dee3e7 100644 --- a/steps/bzip2-1.0.8/patches/coreutils.patch +++ b/steps/bzip2-1.0.8/patches/coreutils.patch @@ -19,9 +19,9 @@ diff -r -N -U3 Makefile Makefile # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -44,11 +44,6 @@ - +@@ -46,11 +46,6 @@ libbz2.a: $(OBJS) + rm -f libbz2.a $(AR) cq libbz2.a $(OBJS) - @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \ - -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \ @@ -31,7 +31,7 @@ diff -r -N -U3 Makefile Makefile check: test test: bzip2 -@@ -114,7 +108,6 @@ +@@ -114,7 +109,6 @@ sample1.tst sample2.tst sample3.tst blocksort.o: blocksort.c diff --git a/steps/flex-2.5.11/patches/scan_l.patch b/steps/flex-2.5.11/patches/scan_l.patch index 1a1d268b..7d41a421 100644 --- a/steps/flex-2.5.11/patches/scan_l.patch +++ b/steps/flex-2.5.11/patches/scan_l.patch @@ -10,7 +10,7 @@ diff --git scan.l scan.l index 18d0de8..c251a5e 100644 --- scan.l +++ scan.l -@@ -334,8 +335,8 @@ LEXOPT [aceknopr] +@@ -335,8 +335,8 @@ LEXOPT [aceknopr] { @@ -21,7 +21,7 @@ index 18d0de8..c251a5e 100644 ^{WS}.* ACTION_ECHO; /* indented code in prolog */ -@@ -480,11 +481,11 @@ LEXOPT [aceknopr] +@@ -481,11 +481,11 @@ LEXOPT [aceknopr] } } diff --git a/steps/patch-2.5.9/mk/main.mk b/steps/patch-2.5.9/mk/main.mk index c24c2ca5..5f8b7eb2 100644 --- a/steps/patch-2.5.9/mk/main.mk +++ b/steps/patch-2.5.9/mk/main.mk @@ -5,7 +5,7 @@ CC = tcc CFLAGS = -I . -CPPFLAGS = -DHAVE_DECL_GETENV -DHAVE_DECL_MALLOC -DHAVE_DIRENT_H -DHAVE_LIMITS_H -DHAVE_GETEUID -DHAVE_MKTEMP -DPACKAGE_BUGREPORT= -Ded_PROGRAM=\"/nullop\" -Dmbstate_t=void -DRETSIGTYPE=int -DHAVE_MKDIR -DHAVE_RMDIR -DHAVE_FCNTL_H -DPACKAGE_NAME=\"patch\" -DPACKAGE_VERSION=\"2.5.9\" -DHAVE_MALLOC -DHAVE_REALLOC -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STDLIB_H +CPPFLAGS = -DHAVE_DECL_GETENV -DHAVE_DECL_MALLOC -DHAVE_DIRENT_H -DHAVE_LIMITS_H -DHAVE_GETEUID -DHAVE_MKTEMP -DPACKAGE_BUGREPORT= -Ded_PROGRAM=\"/nullop\" -Dmbstate_t=void\* -DRETSIGTYPE=int -DHAVE_MKDIR -DHAVE_RMDIR -DHAVE_FCNTL_H -DPACKAGE_NAME=\"patch\" -DPACKAGE_VERSION=\"2.5.9\" -DHAVE_MALLOC -DHAVE_REALLOC -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STDLIB_H LDFLAGS = -static .PHONY: all diff --git a/steps/patch-2.5.9/patch-2.5.9.checksums b/steps/patch-2.5.9/patch-2.5.9.checksums index a6fcde24..e4f0c9d5 100644 --- a/steps/patch-2.5.9/patch-2.5.9.checksums +++ b/steps/patch-2.5.9/patch-2.5.9.checksums @@ -1 +1 @@ -728596bca1f67ec8386f312d8738eeb398203505851faad91406c29a299bc748 /usr/bin/patch +b14c139752c048cf2569f9724f2480f242b55e89bd0bb4f3970ff6c4a9390954 /usr/bin/patch