All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] brotli: update to 1.0.9
@ 2020-09-05  7:49 Gianfranco
  2020-09-05  7:54 ` [oe] " Khem Raj
  0 siblings, 1 reply; 7+ messages in thread
From: Gianfranco @ 2020-09-05  7:49 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Gianfranco Costamagna, Gianfranco Costamagna

cherry-pick upstream fix for pkg-config based detection failure

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
---
 .../recipes-extended/brotli/brotli/838.patch  | 48 +++++++++++++++++++
 .../{brotli_1.0.7.bb => brotli_1.0.9.bb}      |  7 +--
 2 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
 rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} (81%)

diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch b/meta-oe/recipes-extended/brotli/brotli/838.patch
new file mode 100644
index 000000000..98b888760
--- /dev/null
+++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
@@ -0,0 +1,48 @@
+Upstream-Status: Backport [https://github.com/google/brotli/pull/838]
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in    | 2 +-
+ scripts/libbrotlienc.pc.in    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
similarity index 81%
rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
index 32f855844..0038ba74d 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
@@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
 
-SRC_URI = "git://github.com/google/brotli.git"
-# tag 1.0.7
-SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
+SRC_URI = "git://github.com/google/brotli.git \
+           file://838.patch "
+# tag 1.0.9
+SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
 S = "${WORKDIR}/git"
 
 inherit cmake lib_package
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
  2020-09-05  7:49 [meta-oe][PATCH] brotli: update to 1.0.9 Gianfranco
@ 2020-09-05  7:54 ` Khem Raj
  2020-09-05 12:10   ` Gianfranco
  0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2020-09-05  7:54 UTC (permalink / raw)
  To: Gianfranco
  Cc: openembeded-devel, Gianfranco Costamagna, Gianfranco Costamagna

On Sat, Sep 5, 2020 at 12:49 AM Gianfranco
<costamagna.gianfranco@gmail.com> wrote:
>
> cherry-pick upstream fix for pkg-config based detection failure
>
> Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ---
>  .../recipes-extended/brotli/brotli/838.patch  | 48 +++++++++++++++++++
>  .../{brotli_1.0.7.bb => brotli_1.0.9.bb}      |  7 +--
>  2 files changed, 52 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
>  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} (81%)
>
> diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch b/meta-oe/recipes-extended/brotli/brotli/838.patch
> new file mode 100644
> index 000000000..98b888760
> --- /dev/null
> +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> @@ -0,0 +1,48 @@
> +Upstream-Status: Backport [https://github.com/google/brotli/pull/838]

I ended up merging your V2, please rebase this on master and resend
just the delta

> +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> +From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
> +Date: Wed, 2 Sep 2020 10:49:49 +0200
> +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
> +
> +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> +---
> + scripts/libbrotlicommon.pc.in | 2 +-
> + scripts/libbrotlidec.pc.in    | 2 +-
> + scripts/libbrotlienc.pc.in    | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
> +index 10ca969e..2a8cf7a3 100644
> +--- a/scripts/libbrotlicommon.pc.in
> ++++ b/scripts/libbrotlicommon.pc.in
> +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> + URL: https://github.com/google/brotli
> + Description: Brotli common dictionary library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> ++Libs: -L${libdir} -lbrotlicommon
> + Cflags: -I${includedir}
> +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> +index e7c3124f..6f8ef2e4 100644
> +--- a/scripts/libbrotlidec.pc.in
> ++++ b/scripts/libbrotlidec.pc.in
> +@@ -7,6 +7,6 @@ Name: libbrotlidec
> + URL: https://github.com/google/brotli
> + Description: Brotli decoder library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> ++Libs: -L${libdir} -lbrotlidec
> + Requires.private: libbrotlicommon >= 1.0.2
> + Cflags: -I${includedir}
> +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> +index 4dd0811b..2098afe2 100644
> +--- a/scripts/libbrotlienc.pc.in
> ++++ b/scripts/libbrotlienc.pc.in
> +@@ -7,6 +7,6 @@ Name: libbrotlienc
> + URL: https://github.com/google/brotli
> + Description: Brotli encoder library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> ++Libs: -L${libdir} -lbrotlienc
> + Requires.private: libbrotlicommon >= 1.0.2
> + Cflags: -I${includedir}
> diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> similarity index 81%
> rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> index 32f855844..0038ba74d 100644
> --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
>
> -SRC_URI = "git://github.com/google/brotli.git"
> -# tag 1.0.7
> -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> +SRC_URI = "git://github.com/google/brotli.git \
> +           file://838.patch "
> +# tag 1.0.9
> +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
>  S = "${WORKDIR}/git"
>
>  inherit cmake lib_package
> --
> 2.17.1
>
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
  2020-09-05  7:54 ` [oe] " Khem Raj
