Skip to content

Commit aa53cb7

Browse files
committed
depends: libX11: Make package headers-only
We're no longer building QT with libX11/XLib, however, libX11/XLib headers are still required for parts of QT. In this commit we add a minimal configure.ac for libX11/XLib that is headers-only. This change allows us to remove all of libX11/XLib's dependencies.
1 parent 9a01ab0 commit aa53cb7

File tree

5 files changed

+12
-69
lines changed

5 files changed

+12
-69
lines changed

depends/packages/libX11.mk

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,18 @@ $(package)_version=1.6.2
33
$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
44
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
55
$(package)_sha256_hash=2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16
6-
$(package)_dependencies=libxcb xtrans xextproto xproto
7-
8-
define $(package)_set_vars
9-
# See libXext for --disable-malloc0returnsnull rationale.
10-
$(package)_config_opts=--disable-xkb --disable-static --disable-malloc0returnsnull
11-
$(package)_config_opts_linux=--with-pic
12-
endef
6+
$(package)_patches=configure.ac
137

148
define $(package)_preprocess_cmds
15-
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
9+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
10+
cp -f $($(package)_patch_dir)/configure.ac .
1611
endef
1712

1813
define $(package)_config_cmds
14+
autoreconf --install --force --verbose && \
1915
$($(package)_autoconf)
2016
endef
2117

22-
define $(package)_build_cmds
23-
$(MAKE)
24-
endef
25-
2618
define $(package)_stage_cmds
27-
$(MAKE) DESTDIR=$($(package)_staging_dir) install
28-
endef
29-
30-
define $(package)_postprocess_cmds
31-
rm lib/*.la
19+
$(MAKE) -C include DESTDIR=$($(package)_staging_dir) install-x11includeHEADERS
3220
endef

depends/packages/packages.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ packages:=boost openssl libevent
33
qt_native_packages = native_protobuf
44
qt_packages = qrencode protobuf zlib
55

6-
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
6+
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 libXext
77

88
rapidcheck_packages = rapidcheck
99

depends/packages/xextproto.mk

Lines changed: 0 additions & 25 deletions
This file was deleted.

depends/packages/xtrans.mk

Lines changed: 0 additions & 26 deletions
This file was deleted.

depends/patches/libX11/configure.ac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
AC_PREREQ([2.60])
2+
AC_INIT([libX11], [1.6.2],
3+
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
4+
AM_INIT_AUTOMAKE([foreign])
5+
AC_CONFIG_FILES([include/Makefile])
6+
AC_OUTPUT

0 commit comments

Comments
 (0)