summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/01_remove-manual.patch15
-rw-r--r--source.mk10
2 files changed, 8 insertions, 17 deletions
diff --git a/patches/01_remove-manual.patch b/patches/01_remove-manual.patch
deleted file mode 100644
index 077126c..0000000
--- a/patches/01_remove-manual.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Patrick McDermott <patrick.mcdermott@libiquity.com>
-Subject: Don't require gdb/doc/gdb.texinfo
-
-diff -Naurp src.orig/gdb/doc/Makefile.in src/gdb/doc/Makefile.in
---- src.orig/gdb/doc/Makefile.in 2019-05-11 14:19:02.000000000 -0400
-+++ src/gdb/doc/Makefile.in 2019-07-03 14:45:31.724731717 -0400
-@@ -84,7 +84,7 @@ SET_TEXINPUTS = \
- TEXINPUTS=${TEXIDIR}:.:$(srcdir):$(READLINE_DIR):$(GDBMI_DIR):$$TEXINPUTS
-
- # Files which should be generated via 'info' and installed by 'install-info'
--INFO_DEPS = gdb.info stabs.info annotate.info
-+INFO_DEPS = stabs.info annotate.info
-
- # Files which should be generated via 'pdf' and installed by 'install-pdf'
- PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
diff --git a/source.mk b/source.mk
index 88e38b7..228046b 100644
--- a/source.mk
+++ b/source.mk
@@ -4,7 +4,8 @@ keys = \
'F40A DB90 2B24 264A A42E 50BF 92ED B04B FF32 5CF3'
non_free_files = \
gdb/doc/gdb.texinfo \
- gdb/doc/gdb.info* \
+ gdb/doc/gdb.info*
+non_free_dirs = \
zlib/
upstream_version = $$(printf '%s\n' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \
@@ -33,7 +34,12 @@ $(source_archive): $(keyring)
tar -x$(tar_z)f "$(upstream_archive)"
rm -f "$(upstream_archive)"
cd "$(upstream_name)"; for file in $(non_free_files); do \
- rm -R "$${file}"; \
+ mv "$${file}" "$${file}.orig"; \
+ touch -r "$${file}.orig" "$${file}"; \
+ rm "$${file}.orig"; \
+ done; cd ..
+ cd "$(upstream_name)"; for dir in $(non_free_dirs); do \
+ rm -R "$${dir}"; \
done; cd ..
tar -c$(tar_z)f "$(source_archive)" "$(upstream_name)"
rm -Rf "$(upstream_name)"