From 71bc6cff0b6b8ba8b4b67b4157ce101c5a3d3722 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 7 Mar 2021 00:23:01 -0500 Subject: [PATCH] heirloom-devtools: Fix build on new glibc. Recent glibc have removed header, which is included by one of the source files. However, nothing seems to depend on this inclusion so simply deleting it appears sufficient to restore working builds. --- sys-devel/heirloom-devtools/Manifest | 3 ++- .../heirloom-devtools-070527-no-stropts.patch | 15 +++++++++++++++ ....ebuild => heirloom-devtools-070527-r3.ebuild} | 5 +++-- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 sys-devel/heirloom-devtools/files/heirloom-devtools-070527-no-stropts.patch rename sys-devel/heirloom-devtools/{heirloom-devtools-070527-r2.ebuild => heirloom-devtools-070527-r3.ebuild} (96%) diff --git a/sys-devel/heirloom-devtools/Manifest b/sys-devel/heirloom-devtools/Manifest index 678bc8e..f3e8314 100644 --- a/sys-devel/heirloom-devtools/Manifest +++ b/sys-devel/heirloom-devtools/Manifest @@ -1,5 +1,6 @@ AUX heirloom-devtools-070527-64-bit.patch 1175 BLAKE2B 71bb0ca3b44fe2e8b6c369d3142806b984389f0804be801e180a3004919a138bb2f74b3ca119de2dc76f599ee0223a846005a10ebadd9011d29431e162b36888 SHA512 5523e670c9c9d57f0415e30d1aab4dfcd7d8ad74e2535136afbbe4c6e407c713e7801cbcbf7ddbe798ab2790fc196a2fdbf9d5295fa8c475c73360f5e3a27066 AUX heirloom-devtools-070527-gcc6.patch 414 BLAKE2B cdd02368c95a0af5ef2b16cc737e7783da9205ab27fc9c1bc660603a583ff9c3324a3656bc35c950f80677db0281d4f34fe7648f71c839c6463ce21f5e9a7e61 SHA512 59742ba2e802b66b547ae3255995724098153daf0896a484afed868a8795e3f36e38a54d33254f81d3fb0c91f57cf3a78322b2bb10673e4bdedb37b7ff33473f +AUX heirloom-devtools-070527-no-stropts.patch 325 BLAKE2B d881ceb59a5dceca5502f6f0964ede3c03d4728402c635329913577740ec3f82667749a3903839b918069567873fea4ed300a949c14cbecaf1304adb55a9993a SHA512 3bf72dd87e0f679f9a6e901b252074fc3d9fe0a51b35e229d13c8c230cd2b588b13d3a4f5540a435c1d69b22aa8e007b55d84fc5b9961550d9d08da4ba9aedcd AUX heirloom-devtools-070527-solaris.patch 5636 BLAKE2B cb8ef619a415a45f96201515736573daad7e170ddb7fb70ab8f508cc611fcf5ad9d286b2bda02b869c28e85a72917a876f37fb1e6ee7b54c6490b8d8ab3fcdb4 SHA512 335fdabef9b9a8b93ffa6eab2b66d2db11af29b24989c4b64ea64695cfadd4471c31a865c2fcb823c1f4c11eebc1babb53ab83c9c2bdf83c05f497faf16e3f1c DIST heirloom-devtools-070527.tar.bz2 381054 BLAKE2B 074f410f1a584b8ec06dec8bfd31db29e80623e91bb806b635be2a761beb7a5f184769df634d9fb11435a7515e78aabd21423cf0eaa55b801cb32d1aaae6862e SHA512 1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055 -EBUILD heirloom-devtools-070527-r2.ebuild 2060 BLAKE2B 34e5a41216c0486b1487d6192bbf7f240a3555db917ec4cf034e78b3db82d1165f1e13b239e04bb3659188a3f882d750c54fa67086b81e082b4e92342afc8507 SHA512 5c04e9d7c636f782229381a98e81d9a3eebca0c92a2b9f39bd57e924eb190e44bb64ddeca7c042cff9350ba1e437d9b10d83d5b007471242f2f163b9bbe16eca +EBUILD heirloom-devtools-070527-r3.ebuild 2104 BLAKE2B 5ba08eb2a11934eb8013b30077211575753016c0ae5a7536b80d47149ce8b00b8ccf143642ba90ef7d1fd477774341f250b1fe1f9090052833fac9e8fb43e978 SHA512 ea7d5f7ac1ed054b7651da4d4d30d22564b9964f52793ecd66787b3edab4e03fcdcb82499f0bc3f4dbba59453d810f6ca8f82d614dbe913159203d624742f922 diff --git a/sys-devel/heirloom-devtools/files/heirloom-devtools-070527-no-stropts.patch b/sys-devel/heirloom-devtools/files/heirloom-devtools-070527-no-stropts.patch new file mode 100644 index 0000000..9e241ec --- /dev/null +++ b/sys-devel/heirloom-devtools/files/heirloom-devtools-070527-no-stropts.patch @@ -0,0 +1,15 @@ +diff --git a/make/src/doname.cc b/make/src/doname.cc +index 6b6f3d3..7b5bb33 100644 +--- a/make/src/doname.cc ++++ b/make/src/doname.cc +@@ -72,10 +72,6 @@ + + #include + +-#if defined (__sun) || defined (__linux__) +-# include +-#endif +- + #include + #include + #include diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r3.ebuild similarity index 96% rename from sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild rename to sys-devel/heirloom-devtools/heirloom-devtools-070527-r3.ebuild index 10dd856..affd28b 100644 --- a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r2.ebuild +++ b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright © 2018 Nick Bowler +# Copyright © 2018, 2020-2021 Nick Bowler # License GPLv2+: GNU General Public License version 2 or any later version. # This is free software: you are free to change and distribute it. # There is NO WARRANTY, to the extent permitted by law. @@ -9,7 +9,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic readme.gentoo-r1 toolchain-funcs DESCRIPTION="Original UNIX development tools" @@ -30,6 +30,7 @@ PATCHES=( "$FILESDIR/$P-solaris.patch" "$FILESDIR/$P-64-bit.patch" "$FILESDIR/$P-gcc6.patch" + "$FILESDIR/$P-no-stropts.patch" ) DOC_CONTENTS=" -- 2.43.0