From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 12 Apr 2023 08:48:14 +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 1pmUH7-000oBx-AL for lore@lore.pengutronix.de; Wed, 12 Apr 2023 08:48:14 +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 1pmUH7-0007DP-HW; Wed, 12 Apr 2023 08:48:13 +0200 Received: from mail-vi1eur04on2044.outbound.protection.outlook.com ([40.107.8.44] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pmUGw-0007DE-VL for ptxdist@pengutronix.de; Wed, 12 Apr 2023 08:48:04 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIon67G4OFJwcKxYDPm+tt80vS1zhSk/bGrnZeZFJJz30ZBwjYbbG6cF+XSN9sd4YzjhYurBtxFKpdDqjx/Bl6Dq8vzXcqatHIBXe+hlk4FpR6wGo5qPAIcr4Tl02cmUgjv1txmXEXfU0kf3/3NGntZnRy52U1opUCF0VIHD94V21WilPFdPDxBnPZNldhcC0CCKfY2v6Z9KisOjXj7SwOwXUjtS9Rvu8swR8p/VRuTmW+Yah6sQpdououOGfdony9FYArxG/emk4pNVBkwwiC/rYR7y24F3wQ22h937UaMjc9DbACfM4AEiRrvpETMcNBEeG9deHzkXn3i2OmgxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SVEvBnLPKk9t/2QYUrK4+XNhZLbww3Rpl1pX44N6gOA=; b=aPEjRl7QdTKuPaBNFngA6kFdzrLRJ+vJskN2xeMGuhSq3KT/n31nfkhhiplcNdX6ODf5ceMrXC4eLSrGGHrK+oaSCqIfZ/pMesORnEanWLmHT8EaVhinTXbzB5FUKAgg6AVj3L88Jc/AXkZVUykn4glcqp98u2nYqOdujpOHnfcTHity3UIav5WsXIgr3bZCEQ0ods+HNpAx6Bfo65UvwAFhWhD5g0tLi7ya1rJX/GrkCPdss19hJzyFCM5iCwOxFVzwJ1dl9YnOhDCN9rcKvfBhyqOffD4LCiCWJCMXKNOdQIpLIMytvy4wqyLbrJ/GidPJqmJHVM+oTJMn/B0cNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SVEvBnLPKk9t/2QYUrK4+XNhZLbww3Rpl1pX44N6gOA=; b=hqrW7xjlWxySS9yh2l6qgUP4+W9+1A8u+ehjjbfRVH082XwPHqlu+pSqEniEnLbU2obDf/ZM2zpDxRagBcBOLvOkfIn9sOWFKpVJeburtjc5Dj5cej5LaB74TfDUAtawuHLM19HQpyuwpj3GN7At+Muk+EWqskXUXirJ6r6ICxs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS4P251MB0588.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:4bf::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35; Wed, 12 Apr 2023 06:48:01 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::34c0:dc94:1803:278a]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::34c0:dc94:1803:278a%7]) with mapi id 15.20.6254.035; Wed, 12 Apr 2023 06:48:00 +0000 Message-ID: <9b1edaf0-07b3-7d62-4435-bc5d977663b5@t2data.com> Date: Wed, 12 Apr 2023 08:47:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Content-Language: en-US To: ptxdist@pengutronix.de References: <20230409080503.561247-1-christian.melki@t2data.com> From: Christian Melki In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: GV3P280CA0093.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::22) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS4P251MB0588:EE_ X-MS-Office365-Filtering-Correlation-Id: fb248aed-d22c-4e2c-ffcb-08db3b21db31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xtAREnbZPQ18gDXehbWo8rG5QDf6azvPNWQvwKkFOLm+zt6Wjr/ezXJtIEWguwhJt0OapyHp4ARc17YYf4Ht2owg+HRmRdarr5M+bg0XLriKvA7XvrJKTiPtDsRVVqO3LKWlfMYRNZISrT3SQZk2VMFMoFZLK7zishfvvd+GWCnFvoiAoOtRzRutCT1gU5NiEtLAtIqpmyj6fNwqeflUusW6jVwqHqAE5CEv5cR/PiMr1/uKbkowG6m6HWyRj0R0qTikghpJHX9Sv2fsd7cEq+Lflc4wuoYxPPdR6+mlU5hgGW+YyhxLLWGKV/wQifFxYi4UIo+cnaGfNSN6A7fHbGMJyfz3M1yN8+TOVzfxyzX2AscGxEFwBbP/nvURQVZdjUZjNMFqyyuMSlyeSkEb7tpB7NlVpstO/237e2h1AZOqAJPd0isZ51G5rBZ4VEy4Hsm2o0FpkdANr4wrG8QoMr2ZmPnuQutXOmH+RgfEWhjmfYss+FYX2Cv/mBi+bHz8C1iZdsiethp29j2cfvXVVgkUNzOqmGbaui6pwBYwKcqMZ+09i4XuzBvyRhRrcw7aCIOJwWb8alkYuhHUt1p9kMwYKP44+mX6fyM+9HqEY6Y99y7wiUwYBXQxsiHuyUEtCUBA2+nRYxfXKzdHlO4iDQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(136003)(366004)(396003)(346002)(376002)(39830400003)(451199021)(478600001)(53546011)(6506007)(6512007)(186003)(66476007)(26005)(44832011)(316002)(2906002)(3450700001)(66946007)(6916009)(6666004)(8676002)(66556008)(8936002)(5660300002)(41300700001)(6486002)(38100700002)(31696002)(86362001)(83380400001)(36756003)(2616005)(31686004)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bUtiUklEY01nanA1YnY4MEsvM0gzdXh2VVgxTWQrb1NTMERJSUE1d0JmTm00?= =?utf-8?B?TnA3WGFlZG9paExTa2UwWVFJOHNzbUp0dHlyUVA0Yjc3ZGdNdklWdG5LOGFM?= =?utf-8?B?SjdGQWdHT3FrZEl4VWdoL1Nka09ycEpmdzNvUlg1czZUcHFkUnpFZmNqZVhJ?= =?utf-8?B?dVRWOHo5M0p6Wk5Eblc0cjNQR003SkhJYXdXZGdHalhkb3Vrck0wN3l6WDZC?= =?utf-8?B?L1pRZWRqOU1hdmVjVzdqejdmb3JNdUFlTnFRUmtWVGNmeWRoNGZveGVYM1Mz?= =?utf-8?B?dHgrcTFCM1RlUGdKL3lUZVA4SWV4WWVodVFEdW0vblIrazExTE5KRENWU1hV?= =?utf-8?B?cEluSjFBN09pQ1RHOXRXU1BVOCtReG13Zi84aHFKMlNNeWtiUkNCSXhPOHRK?= =?utf-8?B?dWhjWUl6RFJOUDJsVDNXaXNjSTFPb1NGZ0c0dlNMMU1JZVJDTGZnL2NpVXBK?= =?utf-8?B?Q3BDU2dvdVJOZWJnRXJKZmNReXJ5VWxKVmgzbkxwWXN3NGY5WUtiWSt5dElq?= =?utf-8?B?bzJqVW9CdUdLUTJPWFB0azdROGR5WEgybHZYWkhZYnl3a2NoSWU4R3JkWTlk?= =?utf-8?B?NzFlblY5d0U0M25hNFpwZENHSVcxZ0cwUnpmVUtoZzhCRWwzVFJpd0tIdUJR?= =?utf-8?B?a21yNE85ejgxWDc0MHNQMDl5WUk1clRpMTV6YU0rTzNWcVJka2RXUlZua1Vw?= =?utf-8?B?WS9JN0UxU3JjS3UwZVl4bG5FTWdtRk1VL1ZIY3d2TEZGa1REa1h4R0h1dWNC?= =?utf-8?B?eHZlY3Ezbk9yVkhIS3BHNFpJaTNMYnlrdXJRdVhHbnI3UEFNc3dTVW45ZzBS?= =?utf-8?B?ci92Mkk3aXJocHdHRGkrZmI2Zm8ycUVrMjlEVEpVQmF3S2RXVW5XU1d3M1po?= =?utf-8?B?TzdOTVVPb29YajZscDBZYVRkVkMwYS80V2N2WlFZM3BiYWg4SlpXd09HSTVT?= =?utf-8?B?RldYNXk3cHNISVE2R1AwOHpnQldPdVU1TUMrZm5GT1dSUXpSSkt3aEp5Nlln?= =?utf-8?B?cDBYNDVEZDcxNVZ6WEllQk5GVlpmcEZ0TnYydW56Z0lZZjJEQkdEMEV1a0Va?= =?utf-8?B?TlozMWJ1Q0thdjV6RDdDdEZlQmo5aE5YakJOM1hYM0R2Nm9PcVJjSkRrU2Zm?= =?utf-8?B?Yk5DeFJvbXJFelh2eVhyekFsWkVQdWM1KzNXeUxxbitrRmJHa0c5Y0J4NzUx?= =?utf-8?B?bHQ4MnpnS3p3bFRLQ0xTeFY3Y2VodXkwUDRoQmFJYzBOK2JpQWpxUXFlckVp?= =?utf-8?B?OTF0SGlZaDRRb2dneGJ3YzNYL1RqUm5mUVRXMTRpTHFZY2FWOVI2V3pQVGtC?= =?utf-8?B?ZHIxeUZIaUROeDE5aFM2WXFsMWsrdXZnZWlPT3BqTkJwR05NSnorbkx4Tzg4?= =?utf-8?B?Y0lyZTVPa202UHhTUjZZaXk0VmExL1RCc0x4WllYL2RMVUtxdGNmdVBTeGoz?= =?utf-8?B?aUx5NUE0RUNFVEFXNVlGbmZKYXR0dGFEYmdzZ1cxNjR6bG9hU3ZrdjkxUmlT?= =?utf-8?B?NjdFRFRaZHVReFVneGxKQUcxNzdTOGdGbnlMdWxUMnhlc1BoUEJod20vRHJT?= =?utf-8?B?WkVhdkVMR2dYVHlMRWZwbjFDNmhyZWx5ZFJpcUJOaUdjNTZNd0cvLzVSUU43?= =?utf-8?B?TjJaODFJZjcrTzdRUXNjZ1MwNzdwcWdoMmNzOG1KVzhWNTA3VjZMeXRiR0dv?= =?utf-8?B?K2FLSEw0eVNlUWNrOCs4UnNhT2dZR3ZOUVRiL1R5UWZmZzY0aVNSTGpLV3J6?= =?utf-8?B?MmpodVNDUmw5MzJsNVBLb0pLdklWK0JCMEd0WXl6Y3RjMXkzQ1lrREVNUlJ4?= =?utf-8?B?RXZHOTg1d2NCSFNYeUVxZWx1OVRCanlyMVlFeXlvQ2tVVHZCci8vUk04OEcw?= =?utf-8?B?MEVnMTl6bzN4ZFpVOE5qVW1nZW1aWFFoM2dIdGJiK1FNTlNxWDFFR1dLTWl1?= =?utf-8?B?Z3lyaElZUFB4VkNScVJvOG9McGh1WXZhYWVpcGY2UVVaS1gvZm0yYVRvVjRa?= =?utf-8?B?eHJnRDE4TTZySWM2ay9nTGdkUWlSS0RnMythRXQ4M0lzOUxCNk8vN2dFNFhN?= =?utf-8?B?VjZVMVRuVFVpR1c2Z2ZOTDdHQzVUUFdMY09kVG1IaDFrbkRxL1JuSUVWMWs1?= =?utf-8?B?Q1ZuMnJmN2h0VHEzTFN3TjF4UE1LUUFPTUhVYXg4RGYxZkU4ZjlpdHprTDFY?= =?utf-8?B?bUE9PQ==?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb248aed-d22c-4e2c-ffcb-08db3b21db31 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2023 06:48:00.1832 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EtaDfijQeuI62Ngs/7jzsbqTk0mAYUY31F6q25hMUPmtMZqINhyMMULe1MCwsx9erg/1kKn5DKX/F6mu5dMAADQhT5KURd3hV7adwXGwgis= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P251MB0588 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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, christian.melki@t2data.com 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 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 >> --- >> ...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 > 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 >> >> >> >