Skip to content

Commit

Permalink
fix: fix 32-bit glibc build post dpkg >= 1.22.5
Browse files Browse the repository at this point in the history
Unset -U_FILE_OFFSET_BITS -U_TIME_BITS to fix build.

From Debian: 2.37-16:

  [ Aurelien Jarno ]

  debian/rules.d/build.mk: present glibc with a compiler that does not
  default to -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64, as upstream doesn't
  support this configuration. This has the consequence of hiding real issues
  found by the testsuite, but there is a consensus that this is the way to
  go for now. Thanks to Helmut Grohne for the hint and starting the
  discussion.  Closes: #1068251 (Debian).

Signed-off-by: Mingcong Bai <baimingcong@uniontech.com>
  • Loading branch information
MingcongBai authored and Zeno-sole committed Sep 6, 2024
1 parent 2001175 commit 2942687
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
glibc (2.38-6deepin6) unstable; urgency=medium

* Unset -U_FILE_OFFSET_BITS -U_TIME_BITS to fix build.
* From Debian: 2.37-16:

[ Aurelien Jarno ]

debian/rules.d/build.mk: present glibc with a compiler that does not
default to -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64, as upstream doesn't
support this configuration. This has the consequence of hiding real issues
found by the testsuite, but there is a consensus that this is the way to
go for now. Thanks to Helmut Grohne for the hint and starting the
discussion. Closes: #1068251.

-- Mingcong Bai <baimingcong@uniontech.com> Wed, 04 Sep 2024 17:57:12 +0800

glibc (2.38-6deepin5) unstable; urgency=medium

* debian/patches/git-updates.diff: update from upstream stable branch.
Expand Down
2 changes: 1 addition & 1 deletion debian/rules.d/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ endif
echo -n "Build started: " ; date --rfc-2822; \
echo "---------------"; \
cd $(DEB_BUILDDIR) && \
CC="$(call xx,CC)" \
CC="$(call xx,CC) -U_FILE_OFFSET_BITS -U_TIME_BITS" \
CXX=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),:,"$(call xx,CXX)") \
MIG="$(call xx,MIG)" \
AUTOCONF=false \
Expand Down

0 comments on commit 2942687

Please sign in to comment.