From 033cc47256b12589952da57946495dcc8bea6789 Mon Sep 17 00:00:00 2001 From: dogsheng <960055655@qq.com> Date: Wed, 25 Dec 2019 15:42:52 +0800 Subject: [PATCH] Package init --- Fix-auto-detect-of-bundled-mode-704.patch | 36 +++++++++++++++++++++++ brotli.spec | 7 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Fix-auto-detect-of-bundled-mode-704.patch diff --git a/Fix-auto-detect-of-bundled-mode-704.patch b/Fix-auto-detect-of-bundled-mode-704.patch new file mode 100644 index 0000000..e9174de --- /dev/null +++ b/Fix-auto-detect-of-bundled-mode-704.patch @@ -0,0 +1,36 @@ +From 6eba239a5bb553fd557b7d78f7da8f0059618b9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B8rgen=20Ibsen?= +Date: Thu, 13 Sep 2018 19:31:23 +0200 +Subject: [PATCH 06/30] Fix auto detect of bundled mode (#704) + +Set bundled mode to ON when parent directory is not empty. Due to the +peculiarities of CMake if, comparing an undefined variable to the empty +string is false, so this likely never triggered. +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 99b9258..6f1c5a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,13 +11,13 @@ project(brotli C) + # we'll use the BROTLI_BUNDLED_MODE variable to let them do that; just + # set it to OFF in your project before you add_subdirectory(brotli). + get_directory_property(BROTLI_PARENT_DIRECTORY PARENT_DIRECTORY) +-if(BROTLI_BUNDLED_MODE STREQUAL "") ++if(NOT DEFINED BROTLI_BUNDLED_MODE) + # Bundled mode hasn't been set one way or the other, set the default + # depending on whether or not we are the top-level project. + if(BROTLI_PARENT_DIRECTORY) +- set(BROTLI_BUNDLED_MODE OFF) +- else() + set(BROTLI_BUNDLED_MODE ON) ++ else() ++ set(BROTLI_BUNDLED_MODE OFF) + endif() + endif() + mark_as_advanced(BROTLI_BUNDLED_MODE) +-- +2.19.1 + diff --git a/brotli.spec b/brotli.spec index 6c547ce..e39845f 100644 --- a/brotli.spec +++ b/brotli.spec @@ -1,12 +1,14 @@ Name: brotli Version: 1.0.5 -Release: 2 +Release: 3 Summary: Lossless compression algorithm License: MIT URL: https://github.com/google/brotli Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz +Patch6000: Fix-auto-detect-of-bundled-mode-704.patch + BuildRequires: python2-devel python3-devel gcc-c++ gcc cmake %description @@ -106,5 +108,8 @@ popd %{_mandir}/man3/* %changelog +* Thu Dec 19 2019 openEuler Buildteam - 1.0.5-3 +- fix auto detect of bundled mode + * Thu Sep 26 2019 openEuler Buildteam - 1.0.5-2 - Package init