Bas Couwenberg pushed to branch master at Debian GIS Project / hdf4
Commits: c8b6c612 by Bas Couwenberg at 2025-11-29T19:30:32+01:00 Improve cross building. (Closes: #1121629) Build depend on -for-host variants of the toolchain. Fix build vs host confusion. Always export CC and CXX as the upstream build system wrongly guesses it. - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +libhdf4 (4.3.1-3) UNRELEASED; urgency=medium + + * Team upload. + + [ Helmut Grohne ] + * Improve cross building. (Closes: #1121629) + + Build depend on -for-host variants of the toolchain. + + Fix build vs host confusion. + + Always export CC and CXX as the upstream build system wrongly guesses it. + + -- Bas Couwenberg <[email protected]> Sat, 29 Nov 2025 19:28:54 +0100 + libhdf4 (4.3.1-2) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -8,8 +8,8 @@ Build-Depends: bison, chrpath, debhelper-compat (= 13), flex, - gcc-14 [armhf], - g++-14 [armhf], + gcc-14-for-host [armhf], + g++-14-for-host [armhf], libaec-dev, libjpeg-dev, libtirpc-dev, ===================================== debian/rules ===================================== @@ -13,16 +13,19 @@ include /usr/share/dpkg/pkg-info.mk UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) - export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/tirpc/ export DEB_LDFLAGS_MAINT_APPEND = -ltirpc -ifneq (,$(filter $(DEB_BUILD_ARCH),armhf)) -export CC=gcc-14 -export CXX=g++-14 +ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) +CC=$(DEB_HOST_GNU_TYPE)-gcc-14 +CXX=$(DEB_HOST_GNU_TYPE)-g++-14 endif +# The upstream buildsystem defaults to CC=gcc in cross builds. +include /usr/share/dpkg/buildtools.mk +export CC +export CXX + ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS))) DH_VERBOSE=1 export DH_VERBOSE View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/commit/c8b6c6126635b10cf1d6f0bc98e97a1d7a66aa81 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/commit/c8b6c6126635b10cf1d6f0bc98e97a1d7a66aa81 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
