brotli: Fix broken Libs: in pc file, enable python3 module
This commit is contained in:
Danny Rawlins
parent
b59d2cbc6a
commit
e8fed322d2
@ -24,3 +24,15 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libbrotlicommon.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libbrotlidec.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libbrotlienc.pc
|
||||
drwxr-xr-x root/root usr/lib/python3.9/
|
||||
drwxr-xr-x root/root usr/lib/python3.9/site-packages/
|
||||
drwxr-xr-x root/root usr/lib/python3.9/site-packages/Brotli-1.0.9-py3.9.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/Brotli-1.0.9-py3.9.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/Brotli-1.0.9-py3.9.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/Brotli-1.0.9-py3.9.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/Brotli-1.0.9-py3.9.egg-info/top_level.txt
|
||||
drwxr-xr-x root/root usr/lib/python3.9/site-packages/__pycache__/
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/__pycache__/brotli.cpython-39.opt-1.pyc
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/__pycache__/brotli.cpython-39.pyc
|
||||
-rwxr-xr-x root/root usr/lib/python3.9/site-packages/_brotli.cpython-39-x86_64-linux-gnu.so
|
||||
-rw-r--r-- root/root usr/lib/python3.9/site-packages/brotli.py
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/TIsdoKdINUhanS3/WUS4VdzCqx59r6Jeq4T4jsO/dKu9isYgw+ScIw7GklbGskXYfDBpIygwD7TuR7DECx8LQQ=
|
||||
SHA256 (Pkgfile) = e748ef590d8224baa209ccb768b351b41691e180c389ae7e2278c9a63d3be1b8
|
||||
SHA256 (.footprint) = 797a32a99f0d05e33eb7b61c15a7c9ac4c73daa79e8246abe13de8f8dee640cf
|
||||
RWSE3ohX2g5d/Vm/Rj3USBFtz++lqWVqBLorRW+lXEdwNyKxLkrL//O93wJW8FFmT+Wdr0SBPKm5MOIEjSsGWmY5kBfAYRB80g0=
|
||||
SHA256 (Pkgfile) = a9d0908aecf35292afea7baeab5c954fcf59f5fb68f0ff91af3af27bb981e337
|
||||
SHA256 (.footprint) = deefc5ca7028d6281be0ef807a4a5795450103a1ccea66fd7107fc19a364e400
|
||||
SHA256 (brotli-v1.0.9.tar.gz) = f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
|
||||
SHA256 (runtime-linker-path.patch) = 0b1c8045b4fa745e620b5c1a75377f9cda839fbb07c90bf3358b583866f063ee
|
||||
|
||||
@ -5,14 +5,25 @@
|
||||
|
||||
name=brotli
|
||||
version=1.0.9
|
||||
release=1
|
||||
source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz)
|
||||
release=2
|
||||
source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz
|
||||
runtime-linker-path.patch)
|
||||
|
||||
build() {
|
||||
cmake -S$name-$version -Bbuild -GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX="/usr" \
|
||||
-DCMAKE_INSTALL_LIBDIR="/usr/lib"
|
||||
# https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc
|
||||
patch -d $name-$version -p1 -i $SRC/runtime-linker-path.patch
|
||||
|
||||
cmake -S $name-$version -B build -G Ninja \
|
||||
-D CMAKE_BUILD_TYPE=Release \
|
||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
-D CMAKE_INSTALL_LIBDIR=lib \
|
||||
-D BUILD_SHARED_LIBS=True
|
||||
|
||||
cmake --build build
|
||||
DESTDIR=$PKG cmake --install build
|
||||
|
||||
cd $name-$version
|
||||
/usr/bin/python3 setup.py build
|
||||
/usr/bin/python3 setup.py install \
|
||||
--prefix=/usr --root=$PKG --optimize=1
|
||||
}
|
||||
|
||||
48
brotli/runtime-linker-path.patch
Normal file
48
brotli/runtime-linker-path.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001
|
||||
From: Eugene Kliuchnikov <eustas.ru@gmail.com>
|
||||
Date: Wed, 2 Sep 2020 11:38:26 +0200
|
||||
Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
|
||||
(#838)
|
||||
|
||||
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}
|
||||
Loading…
Reference in New Issue
Block a user