- do not link with stub (since boost 1.69) libboost_system since finally removed...

diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml
index 8071971f1e3981c44f55020e1f854829af2ad9ec..e9571e07fa440c7c604865b3ebacb933072ee620 100644 (file)
--- a/.github/workflows/ci-debian.yml
+++ b/.github/workflows/ci-debian.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: apt-get update && apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl g++ gettext libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev locales-all make ncurses-dev xsltproc xz-utils
+      run: apt-get update && apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl g++ gettext libboost-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev locales-all make ncurses-dev xsltproc xz-utils
 
     - name: List installed packages
       run: apt list --installed | sort

diff --git a/.github/workflows/ci-leap.yml b/.github/workflows/ci-leap.yml
index b9c6712aa6047370e023530d11b2629af2993abf..e4dac44c87c067c86a55d760cb6138d6b255189a 100644 (file)
--- a/.github/workflows/ci-leap.yml
+++ b/.github/workflows/ci-leap.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
+      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale gzip libacl-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
 
     - name: List installed packages
       run: rpm -qa | sort

diff --git a/.github/workflows/ci-tumbleweed.yml b/.github/workflows/ci-tumbleweed.yml
index ef6c84263702ccb5dccf240f866a838198ff529b..c6772764f9b0943cad16620e4642e8f90685d181 100644 (file)
--- a/.github/workflows/ci-tumbleweed.yml
+++ b/.github/workflows/ci-tumbleweed.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale libacl-devel libboost_system-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
+      run: zypper --non-interactive in --no-recommends autoconf automake dbus-1-devel docbook-xsl-stylesheets gcc-c++ gettext-runtime glibc-locale libacl-devel libboost_test-devel libboost_thread-devel libbtrfs-devel libbtrfsutil-devel libjson-c-devel libmount-devel libtool libxml2-devel libxslt make pam-devel xz
 
     - name: List installed packages
       run: rpm -qa | sort

diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
index a51b99366496467a4a72000fd421d1cdb396597e..f92e02e30c5cd2328e4db252c8f1e1cd718ba0e1 100644 (file)
--- a/.github/workflows/ci-ubuntu.yml
+++ b/.github/workflows/ci-ubuntu.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
 
     - name: Install additional packages
-      run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl g++ gettext language-pack-de language-pack-fr language-pack-en libboost-dev libboost-system-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev make ncurses-dev xsltproc xz-utils
+      run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends acl-dev autoconf automake docbook-xsl g++ gettext language-pack-de language-pack-fr language-pack-en libboost-dev libboost-test-dev libboost-thread-dev libbtrfs-dev libdbus-1-dev libjson-c-dev libmount-dev libpam-dev libtool libxml2-dev libz-dev make ncurses-dev xsltproc xz-utils
 
     - name: List installed packages
       run: apt list --installed | sort

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 9c0456a29571ab1c9e846a3cee1ea40e369d0d8b..2078d7db0bc789c6cf0f85af147c4b18e51ab629 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -15,4 +15,4 @@ libdbus_la_SOURCES =                                  \
        DBusMainLoop.cc         DBusMainLoop.h
 
 libdbus_la_LIBADD = $(DBUS_LIBS)
-libdbus_la_LDFLAGS = -lboost_system -lboost_thread
+libdbus_la_LDFLAGS = -lboost_thread

diff --git a/dists/debian/control b/dists/debian/control
index 1235add11b3964be09ee21c2d76f770f5070cee1..3f777ee989b64c47a38d937b8b0c6fc291492646 100644 (file)
--- a/dists/debian/control
+++ b/dists/debian/control
@@ -2,7 +2,7 @@ Source: snapper
 Priority: optional
 Section: admin
 Maintainer: Arvin Schnell <aschnell@suse.com>
-Build-Depends: debhelper (>= 4.1.16), g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 4.1.16), g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl
 Homepage: http://en.opensuse.org/Portal:Snapper
 
 Package: snapper

diff --git a/dists/debian/snapper-Debian.dsc.in.in b/dists/debian/snapper-Debian.dsc.in.in
index 9350cbf57f30b1100e362a6dc56fe4431b16bbba..92e18a576a1d2c509b8e7203b855133e0621c578 100644 (file)
--- a/dists/debian/snapper-Debian.dsc.in.in
+++ b/dists/debian/snapper-Debian.dsc.in.in
@@ -4,7 +4,7 @@ Version: @VERSION@-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
+Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
 #
 # The 'Files' line is generated during 'make package':
 # Files:

diff --git a/dists/debian/snapper-Raspbian.dsc.in.in b/dists/debian/snapper-Raspbian.dsc.in.in
index 9350cbf57f30b1100e362a6dc56fe4431b16bbba..92e18a576a1d2c509b8e7203b855133e0621c578 100644 (file)
--- a/dists/debian/snapper-Raspbian.dsc.in.in
+++ b/dists/debian/snapper-Raspbian.dsc.in.in
@@ -4,7 +4,7 @@ Version: @VERSION@-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
+Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
 #
 # The 'Files' line is generated during 'make package':
 # Files:

diff --git a/dists/debian/snapper-xUbuntu.dsc.in.in b/dists/debian/snapper-xUbuntu.dsc.in.in
index d37df8ead454a058ca62decd5b04869c5b63e096..71ccdf2cd8def54295e6c76e04cdedddbb109fcf 100644 (file)
--- a/dists/debian/snapper-xUbuntu.dsc.in.in
+++ b/dists/debian/snapper-xUbuntu.dsc.in.in
@@ -4,7 +4,7 @@ Version: @VERSION@-1
 Binary: snapper
 Maintainer: Arvin Schnell <aschnell@suse.com>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de, language-pack-fr, ncurses-dev
+Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de, language-pack-fr, ncurses-dev
 #
 # The 'Files' line is generated during 'make package':
 # Files:

diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
index 52c81e522adf0a16da4b252722d1af538b4ea9fe..f55da6ff1c69fa1e9978c77ae9340be916af99f2 100644 (file)
--- a/examples/c++-lib/Makefile.am
+++ b/examples/c++-lib/Makefile.am
@@ -5,7 +5,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)
 
 LDADD = ../../snapper/libsnapper.la
-AM_LDFLAGS = -lboost_system
 
 noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline
 

diff --git a/package/snapper.changes b/package/snapper.changes
index 9165f81d3dec0444127c8e4d863f30ac90591f74..69ca02f1ecbf0856031bc4f9574cd8790c3ab57f 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 05 12:52:07 CEST 2025 - aschnell@suse.com
+
+- do not link with stub libboost_system
+
 -------------------------------------------------------------------
 Tue Sep 02 14:29:41 CEST 2025 - aschnell@suse.com
 

diff --git a/server/Makefile.am b/server/Makefile.am
index c03f37319247b423f0db04f1b6416e9fff8267d7..1aef91606db2313b42fac4e74b336930e971cae9 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -16,4 +16,4 @@ snapperd_SOURCES =                                    \
        FilesTransferTask.cc    FilesTransferTask.h
 
 snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
-snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
+snapperd_LDFLAGS = -lboost_thread -lpthread

diff --git a/snapper.spec.in b/snapper.spec.in
index 91896cf6685522bb3d2625a733971415d5930e43..ca780e944e647c097ec4b90cc63923daed110f0f 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -43,7 +43,6 @@ Group:          System/Packages
 URL:            http://snapper.io/
 Source:         snapper-%{version}.tar.xz
 %if 0%{?suse_version}
-BuildRequires:  libboost_system-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  libboost_test-devel
 %else

diff --git a/snapper/Makefile.am b/snapper/Makefile.am
index 94a5cb77796bf6588b48c77d7beeafd7c29e1959..d1c26b23a531783501fc40feddcc26381735a30d 100644 (file)
--- a/snapper/Makefile.am
+++ b/snapper/Makefile.am
@@ -71,7 +71,7 @@ endif
 
 libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS)
 libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
-libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS)
+libsnapper_la_LIBADD = -lboost_thread $(XML2_LIBS) -lacl $(ZLIB_LIBS)
 if ENABLE_ROLLBACK
 libsnapper_la_LIBADD += -lmount
 endif

diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
index 81104bf1b74f876bda5ecd6e8a471eac2ec8afc7..555bc3bfc47a1bc2e47ab5e0a96379abfe1bcfaa 100644 (file)
--- a/testsuite-cmp/Makefile.am
+++ b/testsuite-cmp/Makefile.am
@@ -3,7 +3,6 @@
 #
 
 AM_CPPFLAGS = -I$(top_srcdir)
-AM_LDFLAGS = -lboost_system
 
 LDADD = ../snapper/libsnapper.la
 

diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
index 9d102e0fdebcef6e694cc4e1a3ed4ea499432cdd..e395f59d652cc325cb964872fcd40596c0cca29f 100644 (file)
--- a/zypp-plugin/Makefile.am
+++ b/zypp-plugin/Makefile.am
@@ -33,7 +33,6 @@ forwarding_zypp_plugin_SOURCES = \
 forwarding_zypp_plugin_LDADD = \
        ../snapper/libsnapper.la \
        ../stomp/libstomp.la \
-       -lboost_system \
        -lpthread
 
 TESTS = solvable-matcher.test