forked from c_cpp/folly
Compare commits
16 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 4bd4072bd0 | |||
| 2dfcfdf3ff | |||
| e58ce0bbc7 | |||
| afd6ac1303 | |||
| cdd1fd1710 | |||
| e7360890fc | |||
| 7d757ec290 | |||
| 57807645e0 | |||
| 321b4b41e5 | |||
| 4bbc298a4b | |||
| d388adf163 | |||
| 534ad830cb | |||
| 0e2273d9f8 | |||
| eddf4573d5 | |||
| 6ee8b7688d | |||
| 0ce682d4be |
22
arm.diff
Normal file
22
arm.diff
Normal file
@@ -0,0 +1,22 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2023-11-01 16:15:17.230309534 +0100
|
||||
References: https://sourceware.org/bugzilla/show_bug.cgi?id=31021
|
||||
|
||||
---
|
||||
folly/memcpy.S | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
Index: folly-2023.10.30.00/folly/memcpy.S
|
||||
===================================================================
|
||||
--- folly-2023.10.30.00.orig/folly/memcpy.S
|
||||
+++ folly-2023.10.30.00/folly/memcpy.S
|
||||
@@ -288,5 +288,9 @@ __folly_memcpy:
|
||||
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
+#ifdef __arm__
|
||||
+ .section .note.GNU-stack,"",%progbits
|
||||
+#else
|
||||
.section .note.GNU-stack,"",@progbits
|
||||
#endif
|
||||
+#endif
|
||||
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,36 +0,0 @@
|
||||
From: Matthias Gerstner <matthias.gerstner@suse.com>
|
||||
Date: Mon Jan 31 08:53:38 UTC 2022
|
||||
|
||||
Add unconditional section markers to assembler units to avoid the library
|
||||
getting an executable stack.
|
||||
|
||||
Index: folly-2022.01.24.00/folly/memset.S
|
||||
===================================================================
|
||||
--- folly-2022.01.24.00.orig/folly/memset.S
|
||||
+++ folly-2022.01.24.00/folly/memset.S
|
||||
@@ -18,6 +18,10 @@
|
||||
|
||||
#define LABEL(x) .L##x
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
.text
|
||||
.p2align 5, 0x90
|
||||
.global __folly_memset
|
||||
Index: folly-2022.01.24.00/folly/memcpy.S
|
||||
===================================================================
|
||||
--- folly-2022.01.24.00.orig/folly/memcpy.S
|
||||
+++ folly-2022.01.24.00/folly/memcpy.S
|
||||
@@ -70,6 +70,10 @@
|
||||
* @author Logan Evans <lpe@fb.com>
|
||||
*/
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
#if defined(__AVX2__)
|
||||
|
||||
// This threshold is half of L1 cache on a Skylake machine, which means that
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d83e364dd210d04afc345f6def27f22efed2ed4bad32e94dd8b3af51e45654b0
|
||||
size 3550981
|
||||
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,80 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Update to release 2024.02.12.00
|
||||
* No changelog was provided
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 25 19:18:35 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 2023.11.20.00:
|
||||
* Automated release from TagIt
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 1 13:28:43 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 2023.10.30
|
||||
* No changelog was provided
|
||||
- Add arm.diff to unbreak ARMv7 build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 5 08:10:39 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 2023.05.01
|
||||
* Add support for per-write dynamic Cmsgs
|
||||
* Support dwarf5 version of split dwarf
|
||||
* Add Blake3 support
|
||||
- Disable static gtest and static zstd to unfail build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 20:14:56 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 2023.02.27:
|
||||
* no changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 2 08:16:19 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 2022.12.26:
|
||||
* no changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 18 18:48:05 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 2022.12.12:
|
||||
* no changelog available
|
||||
- drop 0001-Fix-iouring-under-32-bit-linux.patch (upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 27 07:30:14 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to 2022.08.29
|
||||
* No chngelog provided
|
||||
- Delete fix-asm-execstack.patch (merged)
|
||||
- Add 0001-Fix-iouring-under-32-bit-linux.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 7 00:12:44 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Cure rpmlint "E: executable-stack (Badness: 10000)" by
|
||||
reworking fix-asm-execstack.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 24 00:19:35 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 2022.05.23
|
||||
* No changelog provided
|
||||
- Change fix-asm-execstack.patch to use @progbits, not %progbits.
|
||||
- Edit fix-asm-execstack.patch and remove hunk for memcpy.S,
|
||||
because memcpy.S already has had a @progbits line.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 15 15:09:53 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
36
folly.spec
36
folly.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package folly
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,31 +16,34 @@
|
||||
#
|
||||
|
||||
|
||||
%define lname libfolly-v2022_01_24_00
|
||||
%define _lto_cflags %nil
|
||||
%define lname libfolly-v2025_10_06_00
|
||||
Name: folly
|
||||
Version: 2022.01.24.00
|
||||
Version: 2025.10.06.00
|
||||
Release: 0
|
||||
Summary: A C++ utility library
|
||||
License: MIT
|
||||
URL: https://github.com/facebook/folly
|
||||
Source: https://github.com/facebook/folly/releases/download/v%version/folly-v%version.tar.gz
|
||||
Patch1: fix-asm-execstack.patch
|
||||
Patch1: arm.diff
|
||||
Patch2: boost1.89.diff
|
||||
Patch3: glog.diff
|
||||
BuildRequires: binutils-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: cmake
|
||||
BuildRequires: double-conversion-devel
|
||||
BuildRequires: fmt-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gflags-devel-static
|
||||
BuildRequires: glog-devel
|
||||
BuildRequires: fast_float-devel
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: libboost_context-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_program_options-devel
|
||||
BuildRequires: libboost_regex-devel
|
||||
BuildRequires: libboost_system-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
|
||||
# new versioning with x.y.z after 20210528
|
||||
BuildRequires: libdwarf-devel-static
|
||||
@@ -49,17 +52,18 @@ BuildRequires: libdwarf-devel-static >= 20170103
|
||||
%endif
|
||||
BuildRequires: libevent-devel
|
||||
BuildRequires: liblz4-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: libsodium-devel
|
||||
BuildRequires: libunwind-devel
|
||||
BuildRequires: liburing-devel
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: libzstd-devel-static
|
||||
BuildRequires: lzlib-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: snappy-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel-static
|
||||
# BE arches
|
||||
ExcludeArch: %mips ppc64 s390 s390x %sparc
|
||||
|
||||
%description
|
||||
Folly is a C++ utility library developed at Facebook.
|
||||
@@ -87,15 +91,15 @@ Development files library for folly, a C++ utility library.
|
||||
# Since its introduction for ABI purposes, PACKAGE_VERSION was never
|
||||
# again modified *sigh*
|
||||
#
|
||||
%cmake -DCMAKE_CXX_FLAGS="%optflags -ffat-lto-objects" \
|
||||
-DBUILD_SHARED_LIBS:BOOL=ON -DPACKAGE_VERSION="v%version"
|
||||
%cmake -DCMAKE_CXX_FLAGS="%optflags -ffat-lto-objects -fPIC" \
|
||||
-DBUILD_SHARED_LIBS:BOOL=ON -DPACKAGE_VERSION="v%version" \
|
||||
-DCMAKE_LIBRARY_ARCHITECTURE="%_target_cpu"
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets -n %lname
|
||||
|
||||
%files -n %lname
|
||||
%_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