diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openembedded/meta-oe/recipes-extended/brotli | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/brotli')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/brotli/brotli/838.patch | 48 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb (renamed from meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb) | 9 |
2 files changed, 53 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli/838.patch b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli/838.patch new file mode 100644 index 000000000..98b888760 --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb index 70dbcaffb..0038ba74d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb @@ -1,14 +1,15 @@ SUMMARY = "Lossless compression library and tool" -DESCRIPTIOM = "Brotli is a generic-purpose lossless compression algorithm \ +DESCRIPTION = "Brotli is a generic-purpose lossless compression algorithm \ that it is similar in speed to deflate but offers more dense compression." HOMEPAGE = "https://github.com/google/brotli" 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 |