Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix patch makefile and unfuzzy some early patches. #466

Merged
merged 1 commit into from
May 5, 2024
Merged

Fix patch makefile and unfuzzy some early patches. #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions steps/bash-2.05b/patches/dev-tty.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ diff --color -ru shell.c
-
#ifdef __CYGWIN__
_cygwin32_check_tmp ();
#endif /* __CYGWIN__ */
6 changes: 3 additions & 3 deletions steps/bzip2-1.0.8/patches/coreutils.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions steps/flex-2.5.11/patches/scan_l.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]


<SECT2PROLOG>{
Expand All @@ -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]
}
}

Expand Down
2 changes: 1 addition & 1 deletion steps/patch-2.5.9/mk/main.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion steps/patch-2.5.9/patch-2.5.9.checksums
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
728596bca1f67ec8386f312d8738eeb398203505851faad91406c29a299bc748 /usr/bin/patch
b14c139752c048cf2569f9724f2480f242b55e89bd0bb4f3970ff6c4a9390954 /usr/bin/patch
Loading