summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/brotli/brotli/838.patch47
-rw-r--r--meta-oe/recipes-extended/brotli/brotli_1.0.9.bb (renamed from meta-oe/recipes-extended/brotli/brotli_1.0.7.bb)7
2 files changed, 51 insertions, 3 deletions
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 @@
1From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
2From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
3Date: Wed, 2 Sep 2020 10:49:49 +0200
4Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
5
6This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
7---
8 scripts/libbrotlicommon.pc.in | 2 +-
9 scripts/libbrotlidec.pc.in | 2 +-
10 scripts/libbrotlienc.pc.in | 2 +-
11 3 files changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
14index 10ca969e..2a8cf7a3 100644
15--- a/scripts/libbrotlicommon.pc.in
16+++ b/scripts/libbrotlicommon.pc.in
17@@ -7,5 +7,5 @@ Name: libbrotlicommon
18 URL: https://github.com/google/brotli
19 Description: Brotli common dictionary library
20 Version: @PACKAGE_VERSION@
21-Libs: -L${libdir} -R${libdir} -lbrotlicommon
22+Libs: -L${libdir} -lbrotlicommon
23 Cflags: -I${includedir}
24diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
25index e7c3124f..6f8ef2e4 100644
26--- a/scripts/libbrotlidec.pc.in
27+++ b/scripts/libbrotlidec.pc.in
28@@ -7,6 +7,6 @@ Name: libbrotlidec
29 URL: https://github.com/google/brotli
30 Description: Brotli decoder library
31 Version: @PACKAGE_VERSION@
32-Libs: -L${libdir} -R${libdir} -lbrotlidec
33+Libs: -L${libdir} -lbrotlidec
34 Requires.private: libbrotlicommon >= 1.0.2
35 Cflags: -I${includedir}
36diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
37index 4dd0811b..2098afe2 100644
38--- a/scripts/libbrotlienc.pc.in
39+++ b/scripts/libbrotlienc.pc.in
40@@ -7,6 +7,6 @@ Name: libbrotlienc
41 URL: https://github.com/google/brotli
42 Description: Brotli encoder library
43 Version: @PACKAGE_VERSION@
44-Libs: -L${libdir} -R${libdir} -lbrotlienc
45+Libs: -L${libdir} -lbrotlienc
46 Requires.private: libbrotlicommon >= 1.0.2
47 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
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"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b" 7LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
8 8
9SRC_URI = "git://github.com/google/brotli.git" 9SRC_URI = "git://github.com/google/brotli.git \
10# tag 1.0.7 10 file://838.patch "
11SRCREV= "d6d98957ca8ccb1ef45922e978bb10efca0ea541" 11# tag 1.0.9
12SRCREV= "e61745a6b7add50d380cfd7d3883dd6c62fc2c71"
12S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
13 14
14inherit cmake lib_package 15inherit cmake lib_package