diff options
Diffstat (limited to 'dev-util/colm')
| -rw-r--r-- | dev-util/colm/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/colm/colm-0.14.7-r1.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/colm/files/colm-0.14.7-solaris.patch | 28 |
3 files changed, 38 insertions, 3 deletions
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest index 77bfe5ee914e..13e5bd6fe3f7 100644 --- a/dev-util/colm/Manifest +++ b/dev-util/colm/Manifest @@ -1,10 +1,11 @@ AUX colm-0.14.7-disable-static-lib.patch 524 BLAKE2B 1e47e8e48592956b4aa99682398f49817458c005758ad606a5efaea82305bca58b4319a97ed36ecb57d2759b8d3392d8c39c91fba46cbc2b43cd421ccfe3bdef SHA512 6f9463c99691cf51c0a1765a6942c2ef5316676bff7c7cec991877a9c86ab708c44d0a2230f172880757a48f5c77d377d754becc243972e276586ea077feb493 AUX colm-0.14.7-drop-julia-check.patch 1369 BLAKE2B 9d2e841fd19051e0617df64fb9940b5552e7b0a1c7d3525606e022b1f483628847955c2c85e7ac6d3fbedb85e46b38573b054b9883ca31a327180fcae261bf06 SHA512 962174b04c0f694c655e5e5c526ffe82619abbe12457d3a396dd639f023e36a8750d166c0b09b7531cb03abd0a8619587201d66ce46e69d2d4e7420f883771ca +AUX colm-0.14.7-solaris.patch 659 BLAKE2B f7e8b4781ffc7a63fa63ee83f69e115ea14609e1665a01e0ad62d9716a1258d71ab849f02b58b3dcd40fb8d6cb30a9beb0e587a3825fadde4d9ca45e124adcb9 SHA512 cd4e6a8d7aca33112e3f7c936b018392923e8578050a437c13e818d4bec8979b5f0c3f8792dcc451a4ac6c990f7498b9026aefcb22d91db0d61c1bc01287300d DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07 -EBUILD colm-0.14.7-r1.ebuild 1157 BLAKE2B 58952558f5920bb8f22d35e3f64a4b4a9cc867d0c2b7ef24f872e16641000bcb5c781e66056b335d7adba40ec372dfa49264f21f5b4a8010e9a73b5922d36b53 SHA512 331dc45399eed8364e30436795744b5b5e813f8762a043e20171c03972fe27172a53b2b4f23687ee629a47ca10a75840a8fc3478238184cd6eceece1a9e771ed +EBUILD colm-0.14.7-r1.ebuild 1464 BLAKE2B 42a1241adf2e34160d294c104a6fe06550b001ad51d1694ed6a665373284e2eb25db7012772823405304f6531184b4a93deca6cc086247913d74b554f327dd88 SHA512 07841441e7eee4dcc2567d7096af022d25b63a381608f5849f6d79a8b7aaabcae82eabe5b75fe90dd3abcb201c85ba2985b1991781d3386a4b46105c8b242096 EBUILD colm-0.14.7.ebuild 1366 BLAKE2B 443e26f0bad0e8805d20ce2a69cb829d28e5558fedeee3e3a76b74e1c73bf4dea37ec391f9e2615c91581576297cfc37865cdd4cc9dab8870bf4a4634da50b9f SHA512 58af643e63bdb8261b36c4141b9b680f3d27647394b40c0fbfcf1c5f9c261f44277d17dd98e58db7aa697cfe6d5ea66260e1adbfced1c45e35fb7b7335dd4b83 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7 diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild index 831d5bc521f1..cccddd15cee0 100644 --- a/dev-util/colm/colm-0.14.7-r1.ebuild +++ b/dev-util/colm/colm-0.14.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc" BDEPEND=" @@ -26,6 +26,7 @@ RDEPEND="!<dev-util/ragel-7.0.3" PATCHES=( "${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch "${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch + "${FILESDIR}"/${PN}-0.14.7-solaris.patch ) src_prepare() { @@ -38,6 +39,11 @@ src_prepare() { sed -i -e "s:gcc:$(tc-getCC):" test/colm.d/gentests.sh || die sed -i -e "s:g++:$(tc-getCXX):" test/colm.d/gentests.sh || die + # fix linkage on Darwin from colm itself during build + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die + fi + eautoreconf } diff --git a/dev-util/colm/files/colm-0.14.7-solaris.patch b/dev-util/colm/files/colm-0.14.7-solaris.patch new file mode 100644 index 000000000000..83b03b0d23a1 --- /dev/null +++ b/dev-util/colm/files/colm-0.14.7-solaris.patch @@ -0,0 +1,28 @@ +https://github.com/adrian-thurston/colm/pull/145 + +commit 0a0fa0a41928564fa92100bff1bc21f85d770bfb +Author: Fabian Groffen <grobian@gentoo.org> +Date: Wed Jan 12 20:32:44 2022 +0100 + + src/bytecode.c: include config.h to activate guards + + Fix compilation on Solaris, which needs sys/wait.h for macros like + WEXITSTATUS. + + Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +diff --git a/src/bytecode.c b/src/bytecode.c +index 8ef848b0..c30778da 100644 +--- a/src/bytecode.c ++++ b/src/bytecode.c +@@ -20,6 +20,10 @@ + * SOFTWARE. + */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + #include <colm/bytecode.h> + + #include <sys/types.h> |