[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowmaker/files/, x11-wm/windowmaker/
commit: e9b13ddd0ca118db1a32742332ab21d06cdd6882 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Jan 24 14:29:52 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Jan 24 14:29:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b13ddd x11-wm/windowmaker: fix cross-compilation Thanks David Michael for patch and bug report Closes: https://bugs.gentoo.org/706006 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> ...ker-0.95.8-configure_default_search_paths.patch | 70 ++ x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild| 4 +- 2 files changed, 73 insertions(+), 1 deletion(-) 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 000..fa323b775d0 --- /dev/null +++ b/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch @@ -0,0 +1,70 @@ +From: David Michael +To: wmaker-...@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 18e442e7939..7fd9518848a 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
[gentoo-commits] repo/gentoo:master commit in: x11-wm/windowmaker/files/, x11-wm/windowmaker/
commit: fbff0b62bb6a91011372db2490a226c78e4ec19e Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Jun 2 22:28:35 2017 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Jun 2 22:28:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbff0b62 x11-wm/windowmaker: drop old Package-Manager: Portage-2.3.6, Repoman-2.3.2 x11-wm/windowmaker/Manifest| 2 - .../windowmaker-0.95.3-fix_underlinking.patch | 15 --- .../files/windowmaker-0.95.5-bsd_crash.patch | 28 -- .../files/windowmaker-0.95.6-webp_detection.patch | 70 - x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild| 108 x11-wm/windowmaker/windowmaker-0.95.6.ebuild | 111 - x11-wm/windowmaker/windowmaker-0.95.8.ebuild | 106 7 files changed, 440 deletions(-) diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 5ddd0e5e48f..d680f7617dc 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,5 +1,3 @@ -DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da -DIST WindowMaker-0.95.6.tar.gz 3004856 SHA256 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 SHA512 259db96b44058fde21b7efe65419b7f7ae149029dcfbf5cf480f920d68f906cd15345105ab67d8539be44d6f1b30e62accf68fc009d53af8c12e047c01154a11 WHIRLPOOL 6f27180cc4439b4b19c3f249fc9c5577463187c741c2e04112bb70feb8e052ad1093e0a5103f1772b59ee7b2549f7b126ac621165f94483e22fd756a969e0e3c DIST WindowMaker-0.95.7.tar.gz 3238325 SHA256 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f WHIRLPOOL 090efc24fe47487b5f9ec68e821b0fea789ac4f7badccf639a5910f463613381701c6750db29f98e6777207387850e0c47324ffc8fcc1d1b4fe60ac05c05c25d DIST WindowMaker-0.95.8.tar.gz 3253515 SHA256 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2 WHIRLPOOL e5027c70637b0a9204b9e71054a0351389fcb5c2773c8dbc1e7c15285a6e6caeaf6c04456b6d5fa7f4510abe0da4872db8a8bd870b78ef6369aaf9e81197b553 DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034 diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch b/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch deleted file mode 100644 index cd88709dc14..000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am -index 0f8201f..7b95d1f 100644 a/wmlib/Makefile.am -+++ b/wmlib/Makefile.am -@@ -2,6 +2,7 @@ - AUTOMAKE_OPTIONS = no-dependencies - - libWMaker_la_LDFLAGS = -version-info 1:1:0 -+libWMaker_la_LIBADD = @LIBRARY_SEARCH_PATH@ @XLIBS@ - lib_LTLIBRARIES = libWMaker.la - - include_HEADERS = WMaker.h --- -1.7.8.6 - diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch b/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch deleted file mode 100644 index a3e71375f62..000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: François Tigeot -Date: Sat, 21 Sep 2013 10:34:51 + (+0200) -Subject: osdep_bsd.c: Fix a typo causing memory to be overwritten -X-Git-Url: http://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/38e088314a2a4b7f8031f50eb546c22e5024bdf4 - -osdep_bsd.c: Fix a typo causing memory to be overwritten - -* When compiled on DragonFly+gcc 4.7.3, this out of bounds array element - initialization causes an important variable to be overwritten and a - subsequent WindowMaker crash - -* It was sheer luck other compilers/environments didn't exhibit any obvious - issue so far - -diff --git a/src/osdep_bsd.c b/src/osdep_bsd.c -index 3393240..ad504ad 100644 a/src/osdep_bsd.c -+++ b/src/osdep_bsd.c -@@ -86,7 +86,7 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc) - mib[0] = CTL_KERN; - mib[1] = KERN_ARGMAX; - mib[2] = 0; -- mib[4] = 0; -+ mib[3] = 0; - - count