summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch89
-rw-r--r--meta-oe/recipes-support/snapper/snapper_0.12.2.bb4
2 files changed, 92 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch b/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
new file mode 100644
index 0000000000..a6598b5635
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
@@ -0,0 +1,89 @@
1From c33e7707da86a23c4ad7e2451ddb04df419d6412 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 31 Aug 2025 00:13:07 -0700
4Subject: [PATCH] Fix build with boost 1.89
5
6boost 1.89+ does not have boost system lib anymore all needed functions
7are now in header
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 dbus/Makefile.am | 2 +-
14 examples/c++-lib/Makefile.am | 1 -
15 server/Makefile.am | 2 +-
16 snapper/Makefile.am | 2 +-
17 testsuite-cmp/Makefile.am | 1 -
18 zypp-plugin/Makefile.am | 1 -
19 6 files changed, 3 insertions(+), 6 deletions(-)
20
21diff --git a/dbus/Makefile.am b/dbus/Makefile.am
22index 9c0456a..2078d7d 100644
23--- a/dbus/Makefile.am
24+++ b/dbus/Makefile.am
25@@ -15,4 +15,4 @@ libdbus_la_SOURCES = \
26 DBusMainLoop.cc DBusMainLoop.h
27
28 libdbus_la_LIBADD = $(DBUS_LIBS)
29-libdbus_la_LDFLAGS = -lboost_system -lboost_thread
30+libdbus_la_LDFLAGS = -lboost_thread
31diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
32index 52c81e5..f55da6f 100644
33--- a/examples/c++-lib/Makefile.am
34+++ b/examples/c++-lib/Makefile.am
35@@ -5,7 +5,6 @@
36 AM_CPPFLAGS = -I$(top_srcdir)
37
38 LDADD = ../../snapper/libsnapper.la
39-AM_LDFLAGS = -lboost_system
40
41 noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline
42
43diff --git a/server/Makefile.am b/server/Makefile.am
44index c03f373..1aef916 100644
45--- a/server/Makefile.am
46+++ b/server/Makefile.am
47@@ -16,4 +16,4 @@ snapperd_SOURCES = \
48 FilesTransferTask.cc FilesTransferTask.h
49
50 snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
51-snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
52+snapperd_LDFLAGS = -lboost_thread -lpthread
53diff --git a/snapper/Makefile.am b/snapper/Makefile.am
54index b0fe55c..d75599f 100644
55--- a/snapper/Makefile.am
56+++ b/snapper/Makefile.am
57@@ -71,7 +71,7 @@ endif
58
59 libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS)
60 libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
61-libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS)
62+libsnapper_la_LIBADD = -lboost_thread $(XML2_LIBS) -lacl $(ZLIB_LIBS)
63 if ENABLE_ROLLBACK
64 libsnapper_la_LIBADD += -lmount
65 endif
66diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
67index 81104bf..555bc3b 100644
68--- a/testsuite-cmp/Makefile.am
69+++ b/testsuite-cmp/Makefile.am
70@@ -3,7 +3,6 @@
71 #
72
73 AM_CPPFLAGS = -I$(top_srcdir)
74-AM_LDFLAGS = -lboost_system
75
76 LDADD = ../snapper/libsnapper.la
77
78diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
79index 9d102e0..e395f59 100644
80--- a/zypp-plugin/Makefile.am
81+++ b/zypp-plugin/Makefile.am
82@@ -33,7 +33,6 @@ forwarding_zypp_plugin_SOURCES = \
83 forwarding_zypp_plugin_LDADD = \
84 ../snapper/libsnapper.la \
85 ../stomp/libstomp.la \
86- -lboost_system \
87 -lpthread
88
89 TESTS = solvable-matcher.test
diff --git a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb b/meta-oe/recipes-support/snapper/snapper_0.12.2.bb
index cdbe155d59..981ca84c13 100644
--- a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb
+++ b/meta-oe/recipes-support/snapper/snapper_0.12.2.bb
@@ -8,7 +8,9 @@ DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib
8# Build separation is slightly broken 8# Build separation is slightly broken
9inherit autotools-brokensep pkgconfig gettext 9inherit autotools-brokensep pkgconfig gettext
10 10
11SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master" 11SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
12 file://0001-Fix-build-with-boost-1.89.patch \
13 "
12SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7" 14SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7"
13 15
14EXTRA_OECONF += "--disable-zypp" 16EXTRA_OECONF += "--disable-zypp"