3 files changed, 75 insertions, 2 deletions
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index fbd297285f9f..2fb5d127094e 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,9 +1,10 @@
+AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae
 AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-0.95.7.tar.gz 3238325 BLAKE2B 68a26e8b1281a4ff387fa87517efb46995e5339e2e6e7f71303d3e3e0d75316740d2458067dc4159f23bf1e1b4e1e0bfc22b1428ee4933e4d474a79a147baaf7 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f
 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
 EBUILD windowmaker-0.95.7.ebuild 2906 BLAKE2B 3c3dca2fc0da68c5aae707a4d3f40229cf9c43c31d4024cc554326980ef09d1f51ad3db1234d95499c5d637df31c45bda2ac604677697e468114cf7e99ad8eae SHA512 bf3dbc0929d6b1d9ea277f9d7696e988cb729f1069e7d0306d22e25a5821bc05477f82abfc38fb6905b51eb60585353320c872765626cb6e946e999681a9c61c
-EBUILD windowmaker-0.95.8-r1.ebuild 3051 BLAKE2B 95b286c13bfa641d77ffe4f11580a1c0115566492877867bf530276b652d50e22255bc38adffe4cf24ee0304029bddf2bb5af369c268bb90e8c900b27ff573df SHA512 150bb225f35a683c86da1a57e808d29d7ec00acc6acb7609a7adfce0c7769e75d114166746b918d186440692839aedfd11caa2b64c4c83444cffcfcf585ffd28
+EBUILD windowmaker-0.95.8-r1.ebuild 3117 BLAKE2B 4ee4ad78ad07aac3a7b92d20e449da54a0809d51ef4fbaea95543c2466defaee9cf670c8eaa7e66a46cc72c5c042c4969938af4d8111fb12ab5129503b46eebc SHA512 0239d60827760e0752ea45b3bcb4ad284c1b1bf4f66201d72bd0ff0d3312119f5fd8310bdeb4738ff9156f3c37bb1372dd8479f46c7972f5cdfec4ae8de1b4ab
 EBUILD windowmaker-9999.ebuild 2842 BLAKE2B 894de4cc8296ff22ba90d5bf89e00edd82aa256adbabde31861d9f6d1a85c50e32d3c47485c39ff5d20ce7c55da80835fb63626850790823a4d550894f354fdc SHA512 298b72229d0a354ac9b174610add21c4624ae23ccbe9ce850519f93478489fdeb6e1cd40b2f368733c4d89fb93af91181107e554e4c2af81447fa324b5e6c65c
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch
new file mode 100644
index 000000000000..fa323b775d0a
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch
@@ -0,0 +1,70 @@
+From: David Michael <fedo...@gmail.com>
+To: wmaker-dev@googlegroups.com
+Subject: [PATCH] configure: Allow changing default search paths
+Date: Thu, 16 Jan 2020 14:59:33 -0500
+
+This changes the behavior of the --with-{inc,lib}s-from arguments
+to replace the default paths instead of adding to them.  This is
+required when cross-compiling in a sysroot, since the default paths
+will include files from the host system which can have an
+incompatible architecture.
+---
+1. What happened: could not compile
+
+2. Detailed description of what happened:
+Cross-compiling in a sysroot searches for development files on the
+host.  The build fails when building between two very different
+architectures.
+
+3. How to reproduce the bug, if known:
+Cross-compile in a sysroot (from x86_64 to ppc with Gentoo in my case).
+
+6. The error occurred during: compilation
+
+8. Error messages output:
+There are about two megabytes of errors about float128 not being defined
+for the architecture, from including the x86_64 headers in /usr/include
+for the ppc compiler.
+
+9. Fix, if known:
+This commit makes it build when passing --with-{inc,lib}s-from= and it
+shouldn't be a big behavior change for most cases.
+
+10. Other Notes:
+I didn't dig into the history of those search variables, but a better
+fix might be to just remove them entirely.  It doesn't seem to do any
+good to redundantly add the default search paths, or if includedir or
+libdir were changed, the usual CPPFLAGS and LDFLAGS environment
+variables could set the search paths.
+
+ configure.ac | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a19acce5..0129f4e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,18 +284,14 @@ _bindir=`eval echo $_bindir`
+ _libdir=`eval echo $libdir`
+ _libdir=`eval echo $_libdir`
+ 
+-lib_search_path='-L${libdir}'
+-
+-inc_search_path='-I${includedir}'
+-
+ dnl ===============================================
+ dnl Specify paths to look for libraries and headers
+ dnl ===============================================
+ AC_ARG_WITH(libs-from, AS_HELP_STRING([--with-libs-from], [pass compiler flags to look for libraries]),
+-	[lib_search_path="$withval $lib_search_path"])
++	[lib_search_path="$withval"], [lib_search_path='-L${libdir}'])
+ 
+ AC_ARG_WITH(incs-from, AS_HELP_STRING([--with-incs-from], [pass compiler flags to look for header files]),
+-	[inc_search_path="$withval $inc_search_path"])
++	[inc_search_path="$withval"], [inc_search_path='-I${includedir}'])
+ 
+ 
+ dnl Features Configuration
+-- 
+2.21.1
+
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 18e442e79398..7fd9518848a6 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${P/windowm/WindowM}
 
+PATCHES=( "${FILESDIR}"/${P}-configure_default_search_paths.patch )
+
 src_prepare() {
 	# Fix some paths
 	for file in WindowMaker/*menu* util/wmgenmenu.c; do