archives/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-03-08 01:24:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tests.checkpointBuildTools: fix hello patches

Browse source
This commit is contained in:
Tom Hunze 2025-11-20 21:49:38 +01:00
parent 0e8b0c4be1
commit c92df6ba1d
No known key found for this signature in database
2 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pkgs/test/checkpointBuild/hello-additionalFile.patch
View file

@ -4,27 +4,27 @@
:100644 100644 0000000 0000000 M src/system.h
diff --git a/Makefile.in b/Makefile.in
index 1597d39..f63f830 100644
index 7bacfe1..b0f3a3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,7 +312,7 @@ am_lib_libhello_a_OBJECTS = lib/basename-lgpl.$(OBJEXT) \
lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \
lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \
lib/xalloc-die.$(OBJEXT) lib/xstriconv.$(OBJEXT) \
- lib/xstrndup.$(OBJEXT)
+ lib/xstrndup.$(OBJEXT) src/additionalFile.$(OBJEXT)
@@ -500,7 +500,7 @@ am_lib_libhello_a_OBJECTS = lib/libhello_a-basename-lgpl.$(OBJEXT) \
lib/libhello_a-wctype-h.$(OBJEXT) $(am__objects_51) \
lib/libhello_a-xmalloc.$(OBJEXT) \
lib/libhello_a-xalloc-die.$(OBJEXT) \
- lib/libhello_a-xstriconv.$(OBJEXT)
+ lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(OBJEXT)
lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS)
am_hello_OBJECTS = src/hello.$(OBJEXT)
hello_OBJECTS = $(am_hello_OBJECTS)
@@ -1842,7 +1842,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \
$(am__append_4) $(am__append_5) lib/version-etc.h \
@@ -2557,7 +2557,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \
$(am__append_51) $(am__append_52) lib/version-etc.h \
lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \
lib/xmalloc.c lib/xalloc-die.c lib/xstriconv.h lib/xstriconv.c \
- lib/xstrndup.h lib/xstrndup.c
+ lib/xstrndup.h lib/xstrndup.c src/additionalFile.c
lib_libhello_a_LIBADD = $(gl_LIBOBJS)
lib_libhello_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_lib_libhello_a_SOURCES = lib/close.c lib/stripslash.c lib/dup2.c \
$(am__append_53) lib/xmalloc.c lib/xalloc-die.c \
- lib/xstriconv.h lib/xstriconv.c
+ lib/xstriconv.h lib/xstriconv.c src/additionalFile.c
lib_libhello_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS)
lib_libhello_a_LIBADD = $(gl_libhello_LIBOBJS)
lib_libhello_a_DEPENDENCIES = $(gl_libhello_LIBOBJS)
diff --git a/src/additionalFile.c b/src/additionalFile.c
new file mode 100644
index 0000000..34d683d

36
pkgs/test/checkpointBuild/hello-removeFile.patch
View file

@ -3,28 +3,28 @@
:100644 100644 0000000 0000000 M src/hello.c
:100755 100755 0000000 0000000 M tests/hello-1
diff --git a/Makefile.in b/Makefile.in
index f63f830..1597d39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,7 +312,7 @@ am_lib_libhello_a_OBJECTS = lib/basename-lgpl.$(OBJEXT) \
lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \
lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \
lib/xalloc-die.$(OBJEXT) lib/xstriconv.$(OBJEXT) \
- lib/xstrndup.$(OBJEXT) src/additionalFile.$(OBJEXT)
+ lib/xstrndup.$(OBJEXT)
diff --git b/Makefile.in a/Makefile.in
index b0f3a3d..7bacfe1 100644
--- b/Makefile.in
+++ a/Makefile.in
@@ -500,7 +500,7 @@ am_lib_libhello_a_OBJECTS = lib/libhello_a-basename-lgpl.$(OBJEXT) \
lib/libhello_a-wctype-h.$(OBJEXT) $(am__objects_51) \
lib/libhello_a-xmalloc.$(OBJEXT) \
lib/libhello_a-xalloc-die.$(OBJEXT) \
- lib/libhello_a-xstriconv.$(OBJEXT) src/additionalFile.$(OBJEXT)
+ lib/libhello_a-xstriconv.$(OBJEXT)
lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS)
am_hello_OBJECTS = src/hello.$(OBJEXT)
hello_OBJECTS = $(am_hello_OBJECTS)
@@ -1842,7 +1842,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \
$(am__append_4) $(am__append_5) lib/version-etc.h \
@@ -2557,7 +2557,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \
$(am__append_51) $(am__append_52) lib/version-etc.h \
lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \
lib/xmalloc.c lib/xalloc-die.c lib/xstriconv.h lib/xstriconv.c \
- lib/xstrndup.h lib/xstrndup.c src/additionalFile.c
+ lib/xstrndup.h lib/xstrndup.c
lib_libhello_a_LIBADD = $(gl_LIBOBJS)
lib_libhello_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_lib_libhello_a_SOURCES = lib/close.c lib/stripslash.c lib/dup2.c \
$(am__append_53) lib/xmalloc.c lib/xalloc-die.c \
- lib/xstriconv.h lib/xstriconv.c src/additionalFile.c
+ lib/xstriconv.h lib/xstriconv.c
lib_libhello_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS)
lib_libhello_a_LIBADD = $(gl_libhello_LIBOBJS)
lib_libhello_a_DEPENDENCIES = $(gl_libhello_LIBOBJS)
diff --git a/src/additionalFile.c b/src/additionalFile.c
deleted file mode 100644
index 34d683d..0000000