Skip to content

Commit 65ef45d

Browse files
committed
fix cross/libXt
1 parent e8a5130 commit 65ef45d

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

Diff for: cross/libXt/Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ HOMEPAGE = https://www.x.org
1111
COMMENT = X.Org X11 libXt runtime library.
1212
LICENSE = GPLv2/GPLv3
1313

14+
POST_CONFIGURE_TARGET = libXt_post_configure_target
15+
1416
GNU_CONFIGURE = 1
1517
CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib
1618
CONFIGURE_ARGS += --enable-malloc0returnsnull
1719
CONFIGURE_ARGS += --without-xmlto
1820
CONFIGURE_ARGS += --without-fop
1921
CONFIGURE_ARGS += --disable-static
20-
PATCHES_LEVEL = 1
2122

2223
include ../../mk/spksrc.cross-cc.mk
24+
25+
.PHONY: libXt_post_configure_target
26+
libXt_post_configure_target:
27+
@$(MSG) "Avoid invalid CPPFLAGS (for 32-bit ARM archs) in util folder"
28+
@$(RUN) sed -e 's,^CPPFLAGS =.*,CPPFLAGS =,g' -i.bak util/Makefile

Diff for: cross/libXt/patches/001-fix-xtos_h.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# There is a syntax error affecting gcc < 5 (i.e. DSM 6 builds)
2+
# mismatched parentheses in definition of LONG64
3+
#
4+
--- include/X11/Xtos.h.orig 2024-11-17 04:44:07.000000000 +0000
5+
+++ include/X11/Xtos.h 2025-01-16 06:07:21.651837413 +0000
6+
@@ -64,7 +64,7 @@
7+
defined(__s390x__) || \
8+
(defined(__hppa__) && defined(__LP64__)) || \
9+
defined(__amd64__) || defined(amd64) || \
10+
- defined(__powerpc64__))
11+
+ defined(__powerpc64__)
12+
#define LONG64
13+
#endif
14+

0 commit comments

Comments
 (0)