Skip to content

Commit

Permalink
feat: fix gcc version detection, remove t64
Browse files Browse the repository at this point in the history
  • Loading branch information
YukariChiba authored and Zeno-sole committed Dec 26, 2024
1 parent 21457cc commit 9734a6a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
boost1.83 (1.83.0-4deepin1) unstable; urgency=medium

* fix gcc version detection
* remove t64

-- Chang Yang <[email protected]> Thu, 26 Dec 2024 10:11:17 +0800

boost1.83 (1.83.0-4) unstable; urgency=medium

[ Samuel Thibault ]
Expand Down
7 changes: 2 additions & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,7 @@ Description: atomic data types, operations, and memory ordering constraints
locking.
Conflicts: libboost-atomic1.53-dev, libboost-atomic1.54-dev, libboost-atomic1.55-dev, libboost-atomic1.57-dev, libboost-atomic1.58-dev, libboost-atomic1.60-dev, libboost-atomic1.61-dev, libboost-atomic1.62-dev, libboost-atomic1.63-dev, libboost-atomic1.65-dev, libboost-atomic1.67-dev, libboost-atomic1.70-dev, libboost-atomic1.71-dev, libboost-atomic1.74-dev, libboost-atomic1.80-dev, libboost-atomic1.81-dev

Package: libboost-chrono1.83.0t64
Provides: ${t64:Provides}
Replaces: libboost-chrono1.83.0
Breaks: libboost-chrono1.83.0 (<< ${source:Version})
Package: libboost-chrono1.83.0
Homepage: http://www.boost.org/libs/chrono/
Architecture: any
Multi-Arch: same
Expand Down Expand Up @@ -272,7 +269,7 @@ Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
libboost1.83-dev (= ${binary:Version}),
libboost-chrono1.83.0t64 (= ${binary:Version})
libboost-chrono1.83.0 (= ${binary:Version})
Conflicts: libboost-chrono1.48-dev, libboost-chrono1.49-dev, libboost-chrono1.50-dev, libboost-chrono1.52-dev, libboost-chrono1.53-dev, libboost-chrono1.54-dev, libboost-chrono1.55-dev, libboost-chrono1.57-dev, libboost-chrono1.58-dev, libboost-chrono1.60-dev, libboost-chrono1.61-dev, libboost-chrono1.62-dev, libboost-chrono1.63-dev, libboost-chrono1.65-dev, libboost-chrono1.67-dev, libboost-chrono1.70-dev, libboost-chrono1.71-dev, libboost-chrono1.74-dev, libboost-chrono1.80-dev, libboost-chrono1.81-dev
Description: C++ representation of time duration, time point, and clocks
This package forms part of the Boost C++ Libraries collection.
Expand Down
5 changes: 2 additions & 3 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ boost_suffixes = $(if $(boost_suffixes_$(1)), $(boost_suffixes_$(1)),"")
mk_base_name = usr/lib/$(DEB_HOST_MULTIARCH)/libboost_$(subst -,_,$(1))$(2)
mk_cmake_name = usr/lib/$(DEB_HOST_MULTIARCH)/cmake/boost_$(subst -,_,$(1))-$(SOVERSION)/

t64_suffix_chrono = t64
# Input: component
# Return: package name for shared library or development
mk_pkg_lib = libboost-$(1)$(SOVERSION)$(t64_suffix_$(1))
mk_pkg_lib = libboost-$(1)$(SOVERSION)
mk_pkg_dev = libboost-$(1)$(PKGVERSION)-dev
# Helpers to generate debhelper input filenames.
# Input: component
Expand Down Expand Up @@ -320,7 +319,7 @@ ifeq ($(BUILD_NUMPY), yes)
endif

override_dh_gencontrol:
dh_gencontrol -- -V'gxx:major=$(shell dpkg-query -f '$${version}' -W g++ | sed 's/.*://;s/\..*//')'
dh_gencontrol -- -V'gxx:major=$(shell g++ -dumpversion)'

$(b2):
cd tools/build && bison -y -d -o src/engine/jamgram.cpp src/engine/jamgram.y
Expand Down

0 comments on commit 9734a6a

Please sign in to comment.