* [ptxdist] [PATCH] cairo: Remove doc installation.
@ 2023-04-09 8:05 Christian Melki
2023-04-12 6:46 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Christian Melki @ 2023-04-09 8:05 UTC (permalink / raw)
To: ptxdist
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/*`; \
+- 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] cairo: Remove doc installation.
2023-04-09 8:05 [ptxdist] [PATCH] cairo: Remove doc installation Christian Melki
@ 2023-04-12 6:46 ` Michael Olbrich
2023-04-12 6:47 ` Christian Melki
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2023-04-12 6:46 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
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
> +- 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
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] cairo: Remove doc installation.
2023-04-12 6:46 ` Michael Olbrich
@ 2023-04-12 6:47 ` Christian Melki
0 siblings, 0 replies; 3+ messages in thread
From: Christian Melki @ 2023-04-12 6:47 UTC (permalink / raw)
To: ptxdist
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
>>
>>
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-12 6:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-09 8:05 [ptxdist] [PATCH] cairo: Remove doc installation Christian Melki
2023-04-12 6:46 ` Michael Olbrich
2023-04-12 6:47 ` Christian Melki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox