From patchwork Sat Jan 14 15:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66355C67871 for ; Sat, 14 Jan 2023 15:49:33 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web11.118503.1673711366208379132 for ; Sat, 14 Jan 2023 07:49:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EtI45U1v; spf=pass (domain: gmail.com, ip: 209.85.216.46, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f46.google.com with SMTP id dw9so23807019pjb.5 for ; Sat, 14 Jan 2023 07:49:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1YipErtJRNJG3GUwP/74vmiBKBrwWyRpl/H8nPx3YY0=; b=EtI45U1vf8e6CGJLJHYnec2RycqwtGY2s6DS8zZPqo8ZjjJ1xS5zZy5m3m0zkwvIWv bghsPmae21AF6jE4o52C2TTCk6sfxgKwseBX+W5iAnik37IHjrhqv4eARIAD3Exzizcp F1UihWJs51PFSCWPwbwNHtLKvD8zRxtJWhCFGtwmOHjQODg6gHvQirzy1q6iCy9fCw9c gn1IWI2a67UKIJjVVNyKrTCPCbSNzzy7LSffcqm81EfvzIWNoipERghnxYpWlEcnCSUs 0C2fMN1q1kq7siCtFaJO+WLLVSetY2z4GgYlEZWRXcOCIRk/yf4zcpduJpPo9ioRDB/Z IPOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1YipErtJRNJG3GUwP/74vmiBKBrwWyRpl/H8nPx3YY0=; b=gBZjSrWGwjy2lBx/zRuQBpcIm/msQPAUsm0QC63IBp00EBBp3YvC3KIfaxh7zR68r3 ePIYEjoe9cTIhWvxJuXNdzeEbChhcW3m5gPnwASqlvzSE+oIGQBhLeC46NMW7FVkXki2 Zjko+eGIUwsantLDiv8D95be6JVbFHFKY7VaP+wv/OP4lzliMBN6ZnIxCgsPFq1BrU+8 r+niwtX1hMptd1CEWj0Gwn4VBZvNdZUiM3MIPs9pQFY9/4Z27GV4N2ATyTAIT7l4vLZb 2sZdxmxWg5+PH0no+EkBHsaZ3LA/RpCNw28grSaDqZ+s9N+zGJHBwXwgimoqLzRveN34 t/7A== X-Gm-Message-State: AFqh2krjJ08thDttVdN5fMBuGzmyQiwSbBRpRGEN9gO1RjObhP3LnU/S iqWqaKkdb0KdhttpGYv8H8ycjZ9dsV4IOg== X-Google-Smtp-Source: AMrXdXvj+0zv/MoYR2Cj4sCWzR3OKoTqQBpFFQs/Uq0Qx3LHt4Ud7hAcl2dvhL8OzFTF6ojJkm1wcw== X-Received: by 2002:a05:6a20:3d1a:b0:a4:b2e4:c561 with SMTP id y26-20020a056a203d1a00b000a4b2e4c561mr122841315pzi.51.1673711365074; Sat, 14 Jan 2023 07:49:25 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::b940]) by smtp.gmail.com with ESMTPSA id b7-20020a63eb47000000b00460ea630c1bsm13129200pgk.46.2023.01.14.07.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 07:49:23 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/5] cpio: Do not use _Noreturn in gnulib Date: Sat, 14 Jan 2023 07:49:17 -0800 Message-Id: <20230114154921.3757493-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 14 Jan 2023 15:49:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175850 Backport a gnulib patch Signed-off-by: Khem Raj --- .../0001-obstack-Fix-a-clang-warning.patch | 27 +++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.13.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch diff --git a/meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch b/meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch new file mode 100644 index 0000000000..6f6e396ef3 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch @@ -0,0 +1,27 @@ +From 02f1f63d3ff58f3473f1689a0322a234ce10b659 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 13 Jan 2023 22:13:45 -0800 +Subject: [PATCH] obstack: Fix a clang warning + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=0cc39712803ade7b2d4b89c36b143dad72404063] +Signed-off-by: Khem Raj +--- + gnu/obstack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gnu/obstack.c b/gnu/obstack.c +index 54b675d..4d6a1d5 100644 +--- a/gnu/obstack.c ++++ b/gnu/obstack.c +@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE; + # include + # endif + +-static _Noreturn void ++static __attribute_noreturn__ void + print_and_abort (void) + { + /* Don't change any of these strings. Yes, it would be possible to add +-- +2.39.0 + diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb index e72a114de9..50d3e14c14 100644 --- a/meta/recipes-extended/cpio/cpio_2.13.bb +++ b/meta/recipes-extended/cpio/cpio_2.13.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \ + file://0001-obstack-Fix-a-clang-warning.patch \ file://CVE-2021-38185.patch \ " From patchwork Sat Jan 14 15:49:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77E79C678D8 for ; Sat, 14 Jan 2023 15:49:33 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.118506.1673711367752915997 for ; Sat, 14 Jan 2023 07:49:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bKGFQMf+; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id b9-20020a17090a7ac900b00226ef160dcaso25454451pjl.2 for ; Sat, 14 Jan 2023 07:49:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AYrkxFdnLMVXayOfpAoJYgC7Ui75IoPaTdq3FFLFd7w=; b=bKGFQMf+QfvBiEZtkufMAJwp++yMYAjiRjDE/Hmt9sgKuqBzb8VcFjsgjNY+fO01Uf GX2R6Rb9vVQ4Y0V05FFjVNTlK2ovL1G12EWA4YL+6ob7a09u29GEQcWQUUcm95IwSdQm ykrUNNS/GodB97nUfvtnhdV8Ao2uVCmfIs0yG+v6UDBNFLmtq+tQukeU963OF17DJN2f RGjJdmgoxH8UoAlsPgRjhB6Q5vsFBoSepLPlm7la7C/VjNwLph5/QpzdPSvUoMmseh2W Iws6pduilM1MhfeZZ977Jy1Gy13mFXhYkKPA+xG/TkQqlL2MCp+vKT31ZKoJy6rFAq50 WAgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AYrkxFdnLMVXayOfpAoJYgC7Ui75IoPaTdq3FFLFd7w=; b=BsRNqWxUIB00H15UV4PqRf4413vG8GsJBUH9a07vwF2DySLty1fvEVUPIk9AmxKpbz W9C4C3s2KzRb3M/1EHMySuIE5AxKqDy9Dc7b75hzVxTr4xQuKcFzQoCJs4A/bHaCL0ib 2qde90taVc0Ix+EPewPJAWECvf24LfOotKghbkmjqNsOnmnTr4PH+JDdUhI2fAw3SJPv 7gwKTeheCAGjvCoQnIuj1MoP9DvJX2Fnu65/PCSmsaaQ0//7CVn75qs+8f/4F45DTQct DL+LCalGoIdw+oqymZNXWcUYhc6V/5Z7UdVvxvq07mWHplnkAIXXJ7FFIb5afr92C08g qBtQ== X-Gm-Message-State: AFqh2kpznl4thlqf7zvBbh2oWVq9PgP+MiB2w/rbdXZ7c0NYkXHWn8s5 aJbQpo3Qb6ZErx5ZVPJRnd46lqBjhIOCOQ== X-Google-Smtp-Source: AMrXdXu0uNZ1eiiN2/hW+SuG7Cs5V8tpyFBFaziYJoWW/Wqv8Z8Oy2aEcBGezABihkLFeHYt3BAEiA== X-Received: by 2002:a05:6a21:78a0:b0:a3:960e:7d0a with SMTP id bf32-20020a056a2178a000b000a3960e7d0amr124796240pzc.58.1673711366662; Sat, 14 Jan 2023 07:49:26 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::b940]) by smtp.gmail.com with ESMTPSA id b7-20020a63eb47000000b00460ea630c1bsm13129200pgk.46.2023.01.14.07.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 07:49:25 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/5] groff: Drop use of `register` storage class Date: Sat, 14 Jan 2023 07:49:18 -0800 Message-Id: <20230114154921.3757493-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230114154921.3757493-1-raj.khem@gmail.com> References: <20230114154921.3757493-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 14 Jan 2023 15:49:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175851 Backport a patch to make it work with c17 standard Signed-off-by: Khem Raj --- .../files/0001-Fix-code-style-issues.patch | 536 ++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.4.bb | 3 +- 2 files changed, 538 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/groff/files/0001-Fix-code-style-issues.patch diff --git a/meta/recipes-extended/groff/files/0001-Fix-code-style-issues.patch b/meta/recipes-extended/groff/files/0001-Fix-code-style-issues.patch new file mode 100644 index 0000000000..221490d6a3 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-Fix-code-style-issues.patch @@ -0,0 +1,536 @@ +From 99313d5c0ff35da6627e7dc985612f990ca64637 Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" +Date: Mon, 16 Aug 2021 12:37:22 +1000 +Subject: [PATCH] Fix code style issues. + +* src/preproc/grn/hgraph.cpp: +* src/preproc/grn/hpoint.cpp: +* src/preproc/grn/main.cpp: +* src/preproc/grn/hdb.cpp: Drop use of `register` storage class. + +* src/preproc/grn/hgraph.cpp (len, HGPrintElt, picurve): +* src/preproc/grn/hdb.cpp (DBRead): Wrap long lines. + +* src/preproc/grn/hgraph.cpp: Rename function from `Paramaterize` to + `Parameterize`. + + (HGCurve): Update call site. + +* src/preproc/grn/main.cpp (add_file): Drop redundant cast in + `realloc()` call. + + (conv, interpret): Use standard English in diagnostic messages. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/groff.git/commit/?id=eead5f5cf1dedc6d180bdb34914d7157d39e270c] +Signed-off-by: Khem Raj +--- + src/preproc/grn/hdb.cpp | 20 +++--- + src/preproc/grn/hgraph.cpp | 131 +++++++++++++++++++------------------ + src/preproc/grn/hpoint.cpp | 2 +- + src/preproc/grn/main.cpp | 38 +++++------ + 4 files changed, 100 insertions(+), 91 deletions(-) + +diff --git a/src/preproc/grn/hdb.cpp b/src/preproc/grn/hdb.cpp +index c61e099..2b4011b 100644 +--- a/src/preproc/grn/hdb.cpp ++++ b/src/preproc/grn/hdb.cpp +@@ -35,7 +35,7 @@ extern POINT *PTInit(); + extern POINT *PTMakePoint(double x, double y, POINT ** pplist); + + +-int DBGetType(register char *s); ++int DBGetType(char *s); + + + /* +@@ -61,7 +61,7 @@ DBCreateElt(int type, + char *text, + ELT **db) + { +- register ELT *temp; ++ ELT *temp = 0; + + temp = (ELT *) malloc(sizeof(ELT)); + temp->nextelt = *db; +@@ -80,11 +80,11 @@ DBCreateElt(int type, + * pointer to that database. + */ + ELT * +-DBRead(register FILE *file) ++DBRead(FILE *file) + { +- register int i; +- register int done; /* flag for input exhausted */ +- register double nx; /* x holder so x is not set before orienting */ ++ int i; ++ int done; /* flag for input exhausted */ ++ double nx; /* x holder so x is not set before orienting */ + int type; /* element type */ + ELT *elist; /* pointer to the file's elements */ + POINT *plist; /* pointer for reading in points */ +@@ -112,7 +112,9 @@ DBRead(register FILE *file) + /* if (fscanf(file,"%" MAXSTRING_S "s\n", string) == EOF) */ + /* I changed the scanf format because the element */ + /* can have two words (e.g. CURVE SPLINE) */ +- if (fscanf(file, "\n%" MAXSTRING_S "[^\n]%*[^\n]\n", string) == EOF) { ++ if (fscanf(file, "\n%" ++ MAXSTRING_S ++ "[^\n]%*[^\n]\n", string) == EOF) { + error("'%1', error in file format", gremlinfile); + return (elist); + } +@@ -209,7 +211,7 @@ DBRead(register FILE *file) + * New file format has literal names for element types. + */ + int +-DBGetType(register char *s) ++DBGetType(char *s) + { + if (isdigit(s[0]) || (s[0] == '-')) /* old element format or EOF */ + return (atoi(s)); +@@ -298,7 +300,7 @@ xscanf(FILE *f, + double *xp, + double *yp) + { +- register int c, i, j, m, frac; ++ int c, i, j, m, frac; + int iscale = 1, jscale = 1; /* x = i/scale, y=j/jscale */ + + while ((c = getc(f)) == ' '); +diff --git a/src/preproc/grn/hgraph.cpp b/src/preproc/grn/hgraph.cpp +index dbc0086..ad051ea 100644 +--- a/src/preproc/grn/hgraph.cpp ++++ b/src/preproc/grn/hgraph.cpp +@@ -14,7 +14,8 @@ + #define PointsPerInterval 64 + #define pi 3.14159265358979324 + #define twopi (2.0 * pi) +-#define len(a, b) groff_hypot((double)(b.x-a.x), (double)(b.y-a.y)) ++#define len(a, b) groff_hypot((double)(b.x-a.x), \ ++ (double)(b.y-a.y)) + + + extern int dotshifter; /* for the length of dotted curves */ +@@ -48,7 +49,7 @@ extern double adj4; + extern int res; + + void HGSetFont(int font, int size); +-void HGPutText(int justify, POINT pnt, register char *string); ++void HGPutText(int justify, POINT pnt, char *string); + void HGSetBrush(int mode); + void tmove2(int px, int py); + void doarc(POINT cp, POINT sp, int angle); +@@ -58,10 +59,10 @@ void drawwig(POINT * ptr, int type); + void HGtline(int x1, int y1); + void deltax(double x); + void deltay(double y); +-void HGArc(register int cx, register int cy, int px, int py, int angle); +-void picurve(register int *x, register int *y, int npts); ++void HGArc(int cx, int cy, int px, int py, int angle); ++void picurve(int *x, int *y, int npts); + void HGCurve(int *x, int *y, int numpoints); +-void Paramaterize(int x[], int y[], double h[], int n); ++void Parameterize(int x[], int y[], double h[], int n); + void PeriodicSpline(double h[], int z[], + double dz[], double d2z[], double d3z[], + int npoints); +@@ -83,10 +84,10 @@ void + HGPrintElt(ELT *element, + int /* baseline */) + { +- register POINT *p1; +- register POINT *p2; +- register int length; +- register int graylevel; ++ POINT *p1; ++ POINT *p2; ++ int length; ++ int graylevel; + + if (!DBNullelt(element) && !Nullpoint((p1 = element->ptlist))) { + /* p1 always has first point */ +@@ -168,7 +169,8 @@ HGPrintElt(ELT *element, + + if (polyfill == FILL || polyfill == BOTH) { + /* do the interior */ +- char command = (polyfill == BOTH && element->brushf) ? 'p' : 'P'; ++ char command = (polyfill == BOTH && element->brushf) ++ ? 'p' : 'P'; + + /* include outline, if there is one and */ + /* the -p flag was set */ +@@ -278,7 +280,7 @@ HGPrintElt(ELT *element, + void + HGPutText(int justify, + POINT pnt, +- register char *string) ++ char *string) + { + int savelasty = lasty; /* vertical motion for text is to be */ + /* ignored. Save current y here */ +@@ -387,7 +389,7 @@ HGSetFont(int font, + void + HGSetBrush(int mode) + { +- register int printed = 0; ++ int printed = 0; + + if (linmod != style[--mode]) { + /* Groff doesn't understand \Ds, so we take it out */ +@@ -417,7 +419,7 @@ HGSetBrush(int mode) + void + deltax(double x) + { +- register int ix = (int) (x * troffscale); ++ int ix = (int) (x * troffscale); + + printf(" %du", ix - lastx); + lastx = ix; +@@ -437,7 +439,7 @@ deltax(double x) + void + deltay(double y) + { +- register int iy = (int) (y * troffscale); ++ int iy = (int) (y * troffscale); + + printf(" %du", iy - lastyline); + lastyline = iy; +@@ -457,8 +459,8 @@ void + tmove2(int px, + int py) + { +- register int dx; +- register int dy; ++ int dx; ++ int dy; + + if ((dy = py - lasty)) { + printf("\\v'%du'", dy); +@@ -483,10 +485,10 @@ tmove2(int px, + void + tmove(POINT * ptr) + { +- register int ix = (int) (ptr->x * troffscale); +- register int iy = (int) (ptr->y * troffscale); +- register int dx; +- register int dy; ++ int ix = (int) (ptr->x * troffscale); ++ int iy = (int) (ptr->y * troffscale); ++ int dx; ++ int dy; + + if ((dy = iy - lasty)) { + printf(".sp %du\n", dy); +@@ -547,7 +549,7 @@ void + drawwig(POINT * ptr, + int type) + { +- register int npts; /* point list index */ ++ int npts; /* point list index */ + int x[MAXPOINTS], y[MAXPOINTS]; /* point list */ + + for (npts = 1; !Nullpoint(ptr); ptr = PTNextPoint(ptr), npts++) { +@@ -574,20 +576,20 @@ drawwig(POINT * ptr, + *----------------------------------------------------------------------------*/ + + void +-HGArc(register int cx, +- register int cy, ++HGArc(int cx, ++ int cy, + int px, + int py, + int angle) + { + double xs, ys, resolution, fullcircle; + int m; +- register int mask; +- register int extent; +- register int nx; +- register int ny; +- register int length; +- register double epsilon; ++ int mask; ++ int extent; ++ int nx; ++ int ny; ++ int length; ++ double epsilon; + + xs = px - cx; + ys = py - cy; +@@ -633,15 +635,15 @@ HGArc(register int cx, + *----------------------------------------------------------------------------*/ + + void +-picurve(register int *x, +- register int *y, ++picurve(int *x, ++ int *y, + int npts) + { +- register int nseg; /* effective resolution for each curve */ +- register int xp; /* current point (and temporary) */ +- register int yp; +- int pxp, pyp; /* previous point (to make lines from) */ +- int i; /* inner curve segment traverser */ ++ int nseg; /* effective resolution for each curve */ ++ int xp; /* current point (and temporary) */ ++ int yp; ++ int pxp, pyp; /* previous point (to make lines from) */ ++ int i; /* inner curve segment traverser */ + int length = 0; + double w; /* position factor */ + double t1, t2, t3; /* calculation temps */ +@@ -671,7 +673,8 @@ picurve(register int *x, + /* 'nseg' is the number of line */ + /* segments that will be drawn for */ + /* each curve segment. */ +- nseg = (int) ((double) (nseg + (int) groff_hypot((double) xp, (double) yp)) / ++ nseg = (int) ((double) (nseg + (int) groff_hypot((double) xp, ++ (double) yp)) / + res * PointsPerInterval); + + for (i = 1; i < nseg; i++) { +@@ -710,10 +713,10 @@ HGCurve(int *x, + double h[MAXPOINTS], dx[MAXPOINTS], dy[MAXPOINTS]; + double d2x[MAXPOINTS], d2y[MAXPOINTS], d3x[MAXPOINTS], d3y[MAXPOINTS]; + double t, t2, t3; +- register int j; +- register int k; +- register int nx; +- register int ny; ++ int j; ++ int k; ++ int nx; ++ int ny; + int lx, ly; + int length = 0; + +@@ -725,7 +728,7 @@ HGCurve(int *x, + * Solve for derivatives of the curve at each point separately for x and y + * (parametric). + */ +- Paramaterize(x, y, h, numpoints); ++ Parameterize(x, y, h, numpoints); + + /* closed curve */ + if ((x[1] == x[numpoints]) && (y[1] == y[numpoints])) { +@@ -771,15 +774,15 @@ HGCurve(int *x, + *----------------------------------------------------------------------------*/ + + void +-Paramaterize(int x[], ++Parameterize(int x[], + int y[], + double h[], + int n) + { +- register int dx; +- register int dy; +- register int i; +- register int j; ++ int dx; ++ int dy; ++ int i; ++ int j; + double u[MAXPOINTS]; + + for (i = 1; i <= n; ++i) { +@@ -937,9 +940,9 @@ NaturalEndSpline(double h[], /* parameterization */ + *----------------------------------------------------------------------------*/ + + void +-change(register int x, +- register int y, +- register int vis) ++change(int x, ++ int y, ++ int vis) + { + static int length = 0; + +@@ -967,17 +970,17 @@ void + HGtline(int x_1, + int y_1) + { +- register int x_0 = lastx; +- register int y_0 = lasty; +- register int dx; +- register int dy; +- register int oldcoord; +- register int res1; +- register int visible; +- register int res2; +- register int xinc; +- register int yinc; +- register int dotcounter; ++ int x_0 = lastx; ++ int y_0 = lasty; ++ int dx; ++ int dy; ++ int oldcoord; ++ int res1; ++ int visible; ++ int res2; ++ int xinc; ++ int yinc; ++ int dotcounter; + + if (linmod == SOLID) { + line(x_1, y_1); +@@ -1045,4 +1048,8 @@ HGtline(int x_1, + change(x_1, y_1, 0); + } + +-/* EOF */ ++// Local Variables: ++// fill-column: 72 ++// mode: C++ ++// End: ++// vim: set cindent noexpandtab shiftwidth=2 textwidth=72: +diff --git a/src/preproc/grn/hpoint.cpp b/src/preproc/grn/hpoint.cpp +index b581cb0..77bfc9d 100644 +--- a/src/preproc/grn/hpoint.cpp ++++ b/src/preproc/grn/hpoint.cpp +@@ -32,7 +32,7 @@ PTMakePoint(double x, + double y, + POINT **pplist) + { +- register POINT *pt; ++ POINT *pt; + + if (Nullpoint(pt = *pplist)) { /* empty list */ + *pplist = (POINT *) malloc(sizeof(POINT)); +diff --git a/src/preproc/grn/main.cpp b/src/preproc/grn/main.cpp +index 833fd60..d1887b6 100644 +--- a/src/preproc/grn/main.cpp ++++ b/src/preproc/grn/main.cpp +@@ -88,7 +88,7 @@ extern "C" const char *Version_string; + + extern void HGPrintElt(ELT *element, int baseline); + extern ELT *DBInit(); +-extern ELT *DBRead(register FILE *file); ++extern ELT *DBRead(FILE *file); + extern POINT *PTInit(); + extern POINT *PTMakePoint(double x, double y, POINT **pplist); + +@@ -231,9 +231,9 @@ int compatibility_flag = FALSE; /* TRUE if in compatibility mode */ + + void getres(); + int doinput(FILE *fp); +-void conv(register FILE *fp, int baseline); ++void conv(FILE *fp, int baseline); + void savestate(); +-int has_polygon(register ELT *elist); ++int has_polygon(ELT *elist); + void interpret(char *line); + + +@@ -256,7 +256,7 @@ add_file(char **file, + { + if (*count >= *cur_size) { + *cur_size += FILE_SIZE_INCR; +- file = (char **) realloc((char **) file, *cur_size * sizeof(char *)); ++ file = (char **) realloc(file, *cur_size * sizeof(char *)); + if (file == NULL) { + fatal("unable to extend file array"); + } +@@ -283,9 +283,9 @@ main(int argc, + { + setlocale(LC_NUMERIC, "C"); + program_name = argv[0]; +- register FILE *fp; +- register int k; +- register char c; ++ FILE *fp; ++ int k; ++ char c; + int gfil = 0; + char **file = NULL; + int file_cur_size = INIT_FILE_SIZE; +@@ -466,7 +466,7 @@ doinput(FILE *fp) + void + initpic() + { +- register int i; ++ int i; + + for (i = 0; i < STYLES; i++) { /* line thickness defaults */ + thick[i] = defthick[i]; +@@ -511,12 +511,12 @@ initpic() + *----------------------------------------------------------------------------*/ + + void +-conv(register FILE *fp, ++conv(FILE *fp, + int baseline) + { +- register FILE *gfp = NULL; /* input file pointer */ +- register int done = 0; /* flag to remember if finished */ +- register ELT *e; /* current element pointer */ ++ FILE *gfp = NULL; /* input file pointer */ ++ int done = 0; /* flag to remember if finished */ ++ ELT *e; /* current element pointer */ + ELT *PICTURE; /* whole picture data base pointer */ + double temp; /* temporary calculating area */ + /* POINT ptr; */ /* coordinates of a point to pass to 'mov' */ +@@ -543,7 +543,7 @@ conv(register FILE *fp, + + if (!gremlinfile[0]) { + if (!setdefault) +- error("at line %1: no picture filename.\n", baseline); ++ error("no picture file name at line %1", baseline); + return; + } + char *path; +@@ -577,7 +577,7 @@ conv(register FILE *fp, + } /* here, troffscale is the */ + /* picture's scaling factor */ + if (pointscale) { +- register int i; /* do pointscaling here, when */ ++ int i; /* do pointscaling here, when */ + /* scale is known, before output */ + for (i = 0; i < SIZES; i++) + tsize[i] = (int) (troffscale * (double) tsize[i] + 0.5); +@@ -700,7 +700,7 @@ conv(register FILE *fp, + void + savestate() + { +- register int i; ++ int i; + + for (i = 0; i < STYLES; i++) /* line thickness defaults */ + defthick[i] = thick[i]; +@@ -761,8 +761,8 @@ interpret(char *line) + { + char str1[MAXINLINE]; + char str2[MAXINLINE]; +- register char *chr; +- register int i; ++ char *chr; ++ int i; + double par; + + str2[0] = '\0'; +@@ -811,7 +811,7 @@ interpret(char *line) + + if (str2[0] < '0') { + nofont: +- error("no fontname specified in line %1", linenum); ++ error("no font name specified in line %1", linenum); + break; + } + if (str1[1] == 't') +@@ -935,7 +935,7 @@ interpret(char *line) + */ + + int +-has_polygon(register ELT *elist) ++has_polygon(ELT *elist) + { + while (!DBNullelt(elist)) { + if (elist->type == POLYGON) +-- +2.39.0 + diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb index b281544aab..244c0e1625 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.22.4.bb @@ -12,7 +12,8 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-not-search-fonts-on-build-host.patch \ file://0001-support-musl.patch \ file://0001-Include-config.h.patch \ - file://0001-Make-manpages-mulitlib-identical.patch \ + file://0001-Make-manpages-mulitlib-identical.patch \ + file://0001-Fix-code-style-issues.patch \ " SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" From patchwork Sat Jan 14 15:49:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63614C46467 for ; Sat, 14 Jan 2023 15:49:33 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.118669.1673711369176907262 for ; Sat, 14 Jan 2023 07:49:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HleaN/EU; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id gz9-20020a17090b0ec900b002290bda1b07so3346382pjb.1 for ; Sat, 14 Jan 2023 07:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6eMy4Gh4k9B4PQdD32Ythp2P0WhUGjyGZ3E04pK7YnY=; b=HleaN/EUy3WVoqq9W2aIzHLnE3RVz8p+LmMNGIdMsF4Nkynww+sGHCEC4FFPbc77KC pgEyN42of8CMOuIy1/scFI0A4l+GJzM05U7f1Pt780Hya+cOWitoUs4I9qKi1+Uw5BWz IZbYeJmIo169EXtFHQK4NMDyl4jiY4dnE7SACYfFUDalI4ZMgqYDoTRra8FN/Hu2GDMl 6zOhqGcWmkL3mX67jLNl9L0EX8s72NjL7bXFbi9LQRMM6Ox5Ub5O3a4VBZDeWkKq/kmX 6jrt+r8X6vUQMA4qYQSVOO+C6gdZlSckjaGMJQ/ctS+8QqtPlb/QBferwfG2fWC3/hvi N2gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6eMy4Gh4k9B4PQdD32Ythp2P0WhUGjyGZ3E04pK7YnY=; b=3RM0Q0RDoG8jlKDTAm9R1Z2l7/ju7ukwnqklZ4DBwU334uG/23EgwHLzfj7gWgjxB3 /Z8a+wkA6LVRHi+qH6DzTI/6bzBbSgSGq3WC2oCbC6005CUVo4gRH1alOkKCBRH962c7 qBFaB1XlqL1faQMAiY2qBCJwTrs9YUL+6+kLRKUFRj/a5t6+X2BNGjJqEYyBsYUkcUZL g5/LfS3B0ZLA9+mGN2k/Iz1Rkni2BXN/ohrmDqNf+Ig5JIMBUVLwriRrlb+4yVe94fOT hbbdM0yMywPEDuaSlf/k8tu64hMNaeHRsPz4+R6Sr9qO56BEQvPHLg8iVDVaAAPO5Q+L +fVA== X-Gm-Message-State: AFqh2kpVKEC2NIAN3SibuzX8+BSgicyA12PU6yJyysDl+dHdUW7Y8Dv6 tPZ8/SAurLbhec3KVBXy6BZJb+cQd+cWuw== X-Google-Smtp-Source: AMrXdXsaY7l5OiY9ZRF62nZ1KIql97+S8X+iVHHibudnvl5Uv32AeRjoaHBpdQDLxWC/YOo5zoD/hg== X-Received: by 2002:a17:90a:ff0e:b0:227:203a:e649 with SMTP id ce14-20020a17090aff0e00b00227203ae649mr21190340pjb.16.1673711368259; Sat, 14 Jan 2023 07:49:28 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::b940]) by smtp.gmail.com with ESMTPSA id b7-20020a63eb47000000b00460ea630c1bsm13129200pgk.46.2023.01.14.07.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 07:49:27 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 3/5] vulkan-samples: Update to the tip of trunk Date: Sat, 14 Jan 2023 07:49:19 -0800 Message-Id: <20230114154921.3757493-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230114154921.3757493-1-raj.khem@gmail.com> References: <20230114154921.3757493-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 14 Jan 2023 15:49:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175852 Drop backported patches Signed-off-by: Khem Raj --- ...o-not-hardcode-lib-as-installation-t.patch | 29 -- .../0001-Qualify-move-as-std-move.patch | 405 ------------------ .../vulkan/vulkan-samples_git.bb | 4 +- 3 files changed, 1 insertion(+), 437 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch deleted file mode 100644 index 90fe277a41..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5fb216d35b6846074196e80421f3162df3b9c8cd Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 1 Nov 2020 23:19:22 +0000 -Subject: [PATCH] CMakeLists.txt: do not hardcode 'lib' as installation target - -Upstream-Status: Inappropriate [already fixed in newer versions] -Signed-off-by: Alexander Kanavin ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e00f8c77..f9896eed 100644 ---- a/third_party/spirv-cross/CMakeLists.txt -+++ b/third_party/spirv-cross/CMakeLists.txt -@@ -67,8 +67,8 @@ macro(spirv_cross_add_library name config_name) - install(TARGETS ${name} - EXPORT ${config_name}Config - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION include/spirv_cross) - install(FILES ${hdrs} DESTINATION include/spirv_cross) - install(EXPORT ${config_name}Config DESTINATION share/${config_name}/cmake) --- -2.17.1 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch deleted file mode 100644 index 80ee521499..0000000000 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Qualify-move-as-std-move.patch +++ /dev/null @@ -1,405 +0,0 @@ -From 9e061b12b9305eee96a4d3129b646c244cc02347 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 14 Aug 2022 19:16:45 -0700 -Subject: [PATCH] Qualify move as std::move - -Seeing errors like below with clang-15 - -spirv_common.hpp:692:19: error: unqualified call to std::move - -squashed Backport of following upstream commits - -https://github.com/KhronosGroup/SPIRV-Cross/commit/44c3333a1c315ead00c24f7aef5fa8a7ccf49299 -https://github.com/KhronosGroup/SPIRV-Cross/commit/0eda71c40936586ea812d0d20d93c11a3e9af192 - -Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Cross/commit/0eda71c40936586ea812d0d20d93c11a3e9af192] -Signed-off-by: Khem Raj ---- - main.cpp | 38 +++++++++++++++++++------------------- - spirv_common.hpp | 2 +- - spirv_cpp.hpp | 2 +- - spirv_cross.cpp | 18 +++++++++--------- - spirv_glsl.cpp | 2 +- - spirv_glsl.hpp | 2 +- - spirv_hlsl.cpp | 4 ++-- - spirv_hlsl.hpp | 2 +- - spirv_msl.cpp | 2 +- - spirv_parser.cpp | 4 ++-- - spirv_reflect.hpp | 2 +- - 11 files changed, 39 insertions(+), 39 deletions(-) - -diff --git a/main.cpp b/main.cpp -index 78991094..581c5e3b 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -65,7 +65,7 @@ struct CLICallbacks - struct CLIParser - { - CLIParser(CLICallbacks cbs_, int argc_, char *argv_[]) -- : cbs(move(cbs_)) -+ : cbs(std::move(cbs_)) - , argc(argc_) - , argv(argv_) - { -@@ -722,7 +722,7 @@ static int main_inner(int argc, char *argv[]) - auto old_name = parser.next_string(); - auto new_name = parser.next_string(); - auto model = stage_to_execution_model(parser.next_string()); -- args.entry_point_rename.push_back({ old_name, new_name, move(model) }); -+ args.entry_point_rename.push_back({ old_name, new_name, std::move(model) }); - }); - cbs.add("--entry", [&args](CLIParser &parser) { args.entry = parser.next_string(); }); - cbs.add("--stage", [&args](CLIParser &parser) { args.entry_stage = parser.next_string(); }); -@@ -731,20 +731,20 @@ static int main_inner(int argc, char *argv[]) - HLSLVertexAttributeRemap remap; - remap.location = parser.next_uint(); - remap.semantic = parser.next_string(); -- args.hlsl_attr_remap.push_back(move(remap)); -+ args.hlsl_attr_remap.push_back(std::move(remap)); - }); - - cbs.add("--remap", [&args](CLIParser &parser) { - string src = parser.next_string(); - string dst = parser.next_string(); - uint32_t components = parser.next_uint(); -- args.remaps.push_back({ move(src), move(dst), components }); -+ args.remaps.push_back({ std::move(src), std::move(dst), components }); - }); - - cbs.add("--remap-variable-type", [&args](CLIParser &parser) { - string var_name = parser.next_string(); - string new_type = parser.next_string(); -- args.variable_type_remaps.push_back({ move(var_name), move(new_type) }); -+ args.variable_type_remaps.push_back({ std::move(var_name), std::move(new_type) }); - }); - - cbs.add("--rename-interface-variable", [&args](CLIParser &parser) { -@@ -757,18 +757,18 @@ static int main_inner(int argc, char *argv[]) - - uint32_t loc = parser.next_uint(); - string var_name = parser.next_string(); -- args.interface_variable_renames.push_back({ cls, loc, move(var_name) }); -+ args.interface_variable_renames.push_back({ cls, loc, std::move(var_name) }); - }); - - cbs.add("--pls-in", [&args](CLIParser &parser) { - auto fmt = pls_format(parser.next_string()); - auto name = parser.next_string(); -- args.pls_in.push_back({ move(fmt), move(name) }); -+ args.pls_in.push_back({ std::move(fmt), std::move(name) }); - }); - cbs.add("--pls-out", [&args](CLIParser &parser) { - auto fmt = pls_format(parser.next_string()); - auto name = parser.next_string(); -- args.pls_out.push_back({ move(fmt), move(name) }); -+ args.pls_out.push_back({ std::move(fmt), std::move(name) }); - }); - cbs.add("--shader-model", [&args](CLIParser &parser) { - args.shader_model = parser.next_uint(); -@@ -788,7 +788,7 @@ static int main_inner(int argc, char *argv[]) - cbs.default_handler = [&args](const char *value) { args.input = value; }; - cbs.error_handler = [] { print_help(); }; - -- CLIParser parser{ move(cbs), argc - 1, argv + 1 }; -+ CLIParser parser{ std::move(cbs), argc - 1, argv + 1 }; - if (!parser.parse()) - { - return EXIT_FAILURE; -@@ -808,14 +808,14 @@ static int main_inner(int argc, char *argv[]) - auto spirv_file = read_spirv_file(args.input); - if (spirv_file.empty()) - return EXIT_FAILURE; -- Parser spirv_parser(move(spirv_file)); -+ Parser spirv_parser(std::move(spirv_file)); - - spirv_parser.parse(); - - // Special case reflection because it has little to do with the path followed by code-outputting compilers - if (!args.reflect.empty()) - { -- CompilerReflection compiler(move(spirv_parser.get_parsed_ir())); -+ CompilerReflection compiler(std::move(spirv_parser.get_parsed_ir())); - compiler.set_format(args.reflect); - auto json = compiler.compile(); - if (args.output) -@@ -831,13 +831,13 @@ static int main_inner(int argc, char *argv[]) - - if (args.cpp) - { -- compiler.reset(new CompilerCPP(move(spirv_parser.get_parsed_ir()))); -+ compiler.reset(new CompilerCPP(std::move(spirv_parser.get_parsed_ir()))); - if (args.cpp_interface_name) - static_cast(compiler.get())->set_interface_name(args.cpp_interface_name); - } - else if (args.msl) - { -- compiler.reset(new CompilerMSL(move(spirv_parser.get_parsed_ir()))); -+ compiler.reset(new CompilerMSL(std::move(spirv_parser.get_parsed_ir()))); - - auto *msl_comp = static_cast(compiler.get()); - auto msl_opts = msl_comp->get_msl_options(); -@@ -850,13 +850,13 @@ static int main_inner(int argc, char *argv[]) - msl_comp->set_msl_options(msl_opts); - } - else if (args.hlsl) -- compiler.reset(new CompilerHLSL(move(spirv_parser.get_parsed_ir()))); -+ compiler.reset(new CompilerHLSL(std::move(spirv_parser.get_parsed_ir()))); - else - { - combined_image_samplers = !args.vulkan_semantics; - if (!args.vulkan_semantics) - build_dummy_sampler = true; -- compiler.reset(new CompilerGLSL(move(spirv_parser.get_parsed_ir()))); -+ compiler.reset(new CompilerGLSL(std::move(spirv_parser.get_parsed_ir()))); - } - - if (!args.variable_type_remaps.empty()) -@@ -867,7 +867,7 @@ static int main_inner(int argc, char *argv[]) - out = remap.new_variable_type; - }; - -- compiler->set_variable_type_remap_callback(move(remap_cb)); -+ compiler->set_variable_type_remap_callback(std::move(remap_cb)); - } - - for (auto &rename : args.entry_point_rename) -@@ -1019,7 +1019,7 @@ static int main_inner(int argc, char *argv[]) - { - auto active = compiler->get_active_interface_variables(); - res = compiler->get_shader_resources(active); -- compiler->set_enabled_interface_variables(move(active)); -+ compiler->set_enabled_interface_variables(std::move(active)); - } - else - res = compiler->get_shader_resources(); -@@ -1034,7 +1034,7 @@ static int main_inner(int argc, char *argv[]) - - auto pls_inputs = remap_pls(args.pls_in, res.stage_inputs, &res.subpass_inputs); - auto pls_outputs = remap_pls(args.pls_out, res.stage_outputs, nullptr); -- compiler->remap_pixel_local_storage(move(pls_inputs), move(pls_outputs)); -+ compiler->remap_pixel_local_storage(std::move(pls_inputs), std::move(pls_outputs)); - - for (auto &ext : args.extensions) - compiler->require_extension(ext); -@@ -1101,7 +1101,7 @@ static int main_inner(int argc, char *argv[]) - for (uint32_t i = 0; i < args.iterations; i++) - { - if (args.hlsl) -- glsl = static_cast(compiler.get())->compile(move(args.hlsl_attr_remap)); -+ glsl = static_cast(compiler.get())->compile(std::move(args.hlsl_attr_remap)); - else - glsl = compiler->compile(); - } -diff --git a/spirv_common.hpp b/spirv_common.hpp -index aa32142d..0daf5ad5 100644 ---- a/spirv_common.hpp -+++ b/spirv_common.hpp -@@ -536,7 +536,7 @@ struct SPIRExpression : IVariant - - // Only created by the backend target to avoid creating tons of temporaries. - SPIRExpression(std::string expr, uint32_t expression_type_, bool immutable_) -- : expression(move(expr)) -+ : expression(std::move(expr)) - , expression_type(expression_type_) - , immutable(immutable_) - { -diff --git a/spirv_cpp.hpp b/spirv_cpp.hpp -index bcdb669b..b4da84b9 100644 ---- a/spirv_cpp.hpp -+++ b/spirv_cpp.hpp -@@ -27,7 +27,7 @@ class CompilerCPP : public CompilerGLSL - { - public: - explicit CompilerCPP(std::vector spirv_) -- : CompilerGLSL(move(spirv_)) -+ : CompilerGLSL(std::move(spirv_)) - { - } - -diff --git a/spirv_cross.cpp b/spirv_cross.cpp -index 19bac301..d21dbd41 100644 ---- a/spirv_cross.cpp -+++ b/spirv_cross.cpp -@@ -28,16 +28,16 @@ using namespace spirv_cross; - - Compiler::Compiler(vector ir_) - { -- Parser parser(move(ir_)); -+ Parser parser(std::move(ir_)); - parser.parse(); -- set_ir(move(parser.get_parsed_ir())); -+ set_ir(std::move(parser.get_parsed_ir())); - } - - Compiler::Compiler(const uint32_t *ir_, size_t word_count) - { - Parser parser(ir_, word_count); - parser.parse(); -- set_ir(move(parser.get_parsed_ir())); -+ set_ir(std::move(parser.get_parsed_ir())); - } - - Compiler::Compiler(const ParsedIR &ir_) -@@ -47,12 +47,12 @@ Compiler::Compiler(const ParsedIR &ir_) - - Compiler::Compiler(ParsedIR &&ir_) - { -- set_ir(move(ir_)); -+ set_ir(std::move(ir_)); - } - - void Compiler::set_ir(ParsedIR &&ir_) - { -- ir = move(ir_); -+ ir = std::move(ir_); - parse_fixup(); - } - -@@ -716,7 +716,7 @@ unordered_set Compiler::get_active_interface_variables() const - - void Compiler::set_enabled_interface_variables(std::unordered_set active_variables) - { -- active_interface_variables = move(active_variables); -+ active_interface_variables = std::move(active_variables); - check_active_interface_variables = true; - } - -@@ -2163,7 +2163,7 @@ void Compiler::CombinedImageSamplerHandler::push_remap_parameters(const SPIRFunc - unordered_map remapping; - for (uint32_t i = 0; i < length; i++) - remapping[func.arguments[i].id] = remap_parameter(args[i]); -- parameter_remapping.push(move(remapping)); -+ parameter_remapping.push(std::move(remapping)); - } - - void Compiler::CombinedImageSamplerHandler::pop_remap_parameters() -@@ -3611,7 +3611,7 @@ void Compiler::analyze_image_and_sampler_usage() - - CombinedImageSamplerUsageHandler handler(*this, dref_handler.dref_combined_samplers); - traverse_all_reachable_opcodes(get(ir.default_entry_point), handler); -- comparison_ids = move(handler.comparison_ids); -+ comparison_ids = std::move(handler.comparison_ids); - need_subpass_input = handler.need_subpass_input; - - // Forward information from separate images and samplers into combined image samplers. -@@ -3650,7 +3650,7 @@ void Compiler::build_function_control_flow_graphs_and_analyze() - CFGBuilder handler(*this); - handler.function_cfgs[ir.default_entry_point].reset(new CFG(*this, get(ir.default_entry_point))); - traverse_all_reachable_opcodes(get(ir.default_entry_point), handler); -- function_cfgs = move(handler.function_cfgs); -+ function_cfgs = std::move(handler.function_cfgs); - - for (auto &f : function_cfgs) - { -diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp -index a8855987..fabbb105 100644 ---- a/spirv_glsl.cpp -+++ b/spirv_glsl.cpp -@@ -6876,7 +6876,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction) - bool ptr_chain = opcode == OpPtrAccessChain; - auto e = access_chain(ops[2], &ops[3], length - 3, get(ops[0]), &meta, ptr_chain); - -- auto &expr = set(ops[1], move(e), ops[0], should_forward(ops[2])); -+ auto &expr = set(ops[1], std::move(e), ops[0], should_forward(ops[2])); - - auto *backing_variable = maybe_get_backing_variable(ops[2]); - expr.loaded_from = backing_variable ? backing_variable->self : ops[2]; -diff --git a/spirv_glsl.hpp b/spirv_glsl.hpp -index caf0ad3b..aac1196e 100644 ---- a/spirv_glsl.hpp -+++ b/spirv_glsl.hpp -@@ -138,7 +138,7 @@ public: - } - - explicit CompilerGLSL(std::vector spirv_) -- : Compiler(move(spirv_)) -+ : Compiler(std::move(spirv_)) - { - init(); - } -diff --git a/spirv_hlsl.cpp b/spirv_hlsl.cpp -index a5b6d2dc..0933017e 100644 ---- a/spirv_hlsl.cpp -+++ b/spirv_hlsl.cpp -@@ -2028,7 +2028,7 @@ void CompilerHLSL::emit_function_prototype(SPIRFunction &func, const Bitset &ret - out_argument += " "; - out_argument += "SPIRV_Cross_return_value"; - out_argument += type_to_array_glsl(type); -- arglist.push_back(move(out_argument)); -+ arglist.push_back(std::move(out_argument)); - } - - for (auto &arg : func.arguments) -@@ -4553,7 +4553,7 @@ void CompilerHLSL::require_texture_query_variant(const SPIRType &type) - - string CompilerHLSL::compile(std::vector vertex_attributes) - { -- remap_vertex_attributes = move(vertex_attributes); -+ remap_vertex_attributes = std::move(vertex_attributes); - return compile(); - } - -diff --git a/spirv_hlsl.hpp b/spirv_hlsl.hpp -index b2b60fca..3503c674 100644 ---- a/spirv_hlsl.hpp -+++ b/spirv_hlsl.hpp -@@ -63,7 +63,7 @@ public: - }; - - explicit CompilerHLSL(std::vector spirv_) -- : CompilerGLSL(move(spirv_)) -+ : CompilerGLSL(std::move(spirv_)) - { - } - -diff --git a/spirv_msl.cpp b/spirv_msl.cpp -index 0e1e733d..fbfcdba5 100644 ---- a/spirv_msl.cpp -+++ b/spirv_msl.cpp -@@ -32,7 +32,7 @@ static const uint32_t k_aux_mbr_idx_swizzle_const = 0u; - - CompilerMSL::CompilerMSL(vector spirv_, vector *p_vtx_attrs, - vector *p_res_bindings) -- : CompilerGLSL(move(spirv_)) -+ : CompilerGLSL(std::move(spirv_)) - { - if (p_vtx_attrs) - for (auto &va : *p_vtx_attrs) -diff --git a/spirv_parser.cpp b/spirv_parser.cpp -index 1725b4ca..0fcd7691 100644 ---- a/spirv_parser.cpp -+++ b/spirv_parser.cpp -@@ -24,7 +24,7 @@ namespace spirv_cross - { - Parser::Parser(std::vector spirv) - { -- ir.spirv = move(spirv); -+ ir.spirv = std::move(spirv); - } - - Parser::Parser(const uint32_t *spirv_data, size_t word_count) -@@ -223,7 +223,7 @@ void Parser::parse(const Instruction &instruction) - case OpExtension: - { - auto ext = extract_string(ir.spirv, instruction.offset); -- ir.declared_extensions.push_back(move(ext)); -+ ir.declared_extensions.push_back(std::move(ext)); - break; - } - -diff --git a/spirv_reflect.hpp b/spirv_reflect.hpp -index 13b5b431..f5c6a6ff 100644 ---- a/spirv_reflect.hpp -+++ b/spirv_reflect.hpp -@@ -34,7 +34,7 @@ class CompilerReflection : public CompilerGLSL - - public: - explicit CompilerReflection(std::vector spirv_) -- : Parent(move(spirv_)) -+ : Parent(std::move(spirv_)) - { - options.vulkan_semantics = true; - } --- -2.37.2 - diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 6aabf2e3b8..26300ecb1d 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -6,14 +6,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https;lfs=0 \ - file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ file://debugfix.patch \ - file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \ file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "8b945bebf8b2fd987dcf0eeca048068adf4ea44d" +SRCREV = "a42d4eab1e5fe7814dfbe91e3bbaf8ab62cf03f6" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" From patchwork Sat Jan 14 15:49:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18122 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D6ACC3DA78 for ; Sat, 14 Jan 2023 15:49:33 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.118670.1673711370222439990 for ; Sat, 14 Jan 2023 07:49:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pWeyVEkd; spf=pass (domain: gmail.com, ip: 209.85.216.41, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f41.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso29894648pjt.0 for ; Sat, 14 Jan 2023 07:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ekljcH8YolXhB+lmnyD75Na32Xqr4e91MAB+n4oXsrE=; b=pWeyVEkdKFgV6brFla1Rglpn+yH6UqMAdsX8+W7VzIVfz08AIxuAl77lp9yqN7IjAi 0YO16TVwwKPP7oylAPZbJVx8CeegOfgqd7m0pWNgpslGFMAXhVjlyBM6KfFZMToVz8rP khmDbq6f4EnARKenja0WwoIBk6nAQ8ZAfYcCN2W0QFsDFufdUYR7fJ8y1LmQi37mrmXj grLviVR/UtTQrjLMIG0MIVyEqmx0iBTQeLqJ+W2Pb1wVUhD+ZuArHr/W3mZCnjZ9gEg6 82QHVFl1h97tSl8BZsgHb2MkcSY8ZpQfJEPYN7HHjNtWZ2FQonxSJg+nXEjoIiRcKGXN ++QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ekljcH8YolXhB+lmnyD75Na32Xqr4e91MAB+n4oXsrE=; b=e4aCHBe2U0SxVVGtw6YYjPpnPHpTp9Y/KRgj/MOvILVeYxttbtnu2u7IK7KhCB9C6v FFMCCprzOnqtAt+eidNJ+P8dePlIqmIogYNU4QxBVYcy29wKHEMPTBsgrt5Jy6ZPlRiE hVaSiYQPHacUDpxg1ecGIAiASJZCCJVHzoe57waIHxZFTnROpWNPFjVmJnT74jaekPNv x8u9p4l0p0PoL2uG0Aiha98t7lTD/HOkQT5kFoM2JT4U/fyxxIUg6mhk9ggORLTpeo6N HZ0cda4dZSYNINaivm9/6fXOHaXV87FOV66UwX8HPaUWQ+I3qWOJWbn0xg9jBROnyIlp AVmQ== X-Gm-Message-State: AFqh2kp6Z9AA+/SDBgoSKqA1XqxR9ITpLL4KgXK2FP9gZM5OYv+h5Bo6 pIwC3HyyKfCdZXmBpq0MWnygBvFqf1VC4w== X-Google-Smtp-Source: AMrXdXtduBaHypRQ1S4ELprmwmPujmouCeUIf1HaP+hr7KJiPhQED3qfGW0W8eRoMWHlzmsQGQ99ZQ== X-Received: by 2002:a17:90a:3804:b0:229:2470:165e with SMTP id w4-20020a17090a380400b002292470165emr6579459pjb.40.1673711369376; Sat, 14 Jan 2023 07:49:29 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::b940]) by smtp.gmail.com with ESMTPSA id b7-20020a63eb47000000b00460ea630c1bsm13129200pgk.46.2023.01.14.07.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 07:49:28 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 4/5] unfs3: Fix implicit function declarations of fix_dir_times() Date: Sat, 14 Jan 2023 07:49:20 -0800 Message-Id: <20230114154921.3757493-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230114154921.3757493-1-raj.khem@gmail.com> References: <20230114154921.3757493-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 14 Jan 2023 15:49:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175853 Signed-off-by: Khem Raj --- .../unfs3/0001-locate.c-Include-attr.h.patch | 28 +++++++++++++++++++ meta/recipes-devtools/unfs3/unfs3_git.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch b/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch new file mode 100644 index 0000000000..076e08fadc --- /dev/null +++ b/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch @@ -0,0 +1,28 @@ +From 63e0785bb379a8f2c41f34f5cd938ca38555e605 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 13 Jan 2023 23:41:01 -0800 +Subject: [PATCH] locate.c: Include attr.h + +Its needed for fix_dir_times() API declarations + +Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/32] +Signed-off-by: Khem Raj +--- + locate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/locate.c b/locate.c +index 6bbe71f..84e0fe5 100644 +--- a/locate.c ++++ b/locate.c +@@ -27,6 +27,7 @@ + #include "nfs.h" + #include "fh.h" + #include "daemon.h" ++#include "attr.h" + + /* + * these are the brute-force file searching routines that are used +-- +2.39.0 + diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_git.bb index a4701bdb57..be3870b8a4 100644 --- a/meta/recipes-devtools/unfs3/unfs3_git.bb +++ b/meta/recipes-devtools/unfs3/unfs3_git.bb @@ -15,6 +15,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \ file://0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch \ file://0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch \ + file://0001-locate.c-Include-attr.h.patch \ " SRCREV = "c8f2d2cd4529955419bad0e163f88d47ff176b8d" UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P\d+(\.\d+)+)" From patchwork Sat Jan 14 15:49:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75D94C678D7 for ; Sat, 14 Jan 2023 15:49:33 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.118672.1673711371887205185 for ; Sat, 14 Jan 2023 07:49:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=K59eFKUJ; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id z1-20020a17090a66c100b00226f05b9595so12099527pjl.0 for ; Sat, 14 Jan 2023 07:49:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OkMIQ8GQWYVMzwCbV0509w8j+KdQSloUKl7foC82ip0=; b=K59eFKUJKd5n3QCxvVsMw87u9Pc8X4bKtFhtxqQIjLopsGgr/Wx3f8WmCHbLd8dNDv QPCssYcxdE8ULMXipiJilie5hUa4iqYUUeO8f7D1GZ2Mxow0tle2+TwAjK/YQAu/pp1u cvJnZHgPR6ArEgBs0QQmDu/WBi3GiLOBkyd0N1AJAdHopb/TFsNyQJCXm8wDOkLoyZLd 3Hsa8WVAkqkaLeCMDc+Kw3x/AP5ZZkAeuHiwxMKxPyoOYZf3pKZ8lm+nbBzb/cfyqD1n sRnFvpuzLhrV7NxrH1etnqCPybSMUTa02yhd99bm0S/XwF65Greal89f4Msfl1bF7bEb /e9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OkMIQ8GQWYVMzwCbV0509w8j+KdQSloUKl7foC82ip0=; b=FD7UDScTzmp6H33zNsCe58J7zP9VSC3FI5aOZmP1oQQnNYnjKjTa9xATGz0yseeZOI YaRgWkB1ouqJI1iR/f2veYVL0tLZyIkMNjm8v9WbqyouGQu5bgySBGBVsMTm5igScpUo +D2BHNY+eWVa3QFNbshSOsGzRCIut8s4PdeddldFQVzw9TXj3eCmpsKJBW8TVqgqykDM 6vNy9jsHi7Gr593J4oLyxjH6RE2muJdCprCzxSJ6olGL7RA31ryz+cRfu+gUuUhHLksy Uanm7f8L0VNCk++638RTJMT99E1Zeu8RUgIuV+/BGA8Da6Hk7vflAba6UCRfJGqBpZC5 sdhQ== X-Gm-Message-State: AFqh2koT8Pb7h7FNEZljWMCH8PFEv0dbf0DQ6QhKNIt6nDKsmMcIE4JM 4S7Hs0ll9GceVrqwd5q7BKLc2FBTzQiIzg== X-Google-Smtp-Source: AMrXdXvKe8gBRY7vo3QIxufrDk9DucCFfKNEfT+9/pyeaxj5rKvBgxeloAtrX/XUP1/JTO4hqvzKlw== X-Received: by 2002:a05:6a20:8b28:b0:b2:637a:2b78 with SMTP id l40-20020a056a208b2800b000b2637a2b78mr15269771pzh.32.1673711370877; Sat, 14 Jan 2023 07:49:30 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::b940]) by smtp.gmail.com with ESMTPSA id b7-20020a63eb47000000b00460ea630c1bsm13129200pgk.46.2023.01.14.07.49.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 07:49:29 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 5/5] gperf: Make the code C++17 compliant Date: Sat, 14 Jan 2023 07:49:21 -0800 Message-Id: <20230114154921.3757493-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230114154921.3757493-1-raj.khem@gmail.com> References: <20230114154921.3757493-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 14 Jan 2023 15:49:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175854 Fixes | ../../gperf-3.1/lib/getline.cc:58:7: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] | register int c = getc (stream); | ^~~~~~~~~ Signed-off-by: Khem Raj --- .../0001-Make-the-code-C-17-compliant.patch | 29 +++++++++++++++++++ meta/recipes-extended/gperf/gperf_3.1.bb | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/gperf/gperf/0001-Make-the-code-C-17-compliant.patch diff --git a/meta/recipes-extended/gperf/gperf/0001-Make-the-code-C-17-compliant.patch b/meta/recipes-extended/gperf/gperf/0001-Make-the-code-C-17-compliant.patch new file mode 100644 index 0000000000..96e70cdb36 --- /dev/null +++ b/meta/recipes-extended/gperf/gperf/0001-Make-the-code-C-17-compliant.patch @@ -0,0 +1,29 @@ +From 6194f0027045433598a61965758b4531a3d06d1f Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 30 Aug 2020 12:36:15 +0200 +Subject: [PATCH] Make the code C++17 compliant. + +* lib/getline.cc (getstr): Don't use the 'register' keyword. + +Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=commit;h=a63b830554920476881837eeacd4a6b507632b19] +Signed-off-by: Khem Raj +--- + lib/getline.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/getline.cc b/lib/getline.cc +index c57c633..0984a7c 100644 +--- a/lib/getline.cc ++++ b/lib/getline.cc +@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset) + + for (;;) + { +- register int c = getc (stream); ++ int c = getc (stream); + + /* We always want at least one char left in the buffer, since we + always (unless we get an error while reading the first char) +-- +2.39.0 + diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb index 4c32a5dc83..c57ade9fe3 100644 --- a/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/meta/recipes-extended/gperf/gperf_3.1.bb @@ -5,7 +5,8 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ + file://0001-Make-the-code-C-17-compliant.patch" SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2"