LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

depends: libX11: Make package headers-only

Browse source 
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.
This commit is contained in:
Carl Dong 2019-07-17 16:21:50 -04:00
parent 9a01ab04e1
commit aa53cb7a2f
No known key found for this signature in database
GPG key ID: 0CC52153197991A5
5 changed files with 12 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
depends/packages/libX11.mk
View file

@ -3,30 +3,18 @@ $(package)_version=1.6.2
$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16
$(package)_dependencies=libxcb xtrans xextproto xproto
define $(package)_set_vars
# See libXext for --disable-malloc0returnsnull rationale.
$(package)_config_opts=--disable-xkb --disable-static --disable-malloc0returnsnull
$(package)_config_opts_linux=--with-pic
endef
$(package)_patches=configure.ac
define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
cp -f $($(package)_patch_dir)/configure.ac .
endef
define $(package)_config_cmds
autoreconf --install --force --verbose && \
$($(package)_autoconf)
endef
define $(package)_build_cmds
$(MAKE)
endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef
define $(package)_postprocess_cmds
rm lib/*.la
$(MAKE) -C include DESTDIR=$($(package)_staging_dir) install-x11includeHEADERS
endef

2
depends/packages/packages.mk
View file

@ -3,7 +3,7 @@ packages:=boost openssl libevent
qt_native_packages = native_protobuf
qt_packages = qrencode protobuf zlib
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 libXext
rapidcheck_packages = rapidcheck

25
depends/packages/xextproto.mk
View file

@ -1,25 +0,0 @@
package=xextproto
$(package)_version=7.3.0
$(package)_download_path=https://xorg.freedesktop.org/releases/individual/proto
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0
define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
endef
define $(package)_set_vars
$(package)_config_opts=--disable-shared
endef
define $(package)_config_cmds
$($(package)_autoconf)
endef
define $(package)_build_cmds
$(MAKE)
endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

26
depends/packages/xtrans.mk
View file

@ -1,26 +0,0 @@
package=xtrans
$(package)_version=1.3.4
$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a
$(package)_dependencies=
define $(package)_set_vars
$(package)_config_opts_linux=--disable-docs --without-xmlto --without-fop --without-xsltproc
endef
define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
endef
define $(package)_config_cmds
$($(package)_autoconf)
endef
define $(package)_build_cmds
$(MAKE)
endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

6
depends/patches/libX11/configure.ac Normal file
View file

@ -0,0 +1,6 @@
AC_PREREQ([2.60])
AC_INIT([libX11], [1.6.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_FILES([include/Makefile])
AC_OUTPUT