4:57 a.m.
commit 7f7c325e15f9bfd78ad62dbaa2cc5686d6a3b48c
Author: qvint <dotqvint(a)gmail.com>
Date: Thu Sep 10 16:25:26 2020 +0300
Remove bundlepylibs and clang toggles
They don't work anyway
chromium-freeworld.spec | 70 +------------------------------------------------
1 file changed, 1 insertion(+), 69 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index e68f8df..711447d 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -16,22 +16,10 @@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
-# Fedora's Python 2 stack is being removed, we use the bundled Python libraries
-# This can be revisited once we upgrade to Python 3
-%global bundlepylibs 1
-%if 0%{bundlepylibs}
-%bcond_with system_ply
-%else
-%bcond_without system_ply
-%endif
#Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
%bcond_without system_harfbuzz
# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
%bcond_without system_libxml2
-
-# Clang toggle
-%global clang 0
-
# Allow testing whether icu can be unbundled
# A patch fix building so enabled by default for Fedora 30
# Need icu version >= 64
@@ -97,11 +85,7 @@ Source15: LICENSE
########################################################################################
#Compiler settings
# Make sure we don't encounter any bug
-%if %{clang}
-BuildRequires: clang, llvm, lld
-%else
BuildRequires: gcc-c++
-%endif
# Basic tools and libraries needed for building
BuildRequires: ninja-build, nodejs, bison, gperf, hwdata
BuildRequires: libgcc, glibc, libatomic
@@ -127,25 +111,7 @@ BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server)
%endif
-
-#Python stuffs
-%if 0%{?bundlepylibs}
-
-# Using bundled bits, do nothing.
-#This is needed for remove_bundled_libraries.py
BuildRequires: /usr/bin/python2
-
-%else
-BuildRequires: python2-rpm-macros
-BuildRequires: python2-beautifulsoup4
-BuildRequires: python2-lxml
-BuildRequires: python2-html5lib
-BuildRequires: python2-markupsafe
-Buildrequires: python2-six
-%if %{with system_ply}
-BuildRequires: python2-ply
-%endif
-%endif
BuildRequires: python2-setuptools
%if %{with system_re2}
BuildRequires: re2-devel
@@ -304,10 +270,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE
'1s=^#! */usr/bin/\(pyt
third_party/catapult \
third_party/catapult/common/py_vulcanize/third_party/rcssmin \
third_party/catapult/common/py_vulcanize/third_party/rjsmin \
-%if 0%{?bundlepylibs}
third_party/catapult/third_party/beautifulsoup4 \
third_party/catapult/third_party/html5lib-python \
-%endif
third_party/catapult/third_party/polymer \
third_party/catapult/third_party/six \
third_party/catapult/tracing/third_party/d3 \
@@ -389,9 +353,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE
'1s=^#! */usr/bin/\(pyt
third_party/lss \
third_party/lzma_sdk \
third_party/mako \
-%if 0%{?bundlepylibs}
third_party/markupsafe \
-%endif
third_party/mesa \
third_party/metrics_proto \
%if %{ozone}
@@ -423,9 +385,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE
'1s=^#! */usr/bin/\(pyt
third_party/pdfium/third_party/skia_shared \
third_party/perfetto \
third_party/pffft \
-%if !%{with system_ply}
third_party/ply \
-%endif
third_party/polymer \
third_party/private-join-and-compute \
third_party/protobuf \
@@ -523,15 +483,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE
'1s=^#! */usr/bin/\(pyt
sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' \
services/device/public/cpp/usb/BUILD.gn
-%if !0%{?bundlepylibs}
-rmdir third_party/markupsafe
-ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
-%if %{with system_ply}
-rmdir third_party/ply
-ln -s %{python2_sitelib}/ply third_party/ply
-%endif
-%endif
-
# Fix the path to nodejs binary
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
@@ -541,17 +492,6 @@ ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
ulimit -n 2048
#export compilar variables
-
-%if %{clang}
-
-export AR=llvm-ar NM=llvm-nm AS=llvm-as
-export CC=clang CXX=clang++
-
-# Add required compiler flags here
-export CXXFLAGS="$CXXFLAGS -Wno-unknown-warning-option"
-export CFLAGS="$CFLAGS -Wno-unknown-warning-option"
-
-%else
export AR=ar NM=nm AS=as
export CC=gcc CXX=g++
export CXXFLAGS="$CXXFLAGS -fpermissive"
@@ -564,8 +504,6 @@ export CXXFLAGS="$CXXFLAGS -w"
export CFLAGS="$CFLAGS -g0"
export CXXFLAGS="$CXXFLAGS -g0"
%endif
-#end compiler part
-%endif
gn_args=(
is_debug=false
@@ -617,14 +555,7 @@ gn_args+=(
gn_args+=(
-%if %{clang}
- is_clang=true
- 'clang_base_path="/usr"'
- clang_use_chrome_plugins=false
- use_lld=true
-%else
is_clang=false
-%endif
)
#Pipewire
@@ -769,6 +700,7 @@ appstream-util validate-relax --nonet
"%{buildroot}%{_metainfodir}/%{name}.appda
%changelog
* Thu Sep 10 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
- Update to 85.0.4183.102
+- Remove bundlepylibs and clang toggles
* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-2
- Ship ANGLE libEGL.so and libGLESv2.so (rfbz#5738)