@ 2020-09-05 12:10   ` Gianfranco
  0 siblings, 0 replies; 7+ messages in thread
From: Gianfranco @ 2020-09-05 12:10 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel, Gianfranco Costamagna, Gianfranco Costamagna

[-- Attachment #1: Type: text/plain, Size: 4336 bytes --]

Debased and sent thanks

G.

On Sat, Sep 5, 2020, 09:54 Khem Raj <raj.khem@gmail.com> wrote:

> On Sat, Sep 5, 2020 at 12:49 AM Gianfranco
> <costamagna.gianfranco@gmail.com> wrote:
> >
> > cherry-pick upstream fix for pkg-config based detection failure
> >
> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ---
> >  .../recipes-extended/brotli/brotli/838.patch  | 48 +++++++++++++++++++
> >  .../{brotli_1.0.7.bb => brotli_1.0.9.bb}      |  7 +--
> >  2 files changed, 52 insertions(+), 3 deletions(-)
> >  create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
> >  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb =>
> brotli_1.0.9.bb} (81%)
> >
> > diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch
> b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > new file mode 100644
> > index 000000000..98b888760
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > @@ -0,0 +1,48 @@
> > +Upstream-Status: Backport [https://github.com/google/brotli/pull/838]
>
> I ended up merging your V2, please rebase this on master and resend
> just the delta
>
> > +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> > +From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
> > +Date: Wed, 2 Sep 2020 10:49:49 +0200
> > +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files
> (#740)"
> > +
> > +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> > +---
> > + scripts/libbrotlicommon.pc.in | 2 +-
> > + scripts/libbrotlidec.pc.in    | 2 +-
> > + scripts/libbrotlienc.pc.in    | 2 +-
> > + 3 files changed, 3 insertions(+), 3 deletions(-)
> > +
> > +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/
> libbrotlicommon.pc.in
> > +index 10ca969e..2a8cf7a3 100644
> > +--- a/scripts/libbrotlicommon.pc.in
> > ++++ b/scripts/libbrotlicommon.pc.in
> > +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> > + URL: https://github.com/google/brotli
> > + Description: Brotli common dictionary library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> > ++Libs: -L${libdir} -lbrotlicommon
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> > +index e7c3124f..6f8ef2e4 100644
> > +--- a/scripts/libbrotlidec.pc.in
> > ++++ b/scripts/libbrotlidec.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlidec
> > + URL: https://github.com/google/brotli
> > + Description: Brotli decoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> > ++Libs: -L${libdir} -lbrotlidec
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> > +index 4dd0811b..2098afe2 100644
> > +--- a/scripts/libbrotlienc.pc.in
> > ++++ b/scripts/libbrotlienc.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlienc
> > + URL: https://github.com/google/brotli
> > + Description: Brotli encoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> > ++Libs: -L${libdir} -lbrotlienc
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > similarity index 81%
> > rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > index 32f855844..0038ba74d 100644
> > --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues"
> >  LICENSE = "MIT"
> >  LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
> >
> > -SRC_URI = "git://github.com/google/brotli.git"
> > -# tag 1.0.7
> > -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> > +SRC_URI = "git://github.com/google/brotli.git \
> > +           file://838.patch "
> > +# tag 1.0.9
> > +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
> >  S = "${WORKDIR}/git"
> >
> >  inherit cmake lib_package
> > --
> > 2.17.1
> >
> > 
>

[-- Attachment #2: Type: text/html, Size: 8302 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
  2020-09-05  1:40 ` [oe] " Khem Raj
