Merge pull request #38 from DeckerSU/static-dev

v0.7.1-beta3: static-dev -> static

Author: DeckerSU

README.md

@@ -42,7 +42,7 @@ Install dependencies:
 sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools libtinfo5 xorriso
 ```
 
-Place prepared SDK file `Xcode-11.3.1-11C505-extracted-SDK-with-libcxx-headers.tar.gz` in repo root, use `build-mac-cross.sh` script to build.
+Place prepared SDK file `Xcode-12.1-12A7403-extracted-SDK-with-libcxx-headers.tar.gz` in repo root, use `build-mac-cross.sh` script to build.
 
 #### OSX (Native)
 Ensure you have [brew](https://brew.sh) and Command Line Tools installed.

build-aux/m4/bitcoin_qt.m4

@@ -3,11 +3,11 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 7)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2021)
+define(_COPYRIGHT_YEAR, 2022)
 define(_COPYRIGHT_HOLDERS, "The %s developers")
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION, "Ocean and Decker")
 

configure.ac

@@ -124,6 +124,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
             -e 's|@no_wallet@|$(NO_WALLET)|' \
             -e 's|@no_upnp@|$(NO_UPNP)|' \
             -e 's|@debug@|$(DEBUG)|' \
+            -e 's|@cross_toolchain_path@|$(toolchain_path)|' \
             $< > $@
 	$(AT)touch $@
 
@@ -157,7 +158,7 @@ install: check-packages $(host_prefix)/share/config.site
 download-one: check-sources $(all_sources)
 
 download-osx:
-	@$(MAKE) -s HOST=x86_64-apple-darwin18 download-one
+	@$(MAKE) -s HOST=x86_64-apple-darwin19 download-one
 download-linux:
 	@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
 download-win:

depends/Makefile

@@ -1,5 +1,5 @@
-build_darwin_CC:=$(shell xcrun -f clang) --sysroot $(shell xcrun --show-sdk-path)
-build_darwin_CXX:=$(shell xcrun -f clang++) --sysroot $(shell xcrun --show-sdk-path)
+build_darwin_CC:=$(shell xcrun -f clang) -isysroot$(shell xcrun --show-sdk-path)
+build_darwin_CXX:=$(shell xcrun -f clang++) -isysroot$(shell xcrun --show-sdk-path)
 build_darwin_AR:=$(shell xcrun -f ar)
 build_darwin_RANLIB:=$(shell xcrun -f ranlib)
 build_darwin_STRIP:=$(shell xcrun -f strip)
@@ -10,8 +10,8 @@ build_darwin_SHA256SUM=shasum -a 256
 build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
 
 #darwin host on darwin builder. overrides darwin host preferences.
-darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --show-sdk-path)
-darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ --sysroot $(shell xcrun --show-sdk-path)
+darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -isysroot$(shell xcrun --show-sdk-path)
+darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ -isysroot$(shell xcrun --show-sdk-path)
 darwin_AR:=$(shell xcrun -f ar)
 darwin_RANLIB:=$(shell xcrun -f ranlib)
 darwin_STRIP:=$(shell xcrun -f strip)

depends/builders/darwin.mk

@@ -1,6 +1,7 @@
 depends_prefix="`dirname ${ac_site_file}`/.."
 
 cross_compiling=maybe
+cross_toolchain_path=@cross_toolchain_path@
 host_alias=@HOST@
 ac_tool_prefix=${host_alias}-
 

depends/config.site.in

@@ -1,11 +1,53 @@
-OSX_MIN_VERSION=10.12
-OSX_SDK_VERSION=10.15.1
-XCODE_VERSION=11.3.1
-XCODE_BUILD_ID=11C505
-LD64_VERSION=530
+OSX_MIN_VERSION=10.15
+OSX_SDK_VERSION=10.15.6
+XCODE_VERSION=12.1
+XCODE_BUILD_ID=12A7403
+LD64_VERSION=609
 
 OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers
 
+darwin_native_binutils=native_cctools
+
+ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
+# FORCE_USE_SYSTEM_CLANG is empty, so we use our depends-managed, pinned clang
+# from llvm.org
+
+# Clang is a dependency of native_cctools when FORCE_USE_SYSTEM_CLANG is empty
+darwin_native_toolchain=native_cctools
+
+clang_prog=$(build_prefix)/bin/clang
+clangxx_prog=$(clang_prog)++
+
+clang_resource_dir=$(build_prefix)/lib/clang/$(native_clang_version)
+else
+# FORCE_USE_SYSTEM_CLANG is non-empty, so we use the clang from the user's
+# system
+
+darwin_native_toolchain=
+
+# We can't just use $(shell command -v clang) because GNU Make handles builtins
+# in a special way and doesn't know that `command` is a POSIX-standard builtin
+# prior to 1af314465e5dfe3e8baa839a32a72e83c04f26ef, first released in v4.2.90.
+# At the time of writing, GNU Make v4.2.1 is still being used in supported
+# distro releases.
+#
+# Source: https://lists.gnu.org/archive/html/bug-make/2017-11/msg00017.html
+clang_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang")
+clangxx_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang++")
+
+clang_resource_dir=$(shell clang -print-resource-dir)
+endif
+
+cctools_TOOLS=AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL
+
+# Make-only lowercase function
+lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
+
+# For well-known tools provided by cctools, make sure that their well-known
+# variable is set to the full path of the tool, just like how AC_PATH_{TOO,PROG}
+# would.
+$(foreach TOOL,$(cctools_TOOLS),$(eval darwin_$(TOOL) = $$(build_prefix)/bin/$$(host)-$(call lc,$(TOOL))))
+
 # Flag explanations:
 #
 #     -mlinker-version
@@ -18,18 +60,54 @@ OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-
 #         Explicitly point to our binaries (e.g. cctools) so that they are
 #         ensured to be found and preferred over other possibilities.
 #
-#     -nostdinc++ -isystem $(OSX_SDK)/usr/include/c++/v1
+#     -stdlib=libc++ -stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1
 #
 #         Forces clang to use the libc++ headers from our SDK and completely
 #         forget about the libc++ headers from the standard directories
 #
-#         TODO: Once we start requiring a clang version that has the
-#         -stdlib++-isystem<directory> flag first introduced here:
-#         https://reviews.llvm.org/D64089, we should use that instead. Read the
-#         differential summary there for more details.
+#     -Xclang -*system<path_a> \
+#     -Xclang -*system<path_b> \
+#     -Xclang -*system<path_c> ...
+#
+#         Adds path_a, path_b, and path_c to the bottom of clang's list of
+#         include search paths. This is used to explicitly specify the list of
+#         system include search paths and its ordering, rather than rely on
+#         clang's autodetection routine. This routine has been shown to:
+#             1. Fail to pickup libc++ headers in $SYSROOT/usr/include/c++/v1
+#                when clang was built manually (see: https://github.com/bitcoin/bitcoin/pull/17919#issuecomment-656785034)
+#             2. Fail to pickup C headers in $SYSROOT/usr/include when
+#                C_INCLUDE_DIRS was specified at configure time (see: https://gist.github.com/dongcarl/5cdc6990b7599e8a5bf6d2a9c70e82f9)
+#
+#         Talking directly to cc1 with -Xclang here grants us access to specify
+#         more granular categories for these system include search paths, and we
+#         can use the correct categories that these search paths would have been
+#         placed in if the autodetection routine had worked correctly. (see:
+#         https://gist.github.com/dongcarl/5cdc6990b7599e8a5bf6d2a9c70e82f9#the-treatment)
+#
+#         Furthermore, it places these search paths after any "non-Xclang"
+#         specified search paths. This prevents any additional clang options or
+#         environment variables from coming after or in between these system
+#         include search paths, as that would be wrong in general but would also
+#         break #include_next's.
 #
-darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -B$(build_prefix)/bin
-darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++ -mlinker-version=$(LD64_VERSION) -B$(build_prefix)/bin -nostdinc++ -isystem $(OSX_SDK)/usr/include/c++/v1
+darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
+              -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
+              -u LIBRARY_PATH \
+            $(clang_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
+              -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
+              -isysroot$(OSX_SDK) \
+              -Xclang -internal-externc-isystem$(clang_resource_dir)/include \
+              -Xclang -internal-externc-isystem$(OSX_SDK)/usr/include
+darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
+               -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
+               -u LIBRARY_PATH \
+             $(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
+               -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
+               -isysroot$(OSX_SDK) \
+               -stdlib=libc++ \
+               -stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1 \
+               -Xclang -internal-externc-isystem$(clang_resource_dir)/include \
+               -Xclang -internal-externc-isystem$(OSX_SDK)/usr/include
 
 darwin_CFLAGS=-pipe
 darwin_CXXFLAGS=$(darwin_CFLAGS)
@@ -40,11 +118,4 @@ darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
 darwin_debug_CFLAGS=-O1
 darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)
 
-darwin_native_binutils=native_cctools
-ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
-darwin_native_toolchain=native_cctools
-else
-darwin_native_toolchain=
-endif
-
 darwin_cmake_system=Darwin

depends/hosts/darwin.mk

@@ -0,0 +1,122 @@
+# dummy package to learn how recipes work
+#
+# Following command will build only this package:
+# make -C ${PWD}/depends HOST=$(depends/config.guess) -j$(nproc --all) dummy
+# add V=1 for verbose output
+#
+package=dummy
+$(package)_version=1.0.0
+$(package)_download_path=https://github.com/DeckerSU/dummy-package/archive/refs/tags/
+$(package)_download_file=v$($(package)_version).tar.gz
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=b56360df29a29205f36dfe888d320369b7c859ca205376a9ca25180a7c931796
+
+# optional variables
+
+# $(package)_build_subdir  # cd to this dir before running configure/build/stage commands.
+# $(package)_download_file # The file-name of the upstream source if it differs from how it should be stored locally.
+# $(package)_dependencies  # Names of any other packages that this one depends on.
+# $(package)_patches       # Filenames of any patches needed to build the package
+# $(package)_extra_sources # Any extra files that will be fetched via $(package)_fetch_cmds.
+
+## Build Variables:
+
+# most variables can be prefixed with the host, architecture, or both
+#    Universal:     $(package)_cc=gcc
+#    Linux only:    $(package)_linux_cc=gcc
+#    x86_64 only:       $(package)_x86_64_cc = gcc
+#    x86_64 linux only: $(package)_x86_64_linux_cc = gcc
+
+#
+# *_env variables are used to add environment variables to the respective commands
+
+# Operations order:
+#
+# 1. Fetching dummy...
+# 2. Extracting dummy...
+# 3. Preprocessing dummy...
+# 4. Configuring dummy...
+# 5. Building dummy...
+# 6. Staging dummy...
+# 7. Postprocessing dummy...
+# 8. Caching dummy...
+
+# https://unix.stackexchange.com/questions/269077/tput-setaf-color-table-how-to-determine-color-codes
+# https://stackoverflow.com/questions/4879592/whats-the-difference-between-and-in-makefile # := and = difference
+# https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors
+
+green:=$(shell tput setaf 10)
+red:=$(shell tput setaf 9)
+yellow:=$(shell tput setaf 11)
+grey:=$(shell tput setaf 8)
+reset:=$(shell tput sgr0)
+$(info $(green)[ Dummy ]$(reset) Let's build the package ...)
+
+# Example of making tool(s) variables
+clang_prog=$(build_prefix)/bin/clang
+clangxx_prog=$(clang_prog)++
+cctools_TOOLS=AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL
+lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
+$(foreach TOOL,$(cctools_TOOLS),$(eval special_$(TOOL) = $$(build_prefix)/bin/$$(host)-$(call lc,$(TOOL))))
+$(foreach TOOL,$(cctools_TOOLS),$(info $(green)[ Dummy ]$(reset) $$(special_$(TOOL))=$(special_$(TOOL))))
+
+define $(package)_set_vars
+    $(package)_conf_tool=./configure
+    $(package)_config_opts=--common-conf-option
+    $(package)_config_opts_linux=--just-a-linux-conf-option
+    $(package)_config_opts_mingw32=--special-windows-conf-option
+endef
+
+define $(package)_preprocess_cmds
+    echo "$(grey)--------------------------------------------$(reset)" && \
+    echo "Current directory: $(PWD)" && \
+    echo "Global variables: " && \
+    echo "$(grey)build_prefix:${reset} $(build_prefix)" && \
+    echo "Path variables: " && \
+    echo "$(grey)$(package)_staging_dir:${reset} $($(package)_staging_dir)" && \
+    echo "$(grey)$(package)_staging_prefix_dir:${reset} $($(package)_staging_prefix_dir)" && \
+    echo "$(grey)$(package)_extract_dir:${reset} $($(package)_extract_dir)" && \
+    echo "$(grey)$(package)_build_dir:${reset} $($(package)_build_dir)" && \
+    echo "$(grey)$(package)_build_subdir:${reset} $($(package)_build_subdir)" && \
+    echo "$(grey)$(package)_patch_dir:${reset} $($(package)_patch_dir)" && \
+    echo "Build variables: " && \
+    echo "$(grey)$(package)_cc         :${reset} $($(package)_cc)" && \
+    echo "$(grey)$(package)_cxx        :${reset} $($(package)_cxx)" && \
+    echo "$(grey)$(package)_objc       :${reset} $($(package)_objc)" && \
+    echo "$(grey)$(package)_objcxx     :${reset} $($(package)_objcxx)" && \
+    echo "$(grey)$(package)_ar         :${reset} $($(package)_ar)" && \
+    echo "$(grey)$(package)_ranlib     :${reset} $($(package)_ranlib)" && \
+    echo "$(grey)$(package)_libtool    :${reset} $($(package)_libtool)" && \
+    echo "$(grey)$(package)_nm         :${reset} $($(package)_nm)" && \
+    echo "$(grey)$(package)_cflags     :${reset} $($(package)_cflags)" && \
+    echo "$(grey)$(package)_cxxflags   :${reset} $($(package)_cxxflags)" && \
+    echo "$(grey)$(package)_ldflags    :${reset} $($(package)_ldflags)" && \
+    echo "$(grey)$(package)_cppflags   :${reset} $($(package)_cppflags)" && \
+    echo "$(grey)$(package)_config_env :${reset} $($(package)_config_env)" && \
+    echo "$(grey)$(package)_build_env  :${reset} $($(package)_build_env)" && \
+    echo "$(grey)$(package)_stage_env  :${reset} $($(package)_stage_env)" && \
+    echo "$(grey)$(package)_build_opts :${reset} $($(package)_build_opts)" && \
+    echo "$(grey)$(package)_config_opts:${reset} $($(package)_config_opts)" && \
+    echo "$(grey)--------------------------------------------$(reset)"
+endef
+
+#
+define $(package)_config_cmds
+  echo "$(yellow)$($(package)_conf_tool) $($(package)_config_opts)$(reset)"
+endef
+
+define $(package)_build_cmds
+  echo "$(yellow)$(MAKE)$(reset)"
+endef
+
+# Most autotools projects can be properly staged using:
+#    $(MAKE) DESTDIR=$($(package)_staging_dir) install
+#
+# For manual staging, for example, if we just want to stage
+# 2 files, we can do it with the following way by copying them
+# to $($(package)_staging_prefix_dir)
+#
+define $(package)_stage_cmds
+    cp LICENSE $($(package)_staging_prefix_dir) && \
+    cp README.md $($(package)_staging_prefix_dir)
+endef

depends/packages/dummy.mk

@@ -27,8 +27,8 @@ else
 
     ifeq ($(build_os)$(host_os),linuxdarwin) # cross-compile for MacOS from Linux
         define $(package)_build_cmds
-          $(MAKE) -C googlemock/make CC="$(build_prefix)/bin/$($(package)_cc)" CXX="$(build_prefix)/bin/$($(package)_cxx)" AR="$(build_prefix)/bin/$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gmock.a && \
-          $(MAKE) -C googletest/make CC="$(build_prefix)/bin/$($(package)_cc)" CXX="$(build_prefix)/bin/$($(package)_cxx)" AR="$(build_prefix)/bin/$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gtest.a
+          $(MAKE) -C googlemock/make CC="$(darwin_CC)" CXX="$(darwin_CXX)" AR="$(darwin_AR)" CXXFLAGS="$($(package)_cxxflags)" gmock.a && \
+          $(MAKE) -C googletest/make CC="$(darwin_CC)" CXX="$(darwin_CXX)" AR="$(darwin_AR)" CXXFLAGS="$($(package)_cxxflags)" gtest.a
         endef
     else
         define $(package)_build_cmds

depends/packages/googletest.mk

@@ -27,8 +27,8 @@ ifeq ($(build_os),linux)
       define $(package)_set_vars
         $(package)_config_env+=LD_LIBRARY_PATH="$(host_prefix)/lib" PKG_CONFIG_LIBDIR="$(host_prefix)/lib/pkgconfig"
         $(package)_config_env+=CPPFLAGS="-I$(host_prefix)/include -fPIC" LDFLAGS="-L$(host_prefix)/lib -Wl,-undefined -Wl,dynamic_lookup" # https://github.com/ddnet/ddnet/commit/e8bd8459a6f556594f48f33f4d145033bc89d46f
-        $(package)_config_env+=CC="$(build_prefix)/bin/$($(package)_cc)" CXX="$(build_prefix)/bin/$($(package)_cxx)"
-        $(package)_config_env+=AR="$(build_prefix)/bin/$($(package)_ar)" RANLIB="$(build_prefix)/bin/$($(package)_ranlib)"
+        $(package)_config_env+=CC="$(darwin_CC)" CXX="$(darwin_CXX)"
+        $(package)_config_env+=AR="$(darwin_AR)" RANLIB="$(darwin_RANLIB)"
         $(package)_config_opts+=--host=$(canonical_host) --without-libpsl --without-libgsasl --disable-ldap --disable-tls-srp
       endef
   endif

depends/packages/libcurl.mk

@@ -29,7 +29,7 @@ else
     else
         # cross-compile mac
         define $(package)_build_cmds
-            CC="$(build_prefix)/bin/$($(package)_cc)" CXX="$(build_prefix)/bin/$($(package)_cxx)" \
+            CC="$(darwin_CC)" CXX="$(darwin_CXX)" \
             CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" $(MAKE) lib DEPINST=$(host_prefix) CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_GTEST=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT OPTFLAGS="-O2 -march=x86-64 -g "
         endef
     endif

depends/packages/libsnark.mk

@@ -15,25 +15,20 @@ $(package)_config_opts += --disable-composite --disable-damage --disable-dpms
 $(package)_config_opts += --disable-dri2 --disable-dri3 --disable-glx
 $(package)_config_opts += --disable-present --disable-randr --disable-record
 $(package)_config_opts += --disable-render --disable-resource --disable-screensaver
-$(package)_config_opts += --disable-shape --disable-shm --disable-sync
+$(package)_config_opts += --disable-shape --disable-sync
 $(package)_config_opts += --disable-xevie --disable-xfixes --disable-xfree86-dri
-$(package)_config_opts += --disable-xinerama --disable-xinput --disable-xkb
+$(package)_config_opts += --disable-xinerama --disable-xinput
 $(package)_config_opts += --disable-xprint --disable-selinux --disable-xtest
 $(package)_config_opts += --disable-xv --disable-xvmc
 endef
 
 define $(package)_preprocess_cmds
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux &&\
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux && \
   sed "s/pthread-stubs//" -i configure
 endef
 
-# Don't install xcb headers to the default path in order to work around a qt
-# build issue: https://bugreports.qt.io/browse/QTBUG-34748
-# When using qt's internal libxcb, it may end up finding the real headers in
-# depends staging. Use a non-default path to avoid that.
-
 define $(package)_config_cmds
-  $($(package)_autoconf) --includedir=$(host_prefix)/include/xcb-shared
+  $($(package)_autoconf)
 endef
 
 define $(package)_build_cmds
@@ -45,5 +40,5 @@ define $(package)_stage_cmds
 endef
 
 define $(package)_postprocess_cmds
-  rm -rf share/man share/doc lib/*.la
+  rm -rf share lib/*.la
 endef