From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 12 Apr 2023 08:46:13 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pmUFA-000o6C-H6 for lore@lore.pengutronix.de; Wed, 12 Apr 2023 08:46:13 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pmUF9-0006MX-Cn; Wed, 12 Apr 2023 08:46:11 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pmUEz-0006LL-O1; Wed, 12 Apr 2023 08:46:01 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pmUEz-00AfuN-1b; Wed, 12 Apr 2023 08:46:01 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pmUEy-00EPz1-6j; Wed, 12 Apr 2023 08:46:00 +0200 Date: Wed, 12 Apr 2023 08:46:00 +0200 From: Michael Olbrich To: Christian Melki Message-ID: Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20230409080503.561247-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230409080503.561247-1-christian.melki@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] cairo: Remove doc installation. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 > --- > ...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 > +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 > +--- > + 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 |