@ 2020-09-05  7:49   ` Gianfranco
  0 siblings, 0 replies; 7+ messages in thread
From: Gianfranco @ 2020-09-05  7:49 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel, Gianfranco Costamagna, Gianfranco Costamagna

[-- Attachment #1: Type: text/plain, Size: 4322 bytes --]

This patch is a backport. Resubmitted!

G.

Il giorno sab 5 set 2020 alle ore 03:41 Khem Raj <raj.khem@gmail.com> ha
scritto:

> On Fri, Sep 4, 2020 at 3:14 PM Gianfranco
> <costamagna.gianfranco@gmail.com> wrote:
> >
> > cherry-pick upstream fix for pkg-config based detection failure
> >
>
> Is this patch reverted upstream? if so please add appropriate
> Upstream-Status field for it in the patch header.
>
> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ---
> >  .../recipes-extended/brotli/brotli/838.patch  | 47 +++++++++++++++++++
> >  .../{brotli_1.0.7.bb => brotli_1.0.9.bb}      |  7 +--
> >  2 files changed, 51 insertions(+), 3 deletions(-)
> >  create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
> >  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb =>
> brotli_1.0.9.bb} (81%)
> >
> > diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch
> b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > new file mode 100644
> > index 000000000..8ecf2e4c9
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> > @@ -0,0 +1,47 @@
> > +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> > +From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
> > +Date: Wed, 2 Sep 2020 10:49:49 +0200
> > +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files
> (#740)"
> > +
> > +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> > +---
> > + scripts/libbrotlicommon.pc.in | 2 +-
> > + scripts/libbrotlidec.pc.in    | 2 +-
> > + scripts/libbrotlienc.pc.in    | 2 +-
> > + 3 files changed, 3 insertions(+), 3 deletions(-)
> > +
> > +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/
> libbrotlicommon.pc.in
> > +index 10ca969e..2a8cf7a3 100644
> > +--- a/scripts/libbrotlicommon.pc.in
> > ++++ b/scripts/libbrotlicommon.pc.in
> > +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> > + URL: https://github.com/google/brotli
> > + Description: Brotli common dictionary library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> > ++Libs: -L${libdir} -lbrotlicommon
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> > +index e7c3124f..6f8ef2e4 100644
> > +--- a/scripts/libbrotlidec.pc.in
> > ++++ b/scripts/libbrotlidec.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlidec
> > + URL: https://github.com/google/brotli
> > + Description: Brotli decoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> > ++Libs: -L${libdir} -lbrotlidec
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> > +index 4dd0811b..2098afe2 100644
> > +--- a/scripts/libbrotlienc.pc.in
> > ++++ b/scripts/libbrotlienc.pc.in
> > +@@ -7,6 +7,6 @@ Name: libbrotlienc
> > + URL: https://github.com/google/brotli
> > + Description: Brotli encoder library
> > + Version: @PACKAGE_VERSION@
> > +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> > ++Libs: -L${libdir} -lbrotlienc
> > + Requires.private: libbrotlicommon >= 1.0.2
> > + Cflags: -I${includedir}
> > diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > similarity index 81%
> > rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > index 32f855844..0038ba74d 100644
> > --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues"
> >  LICENSE = "MIT"
> >  LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
> >
> > -SRC_URI = "git://github.com/google/brotli.git"
> > -# tag 1.0.7
> > -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> > +SRC_URI = "git://github.com/google/brotli.git \
> > +           file://838.patch "
> > +# tag 1.0.9
> > +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
> >  S = "${WORKDIR}/git"
> >
> >  inherit cmake lib_package
> > --
> > 2.17.1
> >
> > 
>

[-- Attachment #2: Type: text/html, Size: 7782 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
  2020-09-04 22:13 Gianfranco
@ 2020-09-05  1:40 ` Khem Raj
  2020-09-05  7:49   ` Gianfranco
  0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2020-09-05  1:40 UTC (permalink / raw)
  To: Gianfranco
  Cc: openembeded-devel, Gianfranco Costamagna, Gianfranco Costamagna

On Fri, Sep 4, 2020 at 3:14 PM Gianfranco
<costamagna.gianfranco@gmail.com> wrote:
>
> cherry-pick upstream fix for pkg-config based detection failure
>

Is this patch reverted upstream? if so please add appropriate
Upstream-Status field for it in the patch header.

> Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ---
>  .../recipes-extended/brotli/brotli/838.patch  | 47 +++++++++++++++++++
>  .../{brotli_1.0.7.bb => brotli_1.0.9.bb}      |  7 +--
>  2 files changed, 51 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-extended/brotli/brotli/838.patch
>  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} (81%)
>
> diff --git a/meta-oe/recipes-extended/brotli/brotli/838.patch b/meta-oe/recipes-extended/brotli/brotli/838.patch
> new file mode 100644
> index 000000000..8ecf2e4c9
> --- /dev/null
> +++ b/meta-oe/recipes-extended/brotli/brotli/838.patch
> @@ -0,0 +1,47 @@
> +From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
> +From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
> +Date: Wed, 2 Sep 2020 10:49:49 +0200
> +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
> +
> +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
> +---
> + scripts/libbrotlicommon.pc.in | 2 +-
> + scripts/libbrotlidec.pc.in    | 2 +-
> + scripts/libbrotlienc.pc.in    | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
> +index 10ca969e..2a8cf7a3 100644
> +--- a/scripts/libbrotlicommon.pc.in
> ++++ b/scripts/libbrotlicommon.pc.in
> +@@ -7,5 +7,5 @@ Name: libbrotlicommon
> + URL: https://github.com/google/brotli
> + Description: Brotli common dictionary library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlicommon
> ++Libs: -L${libdir} -lbrotlicommon
> + Cflags: -I${includedir}
> +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
> +index e7c3124f..6f8ef2e4 100644
> +--- a/scripts/libbrotlidec.pc.in
> ++++ b/scripts/libbrotlidec.pc.in
> +@@ -7,6 +7,6 @@ Name: libbrotlidec
> + URL: https://github.com/google/brotli
> + Description: Brotli decoder library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlidec
> ++Libs: -L${libdir} -lbrotlidec
> + Requires.private: libbrotlicommon >= 1.0.2
> + Cflags: -I${includedir}
> +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
> +index 4dd0811b..2098afe2 100644
> +--- a/scripts/libbrotlienc.pc.in
> ++++ b/scripts/libbrotlienc.pc.in
> +@@ -7,6 +7,6 @@ Name: libbrotlienc
> + URL: https://github.com/google/brotli
> + Description: Brotli encoder library
> + Version: @PACKAGE_VERSION@
> +-Libs: -L${libdir} -R${libdir} -lbrotlienc
> ++Libs: -L${libdir} -lbrotlienc
> + Requires.private: libbrotlicommon >= 1.0.2
> + Cflags: -I${includedir}
> diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> similarity index 81%
> rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> index 32f855844..0038ba74d 100644
> --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> @@ -6,9 +6,10 @@ BUGTRACKER = "https://github.com/google/brotli/issues"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
>
> -SRC_URI = "git://github.com/google/brotli.git"
> -# tag 1.0.7
> -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> +SRC_URI = "git://github.com/google/brotli.git \
> +           file://838.patch "
> +# tag 1.0.9
> +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
>  S = "${WORKDIR}/git"
>
>  inherit cmake lib_package
> --
> 2.17.1
>
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
  2020-09-03 14:52 ` [oe] " Khem Raj
@ 2020-09-04 22:14   ` Gianfranco
  0 siblings, 0 replies; 7+ messages in thread
From: Gianfranco @ 2020-09-04 22:14 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel, Gianfranco Costamagna, Gianfranco Costamagna

[-- Attachment #1: Type: text/plain, Size: 1842 bytes --]

fixed and reuploaded thanks!

G.

Il giorno gio 3 set 2020 alle ore 16:52 Khem Raj <raj.khem@gmail.com> ha
scritto:

> I am seeing cpprest failure and it seems to be related to this
>
> https://errors.yoctoproject.org/Errors/Details/498414/
>
> Fails with
>
> arm-yoe-linux-gnueabi-g++: error: unrecognized command-line option '-R'
> arm-yoe-linux-gnueabi-g++: error: unrecognized command-line option '-R'
>
> somewhere in log I see.
>
> -R/usr/lib  -lbrotlidec  -R/usr/lib  -lbrotlienc
>
> On Wed, Sep 2, 2020 at 1:03 AM Gianfranco
> <costamagna.gianfranco@gmail.com> wrote:
> >
> > Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> > Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> > ---
> >  .../brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb}               | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb =>
> brotli_1.0.9.bb} (91%)
> >
> > diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > similarity index 91%
> > rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > index 32f855844..642e18f4a 100644
> > --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> > +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> > @@ -7,8 +7,8 @@ LICENSE = "MIT"
> >  LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
> >
> >  SRC_URI = "git://github.com/google/brotli.git"
> > -# tag 1.0.7
> > -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> > +# tag 1.0.9
> > +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
> >  S = "${WORKDIR}/git"
> >
> >  inherit cmake lib_package
> > --
> > 2.17.1
> >
> > 
>

[-- Attachment #2: Type: text/html, Size: 3527 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [oe] [meta-oe][PATCH] brotli: update to 1.0.9
  2020-09-02  8:03 Gianfranco
@ 2020-09-03 14:52 ` Khem Raj
  2020-09-04 22:14   ` Gianfranco
  0 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2020-09-03 14:52 UTC (permalink / raw)
  To: Gianfranco
  Cc: openembeded-devel, Gianfranco Costamagna, Gianfranco Costamagna

I am seeing cpprest failure and it seems to be related to this

https://errors.yoctoproject.org/Errors/Details/498414/

Fails with

arm-yoe-linux-gnueabi-g++: error: unrecognized command-line option '-R'
arm-yoe-linux-gnueabi-g++: error: unrecognized command-line option '-R'

somewhere in log I see.

-R/usr/lib  -lbrotlidec  -R/usr/lib  -lbrotlienc

On Wed, Sep 2, 2020 at 1:03 AM Gianfranco
<costamagna.gianfranco@gmail.com> wrote:
>
> Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
> ---
>  .../brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb}               | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta-oe/recipes-extended/brotli/{brotli_1.0.7.bb => brotli_1.0.9.bb} (91%)
>
> diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> similarity index 91%
> rename from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> rename to meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> index 32f855844..642e18f4a 100644
> --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
> +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb
> @@ -7,8 +7,8 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
>
>  SRC_URI = "git://github.com/google/brotli.git"
> -# tag 1.0.7
> -SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
> +# tag 1.0.9
> +SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
>  S = "${WORKDIR}/git"
>
>  inherit cmake lib_package
> --
> 2.17.1
>
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-05 12:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-05  7:49 [meta-oe][PATCH] brotli: update to 1.0.9 Gianfranco
2020-09-05  7:54 ` [oe] " Khem Raj
2020-09-05 12:10   ` Gianfranco
  -- strict thread matches above, loose matches on Subject: below --
2020-09-04 22:13 Gianfranco
2020-09-05  1:40 ` [oe] " Khem Raj
2020-09-05  7:49   ` Gianfranco
2020-09-02  8:03 Gianfranco
2020-09-03 14:52 ` [oe] " Khem Raj
2020-09-04 22:14   ` Gianfranco

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.