forked from pool/folly
Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 4bd4072bd0 |
21
boost1.89.diff
Normal file
21
boost1.89.diff
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
From: Jan Engelhardt <ej@inai.de>
|
||||||
|
Date: 2025-10-07 17:45:10.788536299 +0200
|
||||||
|
|
||||||
|
boost 1.89 no longer has "system".
|
||||||
|
|
||||||
|
---
|
||||||
|
CMake/folly-deps.cmake | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
Index: folly-2025.10.06.00/CMake/folly-deps.cmake
|
||||||
|
===================================================================
|
||||||
|
--- folly-2025.10.06.00.orig/CMake/folly-deps.cmake
|
||||||
|
+++ folly-2025.10.06.00/CMake/folly-deps.cmake
|
||||||
|
@@ -41,7 +41,6 @@ find_package(Boost 1.51.0 MODULE
|
||||||
|
filesystem
|
||||||
|
program_options
|
||||||
|
regex
|
||||||
|
- system
|
||||||
|
thread
|
||||||
|
REQUIRED
|
||||||
|
)
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:e0c8386eea1a317ff17f1edc36c29362db94aeca8689659f1c530ea777779409
|
|
||||||
size 3963621
|
|
||||||
BIN
folly-v2025.10.06.00.tar.gz
LFS
Normal file
BIN
folly-v2025.10.06.00.tar.gz
LFS
Normal file
Binary file not shown.
@@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 7 16:04:20 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Update to release 2025.10.06.00
|
||||||
|
* No changelog was provided
|
||||||
|
- Add boost1.89.diff, glog.diff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Feb 22 22:08:27 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
Thu Feb 22 22:08:27 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
|||||||
23
folly.spec
23
folly.spec
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package folly
|
# spec file for package folly
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -17,31 +17,33 @@
|
|||||||
|
|
||||||
|
|
||||||
%define _lto_cflags %nil
|
%define _lto_cflags %nil
|
||||||
%define lname libfolly-v2024_04_01_00
|
%define lname libfolly-v2025_10_06_00
|
||||||
Name: folly
|
Name: folly
|
||||||
Version: 2024.04.01.00
|
Version: 2025.10.06.00
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A C++ utility library
|
Summary: A C++ utility library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/facebook/folly
|
URL: https://github.com/facebook/folly
|
||||||
Source: https://github.com/facebook/folly/releases/download/v%version/folly-v%version.tar.gz
|
Source: https://github.com/facebook/folly/releases/download/v%version/folly-v%version.tar.gz
|
||||||
Patch1: arm.diff
|
Patch1: arm.diff
|
||||||
|
Patch2: boost1.89.diff
|
||||||
|
Patch3: glog.diff
|
||||||
BuildRequires: binutils-devel
|
BuildRequires: binutils-devel
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
|
BuildRequires: c++_compiler
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: double-conversion-devel
|
BuildRequires: double-conversion-devel
|
||||||
BuildRequires: fmt-devel
|
BuildRequires: fast_float-devel
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: gflags-devel
|
|
||||||
BuildRequires: glog-devel
|
|
||||||
BuildRequires: libaio-devel
|
BuildRequires: libaio-devel
|
||||||
BuildRequires: libboost_context-devel
|
BuildRequires: libboost_context-devel
|
||||||
BuildRequires: libboost_filesystem-devel
|
BuildRequires: libboost_filesystem-devel
|
||||||
BuildRequires: libboost_program_options-devel
|
BuildRequires: libboost_program_options-devel
|
||||||
BuildRequires: libboost_regex-devel
|
BuildRequires: libboost_regex-devel
|
||||||
BuildRequires: libboost_system-devel
|
|
||||||
BuildRequires: libboost_thread-devel
|
BuildRequires: libboost_thread-devel
|
||||||
BuildRequires: libbz2-devel
|
BuildRequires: pkgconfig(bzip2)
|
||||||
|
BuildRequires: pkgconfig(fmt)
|
||||||
|
BuildRequires: pkgconfig(gflags)
|
||||||
|
BuildRequires: pkgconfig(libglog)
|
||||||
%if 0%{?suse_version} >= 1550
|
%if 0%{?suse_version} >= 1550
|
||||||
# new versioning with x.y.z after 20210528
|
# new versioning with x.y.z after 20210528
|
||||||
BuildRequires: libdwarf-devel-static
|
BuildRequires: libdwarf-devel-static
|
||||||
@@ -97,8 +99,7 @@ Development files library for folly, a C++ utility library.
|
|||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
|
||||||
%post -n %lname -p /sbin/ldconfig
|
%ldconfig_scriptlets -n %lname
|
||||||
%postun -n %lname -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%files -n %lname
|
%files -n %lname
|
||||||
%_libdir/libfolly*.so.*
|
%_libdir/libfolly*.so.*
|
||||||
|
|||||||
25
glog.diff
Normal file
25
glog.diff
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
From: Jan Engelhardt <ej@inai.de>
|
||||||
|
Date: 2025-10-07 18:02:43.480497231 +0200
|
||||||
|
|
||||||
|
```
|
||||||
|
#error <glog/vlog_is_on.h> was not included correctly. See the documentation
|
||||||
|
#for how to consume the library.
|
||||||
|
```
|
||||||
|
|
||||||
|
Workaround that.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
Index: folly-2025.10.06.00/CMakeLists.txt
|
||||||
|
===================================================================
|
||||||
|
--- folly-2025.10.06.00.orig/CMakeLists.txt
|
||||||
|
+++ folly-2025.10.06.00/CMakeLists.txt
|
||||||
|
@@ -59,6 +59,7 @@ set(BIN_INSTALL_DIR bin CACHE STRING
|
||||||
|
set(CMAKE_INSTALL_DIR lib/cmake/folly CACHE STRING
|
||||||
|
"The subdirectory where CMake package config files should be installed")
|
||||||
|
|
||||||
|
+add_definitions(-DGLOG_USE_GLOG_EXPORT=1 -DGOOGLE_GLOG_IS_A_DLL=1)
|
||||||
|
option(BUILD_SHARED_LIBS
|
||||||
|
"If enabled, build folly as a shared library. \
|
||||||
|
This is generally discouraged, since folly does not commit to having \
|
||||||
Reference in New Issue
Block a user