diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-04 02:45:09 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-04 02:45:09 (EDT) |
| commit | 37749719f9d998ceb4c313c26d79a872f3f79230 (patch) | |
| tree | 5afbcab7e581ea94378548e1d6a1d57ce0048365 | |
| parent | 317e2e4a1e283781194b421ef5964508c6771875 (diff) | |
source.mk: Truncate instead of removing non-free files
And drop gdb/doc/Makefile.in patch.
This should fix generation of manual pages:
[...]
: --split-size=5000000 --split-size=5000000 -I /prokit/sessions/194257117/wd/tmp/src/gdb/doc -o stabs.info /prokit/sessions/194257117/wd/tmp/src/gdb/doc/stabs.texinfo
: --split-size=5000000 --split-size=5000000 -I /prokit/sessions/194257117/wd/tmp/src/gdb/doc -o annotate.info /prokit/sessions/194257117/wd/tmp/src/gdb/doc/annotate.texinfo
/bin/sh /prokit/sessions/194257117/wd/tmp/src/gdb/doc/../../mkinstalldirs /usr/share/info
/usr/bin/install -c -m 644 /prokit/sessions/194257117/wd/tmp/src/gdb/doc/stabs.info /usr/share/info/stabs.info
/usr/bin/install -c -m 644 /prokit/sessions/194257117/wd/tmp/src/gdb/doc/annotate.info /usr/share/info/annotate.info
make[6]: *** No rule to make target '/prokit/sessions/194257117/wd/tmp/src/gdb/doc/gdb.texinfo', needed by 'gdb.1'. Stop.
make[6]: Leaving directory '/prokit/sessions/194257117/wd/tmp/obj/gdb/doc'
make[5]: *** [Makefile:1998: subdir_do] Error 1
make[5]: Leaving directory '/prokit/sessions/194257117/wd/tmp/obj/gdb'
make[4]: *** [Makefile:1759: install-only] Error 2
make[4]: Leaving directory '/prokit/sessions/194257117/wd/tmp/obj/gdb'
make[3]: *** [Makefile:1753: install] Error 2
make[3]: Leaving directory '/prokit/sessions/194257117/wd/tmp/obj/gdb'
make[2]: *** [Makefile:8520: install-gdb] Error 2
make[2]: Leaving directory '/prokit/sessions/194257117/wd/tmp/obj'
make[1]: *** [Makefile:2222: install] Error 2
make[1]: Leaving directory '/prokit/sessions/194257117/wd/tmp/obj'
make: *** [../build:25: install] Error 2
| -rw-r--r-- | patches/01_remove-manual.patch | 15 | ||||
| -rw-r--r-- | source.mk | 10 |
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 @@ -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)" |