lfs/BMLFS
1
0
Fork 0
mirror of https://github.com/dslm4515/BMLFS.git synced 2025-08-15 22:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded brotli from 1.0.9 to 1.1.0

Browse Source
This commit is contained in:
dslm4515
2023-11-01 18:24:21 -05:00
parent 6e812734b2
commit d891ab8104
2 changed files with 6 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build-scripts/brotli.build
View File

@ -1,7 +1,7 @@
#! /bin/bash
# Brotli
# Source: https://github.com/google/brotli/archive/v1.0.9/brotli-1.0.9.tar.gz
# Source: https://github.com/google/brotli/archive/v1.1.0/brotli-1.1.0.tar.gz
#
# $BUILD = Directory to temporarily install
# $PKGS = Directory to store built packages
@ -16,8 +16,8 @@ export CFLAGS="-march=native -mtune=native -pipe "
export CFLAGS+="-O2 -fno-lto "
#export LDFLAGS="-flto=4 -Wl,-O2 -Wl,--as-needed "
patch -Np1 -i ../patches/brotli-void/Revert-Add-runtime-linker-path-to-pkg-config-files.patch &&
sed -i 's@-R..libdir.@@' scripts/*.pc.in &&
#patch -Np1 -i ../patches/brotli-void/Revert-Add-runtime-linker-path-to-pkg-config-files.patch &&
#sed -i 's@-R..libdir.@@' scripts/*.pc.in &&
mkdir out &&
cd out &&
@ -26,11 +26,11 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
..
read -p "Compile?" && make -j2 &&
pushd .. &&
python3 setup.py build &&
pip3 wheel -w dist --no-build-isolation --no-deps --no-cache-dir $PWD
popd &&
sudo -S make DESTDIR=$BUILD install &&
cd ..
sudo -S python3 setup.py install --prefix=/usr --root=${BUILD} &&
sudo -S pip3 install --no-index --find-links=dist --no-cache-dir --no-user Brotli --root=$BUILD
cd $BUILD && sudo -S mkdir -v ${BUILD}/install &&
cat > /tmp/slack-desc << "EOF"
@ -55,5 +55,5 @@ brotli: Homepage: https://github.com/google/brotli/
brotli:
EOF
sudo -S mv -v /tmp/slack-desc install/ &&
sudo -S makepkg -l y -c n $PKGS/brotli-1.0.9-$(uname -m)-mlfs.txz &&
sudo -S makepkg -l y -c n $PKGS/brotli-1.1.0-$PSUFFIX &&
sudo -S rm -rf ${BUILD}/*

47
patches/brotli-void/Revert-Add-runtime-linker-path-to-pkg-config-files.patch
View File

@ -1,47 +0,0 @@
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}