From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] cairo: Remove doc installation.
Date: Wed, 12 Apr 2023 08:47:21 +0200 [thread overview]
Message-ID: <9b1edaf0-07b3-7d62-4435-bc5d977663b5@t2data.com> (raw)
In-Reply-To: <ZDZTqMhyBfWPBZuE@pengutronix.de>
On 4/12/23 08:46, Michael Olbrich wrote:
> On Sun, Apr 09, 2023 at 10:05:03AM +0200, Christian Melki wrote:
>> Even though docs are build disabled, cairo proceeds to install them.
>> This results in an ugly install error (which ptxdist ignores?).
>> Just remove it.
>>
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> ...ic-Makefile.in-Remove-install-target.patch | 65 +++++++++++++++++++
>> patches/cairo-1.16.0/series | 3 +-
>> 2 files changed, 67 insertions(+), 1 deletion(-)
>> create mode 100644 patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch
>>
>> diff --git a/patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch b/patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch
>> new file mode 100644
>> index 000000000..69bc2c677
>> --- /dev/null
>> +++ b/patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch
>> @@ -0,0 +1,65 @@
>> +From: Christian Melki <christian.melki@t2data.com>
>> +Date: Sat, 8 Apr 2023 14:28:37 +0200
>> +Subject: [PATCH] doc/public/Makefile.in: Remove install target.
>> +
>> +Even though all doc targets were removed from the build,
>> +Cairo pursues to install documentation which breaks.
>> +Just remove it.
>> +
>> +Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> +---
>> + build/Makefile.am.gtk-doc | 15 ---------------
>> + doc/public/Makefile.in | 14 --------------
>> + 2 files changed, 29 deletions(-)
>> +
>> +diff --git a/build/Makefile.am.gtk-doc b/build/Makefile.am.gtk-doc
>> +index 56aa4957d32e..13a60c1326e4 100644
>> +--- a/build/Makefile.am.gtk-doc
>> ++++ b/build/Makefile.am.gtk-doc
>> +@@ -130,21 +130,6 @@ maintainer-clean-local: clean
>> + cd $(srcdir) && rm -rf xml html
>> +
>> + install-data-local:
>> +- -installfiles=`echo $(srcdir)/html/*`; \
>
> Same as with openssh. Errors are explicitly ignored here.
>
> Again, I don't want to carry a patch basically forever just for cosmetic
> reasons.
>
> Michael
>
Same as with openssh. I'm ok with a drop. Just cleanup of errors that
look ugly.
/Christian
>> +- if test "$$installfiles" = '$(srcdir)/html/*'; \
>> +- then echo '-- Nothing to install' ; \
>> +- else \
>> +- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
>> +- for i in $$installfiles; do \
>> +- echo '-- Installing '$$i ; \
>> +- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
>> +- done; \
>> +- echo '-- Installing $(srcdir)/html/index.sgml' ; \
>> +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
>> +- which gtkdoc-rebase >/dev/null && \
>> +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
>> +- fi
>> +-
>> +
>> + uninstall-local:
>> + rm -f $(DESTDIR)$(TARGET_DIR)/*
>> +diff --git a/doc/public/Makefile.in b/doc/public/Makefile.in
>> +index cb7d90a6e054..dbfa211b0a51 100644
>> +--- a/doc/public/Makefile.in
>> ++++ b/doc/public/Makefile.in
>> +@@ -1871,20 +1871,6 @@ maintainer-clean-local: clean
>> + cd $(srcdir) && rm -rf xml html
>> +
>> + install-data-local:
>> +- -installfiles=`echo $(srcdir)/html/*`; \
>> +- if test "$$installfiles" = '$(srcdir)/html/*'; \
>> +- then echo '-- Nothing to install' ; \
>> +- else \
>> +- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
>> +- for i in $$installfiles; do \
>> +- echo '-- Installing '$$i ; \
>> +- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
>> +- done; \
>> +- echo '-- Installing $(srcdir)/html/index.sgml' ; \
>> +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
>> +- which gtkdoc-rebase >/dev/null && \
>> +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
>> +- fi
>> +
>> + uninstall-local:
>> + rm -f $(DESTDIR)$(TARGET_DIR)/*
>> diff --git a/patches/cairo-1.16.0/series b/patches/cairo-1.16.0/series
>> index 0904871d9..938366ebb 100644
>> --- a/patches/cairo-1.16.0/series
>> +++ b/patches/cairo-1.16.0/series
>> @@ -8,4 +8,5 @@
>> 0006-There-is-a-potential-infinite-loop-in-function-_arc_.patch
>> 0007-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch
>> 0008-Fix-stack-buffer-overflow.patch
>> -# 1e1d9f93062b124d13fb5d535d4df3e1 - git-ptx-patches magic
>> +0009-doc-public-Makefile.in-Remove-install-target.patch
>> +# 7dd9e257a31197339f99d5ae03e77c9b - git-ptx-patches magic
>> --
>> 2.34.1
>>
>>
>>
>
prev parent reply other threads:[~2023-04-12 6:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-09 8:05 Christian Melki
2023-04-12 6:46 ` Michael Olbrich
2023-04-12 6:47 ` Christian Melki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b1edaf0-07b3-7d62-4435-bc5d977663b5@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox