From: Arvin Schnell Date: Fri, 5 Sep 2025 11:01:15 +0000 (+0200) Subject: - do not link with stub (since boost 1.69) libboost_system since finally removed... X-Git-Tag: v0.13.0~2^2 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d39fcbbc751b32767f11d9043cf910cff71db178;p=thirdparty%2Fsnapper.git - do not link with stub (since boost 1.69) libboost_system since finally removed in boost 1.89 --- diff --git a/.github/workflows/ci-debian.yml b/.github/workflows/ci-debian.yml index 8071971f..e9571e07 100644 --- 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 b9c6712a..e4dac44c 100644 --- 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 ef6c8426..c6772764 100644 --- 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 a51b9936..f92e02e3 100644 --- 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 9c0456a2..2078d7db 100644 --- 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 1235add1..3f777ee9 100644 --- a/dists/debian/control +++ b/dists/debian/control @@ -2,7 +2,7 @@ Source: snapper Priority: optional Section: admin Maintainer: Arvin Schnell -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 9350cbf5..92e18a57 100644 --- 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 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 9350cbf5..92e18a57 100644 --- 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 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 d37df8ea..71ccdf2c 100644 --- 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 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 52c81e52..f55da6ff 100644 --- 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 9165f81d..69ca02f1 100644 --- 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 c03f3731..1aef9160 100644 --- 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 91896cf6..ca780e94 100644 --- 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 94a5cb77..d1c26b23 100644 --- 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 81104bf1..555bc3bf 100644 --- 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 9d102e0f..e395f59d 100644 --- 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