diff options
Diffstat (limited to 'dev-lang')
33 files changed, 259 insertions, 616 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex 845969eaaaba..9d7c68e73fec 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 40b548cdaac7..072045ce37e2 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -33,9 +33,9 @@ DIST ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 120336081 BLAKE2B 55dfbb90d5e55c2af5e9 DIST ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 118897883 BLAKE2B a180b2dd1a3bc222044ece809ad700aee29d0c3e75b57ee9af3ca33c9c0f59dbf36f68202f746d99f80915cb717a9c41fc12db507f1cb469981732703a06b9cc SHA512 9d4be02dbd9704c93ef18feb92ea30bd5d590df31f288bf1b364818424c5019ca9ada26eec88418199f90ae8f4459d0a9352104e3f3186bbdc241891eb1b66c4 DIST ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 122955511 BLAKE2B b870f46cc78fcc1d715aafe7108951582cfd12495b4e9d804d4b66562c66a6a2b2d9513031aedc8f3630a0cdbb3257943304b05732301a084f89487452f2f2d9 SHA512 aafd4233c40f93b71e6ac1acc8a75e30d49b826e4bce6d9832836966fd5f6c4898963bd4c2f34577f4199c1d9a3f537ac1e7d87eab11e9fb5e849573580ed3fb DIST ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 121542968 BLAKE2B 837870e68138f8d97dc8b2aae90090cf02416628602ca4ba4417ac92b49155f10028b05ac465665b8872b32372a5cee075616983f2eacdebb0188bd2ce6a93d2 SHA512 0e8c6d2e6f32fac95588f7323a4e02dddfc9ec2476a82b97bf5a106d3810f7e638fda7124c53b5bbc563fce70f4436553c282d8ea2f1f5fdf4fcccfb15a2b079 -EBUILD ghc-8.10.4-r1.ebuild 26143 BLAKE2B 8476b6ed1671f2b7ba5d1a202eab94299f12804af89e7626917a970a658b63e8988c0f9d38140ed1e823f4574d5230c038610662dd04ab82aefa9f5516cfc59f SHA512 272a8a08096b437bd73eab7a3b38576f1c373f0c21352c340d27516755c5eb1c061806b204948dec0df325819213414d575bdb28c060750714ba16bfdc05e7d1 -EBUILD ghc-8.10.5-r1.ebuild 26077 BLAKE2B c81a9599ec300b0ec3264f1016bd3dfb692a5ccb2f5fe85e4763accf2327179164dc32ca52fefd64ef5cf680426d05a5afef2e2043def5f1b334f70f1c7004d0 SHA512 c84517d16762dd379aec574a4381fd2f5ab895c1ba162618e147f418cdb8439bda1054a9752b72c2c688835e4546f267d581d76b62ea74ffed6144f748ab6626 -EBUILD ghc-8.10.6.ebuild 26102 BLAKE2B 9331e6bb99d4b1a34a6b1e0a95d0d8685780e856f861ead2548fa3b2251b9922694d154ad88e456b3ab4e43e023628a571c705c7397556375486371b4cc2bcab SHA512 1569cfa1937910ccf6cc252dc144010a8853efc3584862c157d64f57233a9d0320e7804cd1f2e62ddd0ebea1f3b4e179c5a7c65ffb64276ae88923b97bab2a67 -EBUILD ghc-8.8.4-r1.ebuild 26780 BLAKE2B f6453602136b404b76d78d66ed9643b1dbd690f6cca52c877f22ea85e0c588ee046e44b8a13b2e8913045fa1fc1698c80f483ac122e8cebf043ebcf52af075d5 SHA512 55b6d541b4661f605424af3aaf9ee41fb0897da16dcaf449926a9e6c5c331b513fa44931346cd4c77079e1cb563662ed3f27ede80764033ce1e884972b857493 -EBUILD ghc-9.0.1-r1.ebuild 26047 BLAKE2B 320a76fcc9f8ccad091535fcea42e630fe7b52483969e05b947c0bb64ffa7561d81ae55fdd9823067e2647321e531bbf12a2a3a679e79f541a1ec6fcadea32be SHA512 a6cac26a91b0eb08862dfea253ae53c7bc36c8eea3a8a46f115fd77e68f13d5c50d480002192fee2b15dcc7ec3becc6e11e3fe3e47dd7d1b77150eb3615304ad +EBUILD ghc-8.10.4-r1.ebuild 26011 BLAKE2B 3b7e8346d9a786924ed2cd28907236c858b5ae6ed54c8f0cbd3726778bf42931720620ebbb7afe52b4a34c30bfa0f3ee3443f6967243fbe80daf774b87bda5bd SHA512 c9a5fd0cca03a63cbcb41c1b839ed99b04b2b0d795bc3907b65ef4cd3acbb586c8a2d8b086c15aa78e21c49ba05e036e70ca3872dd0a45cd5d50f7592c5ecdd9 +EBUILD ghc-8.10.5-r1.ebuild 25945 BLAKE2B 6e7621ff08f0f641de72ab9f3abff034a78a5801daecd191a891312451da43a99dabe3967d9eba1af430e817919f644c8d31967b89bb9f685cc68d5a532192d5 SHA512 c43a34d5635db4e536b3a8de3ae33297b1c67e3a8506fbd4410ae7782491b14564b82625f2cca6ff87ecbe2fc798f4f5847fc36c6c68a8bba3d758ebfd91be0d +EBUILD ghc-8.10.6.ebuild 25970 BLAKE2B 1368c5a3835cfaefaee4cf1f4b110e5718931adec663a6de2c57c2d638f015f7dfdb4841f40b6937b960371308dec44ed5e6cc87803c184a09b2ee20426db2b1 SHA512 5c54d4862233a59c5f027d80a187e0ee325a82a93effd3964655063f1fca3d96b0b65223fbb05957a5da2908e21445484fe4d2e40f3882750225e7dfe0711e73 +EBUILD ghc-8.8.4-r1.ebuild 26648 BLAKE2B d1d083422c0b3bd6094baadf515e924c490c6f9098d7a4e766f82186fe202879900f15c3c9899110c4768d91e76ad54e53975dc8e46acda79fcf3a19faaefc79 SHA512 d2a474989a695e162306559c2a7c25c81fa6b1cb8b790c9e4e03173f14bb0305aee0b96115b1393e26b9347423531c835e85f401e5aa2b9e9e84e6a62efdab70 +EBUILD ghc-9.0.1-r1.ebuild 25915 BLAKE2B a8a64db3c55b23d8422c1fca113729e47d73aa2953e1fe3f6442f9a5d2befe5ea1f69bf99166899362144ccfdfd85bd17001e47c895cacaed67b8817438ad51a SHA512 63adbfd4aa9835557ba0ee6b0c0e47234a56f7e1d94decefc0d5d99376e0b3a1c3d8af529dd7448d80bd5a97ad39e7fd448492be6a5f71a3d080b3f943201cf4 MISC metadata.xml 878 BLAKE2B 4c5b78fa8dad9e9bf02a03735076171939be552cdb58e3022d66a75c4a7b8e6df363fc6eba192bf3c7ef725e6fff5c9db08deb1920040e535fee81d72e3157b9 SHA512 cd15a92e0d529ac9e8a031d98288de6327adcf48500cdfbef561039fa879b03f9b8c2cdb01835c6d8ade648ff95252f61759f3e471c5033f1153fce43aba3cc7 diff --git a/dev-lang/ghc/ghc-8.10.4-r1.ebuild b/dev-lang/ghc/ghc-8.10.4-r1.ebuild index 0e4472b1c7d4..3ceeddccb9e8 100644 --- a/dev-lang/ghc/ghc-8.10.4-r1.ebuild +++ b/dev-lang/ghc/ghc-8.10.4-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=7 @@ -37,9 +37,6 @@ arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/g #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - # 0 - yet yet_binary() { case "${ARCH}" in diff --git a/dev-lang/ghc/ghc-8.10.5-r1.ebuild b/dev-lang/ghc/ghc-8.10.5-r1.ebuild index 79ac41c9b9db..a1e43281dd4c 100644 --- a/dev-lang/ghc/ghc-8.10.5-r1.ebuild +++ b/dev-lang/ghc/ghc-8.10.5-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=7 @@ -37,9 +37,6 @@ arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/g #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - # 0 - yet yet_binary() { case "${ARCH}" in diff --git a/dev-lang/ghc/ghc-8.10.6.ebuild b/dev-lang/ghc/ghc-8.10.6.ebuild index 4276efffd616..1464a3e0dd6c 100644 --- a/dev-lang/ghc/ghc-8.10.6.ebuild +++ b/dev-lang/ghc/ghc-8.10.6.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=7 @@ -37,9 +37,6 @@ arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/g #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - # 0 - yet yet_binary() { case "${ARCH}" in diff --git a/dev-lang/ghc/ghc-8.8.4-r1.ebuild b/dev-lang/ghc/ghc-8.8.4-r1.ebuild index 5803cfac6333..7cb29d4a740c 100644 --- a/dev-lang/ghc/ghc-8.8.4-r1.ebuild +++ b/dev-lang/ghc/ghc-8.8.4-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=7 @@ -36,9 +36,6 @@ arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/g #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - # 0 - yet yet_binary() { case "${ARCH}" in diff --git a/dev-lang/ghc/ghc-9.0.1-r1.ebuild b/dev-lang/ghc/ghc-9.0.1-r1.ebuild index 6feaed8be49e..6f15fc21247a 100644 --- a/dev-lang/ghc/ghc-9.0.1-r1.ebuild +++ b/dev-lang/ghc/ghc-9.0.1-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=7 @@ -37,9 +37,6 @@ arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/g #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" -# various ports: -#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )" - # 0 - yet yet_binary() { case "${ARCH}" in diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest index 401615595caf..d88efec96f56 100644 --- a/dev-lang/jsonnet/Manifest +++ b/dev-lang/jsonnet/Manifest @@ -2,11 +2,14 @@ AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61 AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888 AUX jsonnet-0.16.0-cp-var.patch 824 BLAKE2B 111fff8e8b897864e14defa677c1a9b8589ef6a859b2344b24e16a940d90cdeff1affde6cd53c0a1a443a82553ee90d554990160f07c49e98c15a5fc7ea3e03a SHA512 96ecfb8a6b49d31e6a827ed401566b5eef39deb8a3542a6f1b3a5df148bfd93479038468585dc47a76fbb9e7953bf9a6c7161abc7acaff7b81cb8dffe3de2f6d AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee02d9957b12997f629c9b4c8e543889658308868d48fe20e0bb9647848bd1b1fa2100c58426785bab1c9bfbbaa8bcb SHA512 9a85c5b8d80f6975ddd3e3c369adb44f6f49382a1e50e9848129c53f81846e69f60a44f401a8a1042657a03f94daaaeb5747632414fa7cb0dc9e2f014ec17a1d +AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf DIST jsonnet-0.15.0.tar.gz 21826038 BLAKE2B 722a844c00ec31b662d932a4481a71197adad680181c6a56a49dfa3e9b63696d29320c5278024d44c0ab3d7d80569514792f815ac7fa3a3cc08c7756fb6f08ad SHA512 b63c1bf82e4fc9ba3f1009ed4e4ba1010e3e7f81bd816a234e48d35607eae3cba95cab57813d35daa9f024e316bae5256340a6f8d6d884f9136cdbf062a2b351 DIST jsonnet-0.16.0.tar.gz 21828911 BLAKE2B d6e9648e259b94513507ba5a6e305f705541904d7755dc5521b7fc2940b761f413bfaba39521af54eb428337be2e75f07d12038edcf7e8a5ba95feccc8dd4a02 SHA512 80e0403ec8008cbacff8d9e8fe0e2b5d3bfa306d92c2c11d472e5721015ce4c11be745df10d25715f22f8d8594df69fabf2fe617bdded462ffc5b21f8923606f DIST jsonnet-0.17.0.tar.gz 21854054 BLAKE2B 91561f2cffb5c711d4ba58aceef90bbcd654997872936bcf475d397a7b831b833d349c828271e58795cca10c915ab4ec0a517dc0fc2f563673ba7a6e74cfea3f SHA512 d3ee6947163d8abced504ff37ecf365c0311164cbf243d4c635d34944f0831ca9fce2470acf00eb9a218f82a2e553b3f885db9bd21bb9dcefbd707fa0202925d +DIST jsonnet-0.18.0.tar.gz 22472162 BLAKE2B 4f931a44b0cbeea0dc7705c28ca49817e2b3abe19ba4fdcd550d5df1ce9ad6b06b1b740a9306d36caa3970c88df9d31700373e4997dd52c6c2219cdd9bf125c1 SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1 EBUILD jsonnet-0.15.0.ebuild 1351 BLAKE2B 70adc1ac64534dcf8d7ed647d81942b5918ab661061c88cc25dbe8c9c6c63478b96caa02a090695a66c120d826de5f34afc904c8c51aa37ff1a4b1dc5cb45397 SHA512 e5c234dd38eb5f13eebfa4842c214219a80e14bbc337fc4309dcef873cc4c37e326ea7867f60a68143849f7fc5e42dd98e9280c24e023ae0a6f71b1a9cc3b2e3 EBUILD jsonnet-0.16.0-r2.ebuild 1601 BLAKE2B 2de253f42358c8258f7f38b53b6fb8f6ed9127b5407375b8f69306701c884efa3ce280713411eaba899a972441eb92ed404ca02575a611dfd997dda99adb8ba1 SHA512 264866ca79d21d8f5870db27f14993d8d86fec27b44190ce69acab8d597417004edfd4a018b9100a289ad49e0aac7d670c568196b604d0e4107220bfd91a1012 EBUILD jsonnet-0.16.0.ebuild 1375 BLAKE2B 4990a4e9754dd0fbc96ce2d6b557b4f9d2325f705ead68db7c768a6942c77a2d235f2a7db961c41263c629a90c4d56633b07d66f26f610c1252a8613ebe9bbdc SHA512 34012d168676b6ad7b519c580085166e7c290e760bb3362003fffb509917d3496d4424f1beb067350d0da6f3a4197aeb87bcfcf84008c6937db63704249e2e16 EBUILD jsonnet-0.17.0-r1.ebuild 1752 BLAKE2B 93381b8c8546fefefdda73e2940a95bcd8b7c5de6ea8f09b53c6012027f4a4c01903af0f27a48f086dcfc471ec848905c572529332d07e2a7ff43dd5c57daf60 SHA512 befcf6b7ec73933ca127413ecea98169f55aec5346bfa94d0bfce4c1303f582ed3625467f744e791da7521f085705f6636c95cfffd3f4de17a0f2d08e7174402 +EBUILD jsonnet-0.18.0-r1.ebuild 2080 BLAKE2B 4853d9918b2f908ed052ee64c43566ef9de4156b1ebd6c1b32d84db20d16ad65fa86b4ed1f9e41ed5f73f61936c32420e0f8b6e024630c68cd44ea73761fdf2c SHA512 bfee3fae79d5b234d0242b257eae9f8a42038639a1c397e930d217c343daffd91331d02395101c8f8f75a04f350ed32260ee532262b44e9e1551fedcc1285942 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a diff --git a/dev-lang/jsonnet/files/jsonnet-0.18.0-unbundle.patch b/dev-lang/jsonnet/files/jsonnet-0.18.0-unbundle.patch new file mode 100644 index 000000000000..7c19e8893f12 --- /dev/null +++ b/dev-lang/jsonnet/files/jsonnet-0.18.0-unbundle.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5df20ca..9e60fae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,6 @@ endif() + add_subdirectory(include) + add_subdirectory(stdlib) + add_subdirectory(third_party/md5) +-add_subdirectory(third_party/rapidyaml/rapidyaml ryml) + add_subdirectory(core) + add_subdirectory(cpp) + add_subdirectory(cmd) +diff --git a/core/vm.cpp b/core/vm.cpp +index 4617363..e328df5 100644 +--- a/core/vm.cpp ++++ b/core/vm.cpp +@@ -23,7 +23,7 @@ limitations under the License. + + #include "desugarer.h" + #include "json.h" +-#include "json.hpp" ++#include "nlohmann/json.hpp" + #include "md5.h" + #include "parser.h" + #include "ryml_std.hpp" // include this before any other ryml header +diff --git a/setup.py b/setup.py +index 0a2748a..356915d 100644 +--- a/setup.py ++++ b/setup.py +@@ -13,6 +13,7 @@ + # limitations under the License. + + import os ++import sys + from setuptools import setup + from setuptools import Extension + from setuptools.command.build_ext import build_ext as BuildExt +@@ -22,28 +23,6 @@ DIR = os.path.abspath(os.path.dirname(__file__)) + # NOTE: If you are editing the array below then you probably also need + # to change MANIFEST.in. + LIB_OBJECTS = [ +- 'core/desugarer.o', +- 'core/formatter.o', +- 'core/libjsonnet.o', +- 'core/lexer.o', +- 'core/parser.o', +- 'core/pass.o', +- 'core/static_analysis.o', +- 'core/string_utils.o', +- 'core/vm.o', +- 'third_party/md5/md5.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/char_traits.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/base64.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/language.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_util.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/format.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/time.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/memory_resource.o', +- 'third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/error.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/parse.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/preprocess.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/common.o', +- 'third_party/rapidyaml/rapidyaml/src/c4/yml/tree.o', + ] + + MODULE_SOURCES = ['python/_jsonnet.c'] +@@ -72,6 +51,8 @@ jsonnet_ext = Extension( + '_jsonnet', + sources=MODULE_SOURCES, + extra_objects=LIB_OBJECTS, ++ libraries = ['md5', 'jsonnet', 'ryml'], ++ library_dirs = [os.environ.get('CMAKE_BUILD_DIR')], + include_dirs = ['include'], + language='c++' + ) diff --git a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild new file mode 100644 index 000000000000..e089beab3200 --- /dev/null +++ b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( pypy3 python3_{7..10} ) + +inherit cmake toolchain-funcs flag-o-matic distutils-r1 + +DESCRIPTION="A data templating language for app and tool developers" +HOMEPAGE="https://jsonnet.org/" +SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz" +IUSE="custom-optimization doc examples python test" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +RDEPEND=" + dev-cpp/rapidyaml:= + dev-cpp/nlohmann_json:= + python? ( ${PYTHON_DEPS} ) +" + +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +BDEPEND=" + python? ( + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + ) +" +RESTRICT="!test? ( test )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch" + "${FILESDIR}/jsonnet-0.16.0-libdir.patch" + "${FILESDIR}/jsonnet-0.16.0-cp-var.patch" + "${FILESDIR}/jsonnet-0.18.0-unbundle.patch" +) + +distutils_enable_tests unittest + +src_prepare() { + cmake_src_prepare + use python && distutils-r1_src_prepare +} + +src_configure() { + use custom-optimization || replace-flags '-O*' -O3 + tc-export CC CXX + + local mycmakeargs=( + -DUSE_SYSTEM_JSON=ON + -DBUILD_STATIC_LIBS=OFF + ) + + if use test; then + mycmakeargs+=( + -DBUILD_TESTS=ON + -DUSE_SYSTEM_GTEST=ON + ) + else + mycmakeargs+=( + -DBUILD_TESTS=OFF + ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile +} + +src_test() { + cmake_src_test + use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test +} + +python_test() { + LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \ + || die "Tests failed with ${EPYTHON}" +} + +src_install() { + cmake_src_install + use python && distutils-r1_src_install + + if use doc; then + find doc -name '.gitignore' -delete || die + docinto html + dodoc -r doc/. + fi + if use examples; then + docinto examples + dodoc -r examples/. + fi +} diff --git a/dev-lang/julia-bin/Manifest b/dev-lang/julia-bin/Manifest index e017b7040cd9..0ffbdd30a653 100644 --- a/dev-lang/julia-bin/Manifest +++ b/dev-lang/julia-bin/Manifest @@ -1,21 +1,18 @@ -DIST julia-1.6.3-freebsd-x86_64.tar.gz 109341094 BLAKE2B 01f0f46a0fcfaf7bcb5b1d7c5a9aa2f8c6a4306e2b1e08cc4b1d17253ae972a14ff2231fc1a7661cd2d22b662ecc36c12fd6432226d9734b455eb99f3435f090 SHA512 c460c58696ea1afe13302f42d9170b119bb6e18d8eecfc873dc56fa1bcbc30cf16ca41b09857db8be5aed57846f8f8e33b3168ee1710b66e25cc6d9991f1ce48 DIST julia-1.6.3-linux-aarch64.tar.gz 106465939 BLAKE2B 8d4092157075ffd425b161188cecd4f71aed89c6c3e65b078e5d617025b4d414ab5267d5fb18253ed668551492340e3bc2fc19538c024b70a19ebda12934da97 SHA512 7ff665cbbf0f975252ba30375d1fbdaf7985d0983cfa1089f164e55c0035f1300cffe4506f5838cabf5afadf0b4fc69a82a04800dbe73c6fbd886b9eb0e8d5ee DIST julia-1.6.3-linux-i686.tar.gz 110176346 BLAKE2B caf8d709cb772b59dfdd6a4c081685e078e37eb219ca825b2495a93b4fe76fa9d40af4951e9cbce8da8e176870f396728201a53606b2c8a4bccffe186f7163fa SHA512 722e9027c1330cb9d6d1e9ba4d3bc0df2a38251fc0fccc4d88967079e2f38533d750e4ce2b6190705cccb30dc997e27289f0ee18109c46c5c92854f9e32b55fa DIST julia-1.6.3-linux-ppc64le.tar.gz 98825445 BLAKE2B 0dc2416ebac51c71c4a3e8fb3b36781f32e4578e43c88894ed35f6cc50698c72486e354952ae5e9badaf4a949c9a1b4bceeca999dde706d62de44e48efca4361 SHA512 19d61d8424b5ab543f37d74677b8dfdce857e45cdf7e0ec7b2d421a34f0e567a2db6de1f9c740a1069b30b2a4cb046c0230acece8f6788cc24d5cae375f3fdaf DIST julia-1.6.3-linux-x86_64.tar.gz 113399344 BLAKE2B 513a6794c52043f1cb5c6bc957faab978c1ee6a96654dbc3d7393113f12efb5fb39aa0605b726b280bad3daf6363a314323804b99d37aaafff96fb28580c2f39 SHA512 b6faa72c6bddbce7b8a9dd1b2187bdb37525af41a62bdecbf61a7a9d9d4d6d5a51adc06f061fe5fdf17917200e06cf5db8aa9bb3e3db609ff83b0afc57574ca6 DIST julia-1.6.3-musl-x86_64.tar.gz 112357454 BLAKE2B 2a2f50935e078befed75e6f02c5a3266b14702a14f929d8e19ae35e242051e51290eb8306646e401a9c47282e69592b18973ce7643e46c2256e2bde7f2efbe39 SHA512 c054d4a147c424434ee1dfcfbabbdb865bff0740b8446d7c7884675b3ad4d77e68c5dcfff17c2df34a1c0dd7f9beae196a7e905e672160f191ba85e9fbfcddff -DIST julia-1.6.5-freebsd-x86_64.tar.gz 109273854 BLAKE2B 6d9c4515d40fe7eb4225be8a8e1bacdc26f4352d17a436a3e22be6bc41d398d32d75e3cb69e6b16fd2bf8096624cfd0df1cb299712fa6d0d735c78d75859575c SHA512 1c93fe06b47ded67e5acdbb3dc267da7f2ba2662125b5094b23f62797951452c55c9fb6d694bed98d3d65e2e8bc3a8b00a7bd69b79957c736445cc9f4a8b3e9c DIST julia-1.6.5-linux-aarch64.tar.gz 106463482 BLAKE2B eedd2475dd27fb5987d96a75099b25e0b5b30671a2fe6aa2f22da3ce98922dde1b02830a3dbd4d5665dce9a41dd2e50039fce9d00fc402566bd255ff33447590 SHA512 6674fbf6b959e999820342134bb1ce9ed09c26d1fc914de0a6323d8b9cf84b56f0e9e775ec20f9249c1537d4f770188a404c21c510fa5656d6d94c209dd0fa22 DIST julia-1.6.5-linux-i686.tar.gz 110088848 BLAKE2B 69aca0e09829d7be2466fe1fa4e105d3c82bb7f045ee61e2c88b478c92dc3ed1193dcf9b12e4cbce1335b193d5499e917d0e4bc13fae5d05607f54b89d5c371e SHA512 1e4e4268ecc62e81a015d04ba493458380c075e8c97dd9e15256ec34357ac7862454fc9ea8de6bba8fb82da234131910e1d8d8f01cac032bea4e8a54c931bb88 DIST julia-1.6.5-linux-x86_64.tar.gz 113278959 BLAKE2B d70755a03ef3afe801400a6d8cbd817a873628a6cc77601ee53fbc45adecbc43067fdca021d817562864413f5bac09d3e87dd22834923d33cb9db32e8375b643 SHA512 cb07b609cf0dd3c67facba29def9d40bd55c5e7d8163bfd32ee2486b39cb31db9a4fe751b21ac69ebb128c4a146a11ccb27701d7729b6e2f0c32a5e983f1229a DIST julia-1.6.5-musl-x86_64.tar.gz 112330991 BLAKE2B 08a63d36ccbe3a1548fd6d8f4e6d310ec0c4a292550232aaf41d9bec4b39f9a559d09a1eeb4112a9d5d2e60c8baa1f29e21c3b63eda468de81215ac9ee2c5266 SHA512 c7d4946884d1348a291946b7acfa5f10ef8552e33c78b953681417f4b56913c3f496d8e1ad9334aae2d8b13386b0e07beee57b5015811b57f4bfdafbed6ed177 -DIST julia-1.7.1-freebsd-x86_64.tar.gz 116482170 BLAKE2B 8cb3b70e6d7776f5259302cf174bf5fa1314463e677306ea6a29c46ab6e67cf2b5778afdd06a75a941806ba2ad61ae6f221413d11a9845950b4e365e3add2516 SHA512 156d7e1f0b0a03f5869b53c9ab85010b656db8c8b14d8de5a824181cc6cf89ab1930d5251da5393316e3b96a5cf58169e434a5ca09b2862a6e1ed7b07781c7c7 DIST julia-1.7.1-linux-aarch64.tar.gz 116035373 BLAKE2B a031b50152fb330c6eaad935fd5a1dd10937e0744c1936146e19baa713ee63d29c43468c8ddb787b4e74a98f733995fd6cb718a96fa56613d60f49aba2530902 SHA512 6caf6df0128dcd3fe9cd4c42356dc53e918c920f286fcefd6518d8eb0e6a7e1b34099bd5ccddae89f5f74b78d33582ad6a33d57781578558cb8b9a97ea5eb900 DIST julia-1.7.1-linux-i686.tar.gz 118868387 BLAKE2B a6681b32f78d3bd986819e88ac16058d13fb435b5cf781ad9251d736b60071f1f77b64ff2ea98c26bbe31efe704bb7baecdae766bde7d1c18c7b1554b8ed504c SHA512 d3eeeed36a4f84e380524820719e76f00721a982bdc7800bdb9eea3fddcfbba3aab7b56d020d3332a261e71516af524354619eb443c9e4b29a8db721287f5033 DIST julia-1.7.1-linux-x86_64.tar.gz 123374573 BLAKE2B 66ec84784493682f7de2568bbf0fbdd99ec4fba7461057457fc3daf3bee1eae7fbe8649e64d2bba4f58bf83fc16cfa97d360374b1483c4032919bac204c7dc0b SHA512 9cd5393325e45f1e0250c50e786f326c97e17f63851a99b9a025f2b2a3bf1cac80c57bf58ef0df9bee877ba9c74d99c94b6fe9bd2152c6a0964f708a880872f8 DIST julia-1.7.1-musl-x86_64.tar.gz 122327279 BLAKE2B d19992d803e8c0616d7a95501db7a73c0be6523f956a8c393f74c14825ea6b80d1ea86c9b9f136b4a225b230e74460584c5b0c64e7e872c77fbc5ccee5cde024 SHA512 23a0d791ddad386031131516c0ee5048e158931071c65c52a268c2a838a4378fd3a25f7df48c279f130d8941737c2bb52bbda290672fc076962217cd7300f099 -EBUILD julia-bin-1.6.3.ebuild 1451 BLAKE2B 25923a9954d5a4f49885cad7ca536fd29636f9fc828967a1dd76d696ce46b58a79deb0f4aff78fa9b7b5ab77dd8e120703fc7f733f72de5c5b6a280c40736785 SHA512 0fc40071dd0abe3dd8acf19221e895be81cf86d125de0608233fc5a9d83035a82bd6c1a2b5f06a26be3a54edce25c2df9727df73dec140ab1413bd1ea6e0fee7 -EBUILD julia-bin-1.6.5.ebuild 1371 BLAKE2B a2a666ae13e9fe1801ac3f7b7961649763134d397ec6b607d06dda94bfbefb84743fbc1ab4de0c805c59f64cbb18d73de23e49402cd3207dbb7cfedf970aa206 SHA512 b8689d02388427759105c232c3193345b6fa867f6b64e0eac76638138bec4e8cf36a523ebc4d43cc611ad0775f2c5b0af5a8e4b22e928ac9534bbfe4482ceb06 -EBUILD julia-bin-1.7.1.ebuild 1378 BLAKE2B 2d0b1e5f9bcde8be65e2f2c6a0a23092d7937191b6c695694944075e042a4f6ae39dc80b831ec477f2ed14bb6eea8ab612ec71a8ed15263b352113790f885244 SHA512 b40ad72a84e7cd8e85cef5fb388f04608e3518293c357f23ce5a916c522265e0f2c00444bfbe208a1935513576c27404469832b74747aa16c70fdb6ebdaf58ae +EBUILD julia-bin-1.6.3.ebuild 1367 BLAKE2B 22a35685cdcc22a10242b357d68fdca05605bdc47a05be58fd1a567d437f1af6dd4189b8d22bc20c5251e4711565f85ca21bb5c64ff8fd458cf77556ef1115d8 SHA512 a0fb39252a4eec2d8afb4f0d24eed20f73f1ee15f4897139c77033faaac7e969e618efbf5a51e4d7153953417a6aa1235cd179878c1313f25916ac88bd4a00b3 +EBUILD julia-bin-1.6.5.ebuild 1287 BLAKE2B c209056bf5f8cb3450c8161b1cd95da530a0c00e32305b7c4dffc5881a3448c0ae45765006d6972908d4648f191cd74ec7198bcc25e02e2d56108657ad1c5310 SHA512 953433c752af441cee43c836bce36ccf947bdc364c70b14972ff99b26fd80eba88dd8f48a4c6b9e362620fb27759afd2c0e0b3717260b68902d2209c41c5dfb8 +EBUILD julia-bin-1.7.1.ebuild 1294 BLAKE2B bf94a4f43c418bb0f82d12d082bb30efc01e4ba8c1b5df06177da0ed4ecc59959a6c6f8f8ac83ee365504dadb2b7c9a5ed8159e2a5447cc7bd89c7553af93d8d SHA512 24c161a175af5a9a77bc03a1d690a28f30099331d1925f1d94321bc91e535f5083695a46e761dfdad1413673f867ad4b6b34f9cf7af1f737c3c12db8c0070cfe EBUILD julia-bin-9999.ebuild 1141 BLAKE2B a0800ef858e50a8b35d75abeee304d40b5fef78aa57324401a96d9bad018dc51ea3e076c3e7009caa3851fc2e1ecc9a5db4491ec9616588a87bb1de216528f1e SHA512 4792b49e102f5f9e7cad2326dddab52ee0841827e077439ee7da2ea5c45c0808e90e9407ebafd2bcca91025ce74142099f9323a3cfc0cbef330e512ce5933a91 MISC metadata.xml 1183 BLAKE2B 06fa4e15a89622a77691ffe2bacfd57e3902e091897f5bfa8bf43dda86fe15c3b4c35ad3e551553d94ba523d040107f251b07c29452a06ac79872e7d64ee79db SHA512 0782c75afd623f863add71870b5a6a4b643bd720797c3ab02e02ffe47133dd64f29958cdda5421bcb6d98ce2c5c7227ad1afcdb83c03ac84f30a989883226667 diff --git a/dev-lang/julia-bin/julia-bin-1.6.3.ebuild b/dev-lang/julia-bin/julia-bin-1.6.3.ebuild index 3e5e33082b9a..a193607b8f52 100644 --- a/dev-lang/julia-bin/julia-bin-1.6.3.ebuild +++ b/dev-lang/julia-bin/julia-bin-1.6.3.ebuild @@ -15,7 +15,6 @@ SRC_URI=" elibc_glibc? ( ${BASE_SRC_URI}/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz ) elibc_musl? ( ${BASE_SRC_URI}/musl/x64/${MY_PV}/${MY_P}-musl-x86_64.tar.gz ) ) - amd64-fbsd? ( ${BASE_SRC_URI}/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz ) arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) ppc64? ( ${BASE_SRC_URI}/linux/ppc64le/${MY_PV}/${MY_P}-linux-ppc64le.tar.gz ) " diff --git a/dev-lang/julia-bin/julia-bin-1.6.5.ebuild b/dev-lang/julia-bin/julia-bin-1.6.5.ebuild index 9a4fdcacbe04..0901e3d69124 100644 --- a/dev-lang/julia-bin/julia-bin-1.6.5.ebuild +++ b/dev-lang/julia-bin/julia-bin-1.6.5.ebuild @@ -15,7 +15,6 @@ SRC_URI=" elibc_glibc? ( ${BASE_SRC_URI}/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz ) elibc_musl? ( ${BASE_SRC_URI}/musl/x64/${MY_PV}/${MY_P}-musl-x86_64.tar.gz ) ) - amd64-fbsd? ( ${BASE_SRC_URI}/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz ) arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) " diff --git a/dev-lang/julia-bin/julia-bin-1.7.1.ebuild b/dev-lang/julia-bin/julia-bin-1.7.1.ebuild index d9847a3c745b..e729beeff5e5 100644 --- a/dev-lang/julia-bin/julia-bin-1.7.1.ebuild +++ b/dev-lang/julia-bin/julia-bin-1.7.1.ebuild @@ -15,7 +15,6 @@ SRC_URI=" elibc_glibc? ( ${BASE_SRC_URI}/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz ) elibc_musl? ( ${BASE_SRC_URI}/musl/x64/${MY_PV}/${MY_P}-musl-x86_64.tar.gz ) ) - amd64-fbsd? ( ${BASE_SRC_URI}/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz ) arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) " diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index e7d3decb2066..c1aae0e7fc3d 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,30 +1,29 @@ -AUX julia-1.1.0-fix_build_system.patch 1651 BLAKE2B 62123d16fe25bd6d77ac7af05297bc2cb5529b58943fcd13060f0b2b3f329571ebbd82208793651ac5120cd4ed19b6eca6c3d0c829509288460a9e0e78817b48 SHA512 70f5cf43261216e16001acc2c64e0bc1457e1fd48a918b218f8b0b21877a44c274f3aad81f68f7176665ec94c2d17f89a880e1c0a9332beae9d25668f9a85a25 AUX julia-1.1.0-fix_llvm_install.patch 680 BLAKE2B ca0d95c503b8f6e76722d54147f7a64cda5781cefc6e05ed7cfc631b356c3131d43ce6703da6c61b791da08836d9a6b5b494556c2a0ecba8960f8a9395b2d66a SHA512 4d474c1ab1d74aeb98367d55ec557e22e43a3e3d35615b7cde20fb9a194b94f24237735ad431800ded6e120beae9d2d3706b778ea7f26409790e3649ba39117b AUX julia-1.4.0-no_symlink_llvm.patch 335 BLAKE2B 0df56ed45619df80b669bc790e0f93e475c94dac39fc8efcbdaa677a6ab02a6a3f832abf07990e8f50df8d900147f5e0ac9e2896edbbc4a015e49e74864315fa SHA512 563ed79132655b8c28a01d17fb8765ed774c069e00d29847f864152f7641b53758c6d8ba5544789e8d3aeb0e1686ea946c31837b1e1b0a6f4bce6d531d5511ed AUX julia-1.6.0-fix-hardcoded-libs.patch 1524 BLAKE2B 65e07624f908faeced4b90bc74bf67c8c21e36e172590d071f5bd1d2b74f50ce9f948eff41e9048a776d12d840b36a6f0e40c37972716ab5ab515c02da395d52 SHA512 acd51d0e61eb4241a5d8095f53fc28bd790990664df247027123d5602d7bf1b71b6aed10974087698d1e0d7d70c59a4e30f3565b8cf897f6f5028c8a9af560e0 -AUX julia-1.6.0-fix-system-csl.patch 11191 BLAKE2B 224ce4e2abe11c2b4d91b63e6f717080150baf45219d2c94f31d78d962db5b139d791ce8d2761b7ac4e22201d4b5770ac9211d354b24285da3ca7e0b78f00baf SHA512 bb32848b96b7933f11c9db2d52494576e4b669c375721e7715654370413733762077a670a1102cb27d177b6ee798e312c7388febfef98948bcb39fad67d815b9 AUX julia-1.6.3-glibc-2.34.patch 1111 BLAKE2B 739af8b2b8c07113f7d5c6d0eaa92dc4bb9f6fc7968c6df00ef671ed89011bbb4ca232f3428fb3427067b28cceef350c1b42fb40b6eaca38304fbe2978f0ad99 SHA512 f09ff9e3ff163c9dc84c0b875b1caa74ccbf2fcc78719389e15dbd5b3fbac10f27f472e5d1f72890f8adb429b78e5ddff825a8637c5195e1952f497d8f5ea895 AUX julia-1.6.5-do_not_set_rpath.patch 1052 BLAKE2B 4f25a12c9cd6e345ecb1551c52ced8671984732fd673c88176bce8c4b9057785cd806987f60bd8c756c7c486ba80dafbc3f0b4314ab29c3156c22e7c508d1a60 SHA512 49e60f32bbc0e6d2df77f2f732b5a8bf23cfa7392eb5eac2eba70d85b07cfde19b3f4b0c41542d69bc71526f99401e6fc7ee78fc1cc15738e1145876786b0d1a AUX julia-1.6.5-hardcoded-libs.patch 2704 BLAKE2B 253d67a5de0278abf17d05f8e9a7f000f89f91d44779e4e93aa8b1a6388283af31e902913892a48ac4d587a6e009b69a4e81358cdd66b9e5471fdd7594482b85 SHA512 a498df49722f53cd598504fea47d54ec25d31f625342d47fb5f810e26ae73781597f6d008ce0f2978dd36c6bfb986c5ab4ce92ef1b6d01f31be8fa4add90553d AUX julia-1.6.5-lazy_artifacts_fix.patch 992 BLAKE2B 427a6b69fd07aed3bffc360e0ebd9fe9a15628ea0d2b5d3ac9821ebf2b029446f48f3cafb68a040c1f0deaec874a8350b791598a45794ee83d4ea55d8d16a511 SHA512 e21d53fa24db24966e536d342a0ebb4d6872df0968e4868db704a9d8398b6a1064fc7b00e395048143a4f55740fd1cf1b1c0bae9e53492041820ed54b86f320a +AUX julia-1.6.5-libgit-1.2.patch 800 BLAKE2B 669c30ae7c00c69feb7edb34d87c3c19ab7015d8634cd3c052a8f6ee2a28be7c7314e01298e95f9d4b00851feb6bab48c44d15eb425f912050f31b26db57c912 SHA512 a4facb24520d8bfe4486291e3537bb5d56ce5fd1aebd9c1ebe657306d0e4a9cfa8cc235c2d715c1b9f4ecb3359cf3ea1dc0b4ff68d4c9a29ff578b4c667d09a2 +AUX julia-1.6.5-llvm_13_compat_part_1.patch 6957 BLAKE2B 581076ba652db52a3948c9bb42c5a2481b5fffa92fb1dcbcd007f2edb3a950ac49ec015f7571c29b50ae243d5e8e9e25952b7cbac9a3b5ec8bd94769104e2891 SHA512 5a7d8202ede9daed2149f3bc30dcf76d0d25f1734b91df3780b405fbd493f4a6f75c851f97a8d27e9ea5753f5003af3c5eb8193ee61cf5808acf56dca1ebb0ba +AUX julia-1.6.5-llvm_13_compat_part_2.patch 2897 BLAKE2B 7896e392fb8c2364fa10921f7396206fb6785dc430256646a537dcfb0c05a7d8faaa33feab7dad61c6c6e57c33f89eb0ce1eea85c3148622e61b3f0ce83c2164 SHA512 f8a7060236afd28da260e8dff5d69b2562d9cd204f090e1868592aa9d59df015a3a6d0bb19e1dfbaaa3825a8b81152f0e154e06cd31c87e89916269bbef68203 +AUX julia-1.6.5-llvm_13_compat_part_3.patch 13351 BLAKE2B 76a72595a104ce290bce7a37ca6f3f29754753ac20ed3c2beeb9fce92d5aeda2b1396e523f70c0fb2eb16d4dc9cc888ebb5e78bc22f2689335cfca11f6b77630 SHA512 128896ab9bf161d7b596a0330977a598f57c19e34066281e7aa2d512e66f1a9d2bbff537af5b5b99198bef7a02e17a32eaafcff6f1ac2bfeef525e0763bf96b7 AUX julia-1.6.5-llvm_13_compat_part_4.patch 1176 BLAKE2B 929f811f68f327b65a4e0505cc9ffb161c889873084d84ff2f1967fccc2e66a49889c8d7786179be0cf0d1072646fbd24575d98d890c47cee4128fb28e746fd0 SHA512 a56d53afef18c2f7af5088f60085d83592204ebf53670571bd76a4dfb07f286eb7d46f23c54176a8148dd8665ec3ba3419429ab435bc037841daf3084b065df6 AUX julia-1.6.5-llvm_bad_perf_fix.patch 1261 BLAKE2B 2cd62550b5de1bbe81dbad29dd04d9316dc811db124056afc45505f33d38139a903a05e91457e58039f8f9a06673cbe5fe971c1e0d4c73d47018a6123b4c20ff SHA512 a9ce3f1a7a6f88c5e6afd6a024aa9c9cf938a003220d1adb986840da7f9ac5ff8d54c6539cd64beef108c688592e3a7fe20cc2bc86aaf0b92d5534463ca5246a -AUX julia-1.7.0-do_not_set_rpath.patch 1432 BLAKE2B aa4cbe505b8c26da05cab44f09c6457e978ce7e54b57d4e5065bb75eeb378d27e7bbd68cf64e8f1b2f31ec68172b80e08c825fb53e8319c4a66e1d00e7176e7c SHA512 9e5b71b773a1d64f369ae5002800d5291209b9b4cc16587550b013b2dfaa1311b0016f76862565575bba6a9989cbc7d2fa8dbe6d4925e25b20f7ae75f97a2a25 -AUX julia-1.7.0-hardcoded-libs.patch 2548 BLAKE2B fa09f79826ba95c4bbbf094e19789aa670c980a936705b2904fda1615174814a13b7f8d128f969dcaa9f7e976c949bfff15aff2ce7008847e19080cc291d56c8 SHA512 934b4e147e25f003944da64feeae971164aed055d7442f80f4598f5c714cc431dad79d9504d60ca09bd0974ec1dfac8eb7db028af441ce6e2095d9acae6ab370 -AUX julia-1.7.0-libgit-1.2.patch 800 BLAKE2B 669c30ae7c00c69feb7edb34d87c3c19ab7015d8634cd3c052a8f6ee2a28be7c7314e01298e95f9d4b00851feb6bab48c44d15eb425f912050f31b26db57c912 SHA512 a4facb24520d8bfe4486291e3537bb5d56ce5fd1aebd9c1ebe657306d0e4a9cfa8cc235c2d715c1b9f4ecb3359cf3ea1dc0b4ff68d4c9a29ff578b4c667d09a2 -AUX julia-1.7.0-llvm_13_compat_part_1.patch 6957 BLAKE2B 581076ba652db52a3948c9bb42c5a2481b5fffa92fb1dcbcd007f2edb3a950ac49ec015f7571c29b50ae243d5e8e9e25952b7cbac9a3b5ec8bd94769104e2891 SHA512 5a7d8202ede9daed2149f3bc30dcf76d0d25f1734b91df3780b405fbd493f4a6f75c851f97a8d27e9ea5753f5003af3c5eb8193ee61cf5808acf56dca1ebb0ba -AUX julia-1.7.0-llvm_13_compat_part_2.patch 2897 BLAKE2B 7896e392fb8c2364fa10921f7396206fb6785dc430256646a537dcfb0c05a7d8faaa33feab7dad61c6c6e57c33f89eb0ce1eea85c3148622e61b3f0ce83c2164 SHA512 f8a7060236afd28da260e8dff5d69b2562d9cd204f090e1868592aa9d59df015a3a6d0bb19e1dfbaaa3825a8b81152f0e154e06cd31c87e89916269bbef68203 -AUX julia-1.7.0-llvm_13_compat_part_3.patch 13351 BLAKE2B 76a72595a104ce290bce7a37ca6f3f29754753ac20ed3c2beeb9fce92d5aeda2b1396e523f70c0fb2eb16d4dc9cc888ebb5e78bc22f2689335cfca11f6b77630 SHA512 128896ab9bf161d7b596a0330977a598f57c19e34066281e7aa2d512e66f1a9d2bbff537af5b5b99198bef7a02e17a32eaafcff6f1ac2bfeef525e0763bf96b7 -AUX julia-1.7.0-make-install-no-build.patch 691 BLAKE2B 4f36445f2067c4b983f3ece17cd3866adc1df39ef6b02714dffe10df8febd326cba9f7a1b85f52bef739d4e15a906e9d1990315f974b981c5ecc8b4c7a487113 SHA512 4be8de4913b58a3a84782f08a569b96741f8c9c7ff3378e34624ad9b250c7c7f2dbed9a1d2a8227f105802a89e589ef4abd3d512793d90741dd35c56a8fff75f +AUX julia-1.6.5-make-install-no-build.patch 691 BLAKE2B 4f36445f2067c4b983f3ece17cd3866adc1df39ef6b02714dffe10df8febd326cba9f7a1b85f52bef739d4e15a906e9d1990315f974b981c5ecc8b4c7a487113 SHA512 4be8de4913b58a3a84782f08a569b96741f8c9c7ff3378e34624ad9b250c7c7f2dbed9a1d2a8227f105802a89e589ef4abd3d512793d90741dd35c56a8fff75f +AUX julia-1.7.1-do_not_set_rpath.patch 482 BLAKE2B a68093aad4c76238abeba55d36162ffee2f943952f0e30f1615bbfa002aa219140a85092edbd12d0f93f39c9cdadc1b7427e76c9f290462d4552233f6673f186 SHA512 612652792c5e0cabd1300120fb7556b026cb16d8890ed267a6e90bbc46ca8c7f62dcbc00aee4cfefd08a400f5d7c8cc219e32f90f513783cd7fc096e9c1704f9 +AUX julia-1.7.1-hardcoded-libs.patch 2548 BLAKE2B fa09f79826ba95c4bbbf094e19789aa670c980a936705b2904fda1615174814a13b7f8d128f969dcaa9f7e976c949bfff15aff2ce7008847e19080cc291d56c8 SHA512 934b4e147e25f003944da64feeae971164aed055d7442f80f4598f5c714cc431dad79d9504d60ca09bd0974ec1dfac8eb7db028af441ce6e2095d9acae6ab370 DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc -DIST julia-1.7.0-full.tar.gz 255670801 BLAKE2B e7c5be50ab9e7014f028cf7d0530b269e78dd798dc3d4a88af2ed9fa1331694e39fbcae26d2cae6f15aaf1087656384c9872f344f99121406abdf2902a200176 SHA512 00e1bfe354010f5d900476e46b471c4425b711fff5a2aa0ac9e5dbe6ff02245011d4297e4703f2d46f7d4e7b6d97ffaf1bc63170edbfec440196c5ec75c984ce DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638 +DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f +DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 +DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8 EBUILD julia-1.6.3.ebuild 4604 BLAKE2B 8e5a273feaf93fa44aaf5f4e37ba429125006566184f65af6309e118799d9087a523317322dea5282c39c919a492fa28b24c8fedec5290bee6265cd50e145718 SHA512 2f06acbc40b6d081e15433d374ce268d0a4a290f1f720a690ee0d5bb94b6f99688ba996989b340f0b4801a70574c942ba93ea0ccd381cfe4cf0e5df75e3e89c7 -EBUILD julia-1.6.5.ebuild 4693 BLAKE2B 71714cd0cd3e05fddc25fbd29210b9e1f3e1b4d7381a15958d337785018f75c104bd70637137dc89c803f71aae221e6f03aec09d92c10eea89386cef0fcd8bf9 SHA512 70ef664f044b03f704343b0517b83f978e61be25a335ba8211dd7ebe2fc57a6e4dc66b03aab6df1770bb24e07b5ecf22947d614b962cea0030c75ded3fca0987 -EBUILD julia-1.7.0.ebuild 4496 BLAKE2B e35e93a9084ac3708ab28c42cee312534d498213cff1c93fe5bd38cd89fd2d09cda66406fbdaa490e0598724f90b7e565b8d8d2988f1b25b2abc1e961dc1f2c2 SHA512 3d1d621f65954bee0cb0aae9a2799769abd784f292d7909d5bb506c0d89094dc934ddb16343b5fcba714a4a0228fed8f237d15eb10d25cad9ed323f6e25ad46e -EBUILD julia-1.7.1.ebuild 4496 BLAKE2B b7694f1cc0d4e98ec94f5e625e1b9c52016fcda626b0d0f45edceabef3d9b9f8a517a974f95d1008cfaba5e400f524a350741e22c5a98e9703dc5db55f4e6349 SHA512 e925d620de4a833fb0322a97d725b31df3ddbab116a925a2d303fae0bfda8a96b14fd1ceb7c1cc9a6c5387ed854136b3a5cc93d5e90f1f33e889a806a16a7c6b +EBUILD julia-1.6.5.ebuild 4693 BLAKE2B b1fad8bab8f2b9f4a70f85eff2c7f0896c05a3b833b7edbc40cf5c1afe64e9b8ea906394c3d3e74d30c46ad63f529ebcd383b87a239265977eddacc6d41c9827 SHA512 d65a2eae5a4b08aeccbb48a1771976fdb7c638e783ad3cb7845438dbecb4d3647e567a2a88f61fe8143055f86aaf045efe3b387d8668743b0c7aa0fde69b49f0 +EBUILD julia-1.7.1-r2.ebuild 4899 BLAKE2B fe19a2cae8bfaff1b000df2f6babf5d708c978d13601e02c7f9cb306fe83261e2523ae571f3e6e666d66c425f407b1cfae054471354447592bd4cfc8e1e97d59 SHA512 858702e1facb9b8312b0f34d77ac13427eb368e5c079dffdeffb8be42a063fdfe5f2efb624f75a0d4d2eabce15cf992f2f9bd77f8d2f4d66635f3a7e8ebd4f93 MISC metadata.xml 1530 BLAKE2B 776f8e2eaaebf6a0429b9019ec606c76f80828c5d27ec07f6503e855d44f681a476d9fe0631de0eb0f609b0256e063c172e8fbfacd3e37118e66c07ade2cb42d SHA512 d172e00e631a7a4e4b61c0f3ad90849b189c8b8aa8586fceb63c26ca407c4e477339f51b05d48681be37d06b873d6c2fce62b61efb4b9874323d92022d570288 diff --git a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch deleted file mode 100644 index 394f5900a90e..000000000000 --- a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index 81ff923..79e47f1 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1 - # Directories where said libraries get installed to - prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) - bindir := $(prefix)/bin --libdir := $(prefix)/lib -+libdir := $(prefix)/GENTOOLIBDIR - libexecdir := $(prefix)/libexec - datarootdir := $(prefix)/share - docdir := $(datarootdir)/doc/julia -@@ -417,7 +417,7 @@ ifneq ($(OS), WINNT) - JCXXFLAGS += -pedantic - endif - DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -ggdb2 -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECLANG),1) -@@ -428,7 +428,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := -fasynchronous-unwind-tables - JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -+SHIPFLAGS := GENTOOCFLAGS - ifeq ($(OS), Darwin) - ifeq ($(USE_LIBCPP), 1) - MACOSX_VERSION_MIN := 10.8 -@@ -457,7 +457,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := - JCXXFLAGS := -pipe $(fPIC) -fno-rtti - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECCACHE), 1) -diff --git a/doc/Makefile b/doc/Makefile -index 99e60ee..2027fb5 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -30,7 +30,7 @@ deps: UnicodeData.txt - $(JLCHECKSUM) UnicodeData.txt - - clean: -- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt -+ @echo "Do not clean doc/_build/html. Just use it..." - - cleanall: clean - diff --git a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch b/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch deleted file mode 100644 index 90a097197bff..000000000000 --- a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch +++ /dev/null @@ -1,271 +0,0 @@ -From 71d7a8a8c12b72bfa362ae955d2ce4dfbdf5b8ba Mon Sep 17 00:00:00 2001 -From: Elliot Saba <staticfloat@gmail.com> -Date: Fri, 26 Mar 2021 18:40:07 +0000 -Subject: [PATCH 1/2] [build] Add `symlink_system_library` calls for CSL - -We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration -(where we copy the CSL libraries into the Julia build tree) versus a -`USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner -similar to other system libararies) ---- - Make.inc | 23 +++++++++++++- - base/Makefile | 88 ++++++++++++++++++++++++++++++--------------------- - deps/csl.mk | 40 ++++++++--------------- - 3 files changed, 87 insertions(+), 64 deletions(-) - -diff --git a/Make.inc b/Make.inc -index 519720a861ed7..7cba05806e684 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -596,6 +596,21 @@ else - SHLIB_EXT := so - endif - -+ifeq ($(OS),WINNT) -+define versioned_libname -+$$(if $(2),$(1)-$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT)) -+endef -+else ifeq ($(OS),Darwin) -+define versioned_libname -+$$(if $(2),$(1).$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT)) -+endef -+else -+define versioned_libname -+$$(if $(2),$(1).$(SHLIB_EXT).$(2),$(1).$(SHLIB_EXT)) -+endef -+endif -+ -+ - ifeq ($(SHLIB_EXT), so) - define SONAME_FLAGS - -Wl,-soname=$1 -@@ -1147,6 +1162,8 @@ BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE - BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))) - BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))) - -+LIBGFORTRAN_VERSION := $(subst libgfortran,,$(filter libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN)))) -+ - # This is the set of projects that BinaryBuilder dependencies are hooked up for. - BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL - define SET_BB_DEFAULT -@@ -1479,8 +1496,12 @@ ifneq ($(findstring $(OS),Linux FreeBSD),) - LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1 - endif - -- -+# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir -+ifeq ($(USE_SYSTEM_CSL),1) -+LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME)) -+else - LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBGCC_NAME)) -+endif - LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBGCC_NAME)) - - # USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir -diff --git a/base/Makefile b/base/Makefile -index e024e546f94d3..2bef6aab7f1f4 100644 ---- a/base/Makefile -+++ b/base/Makefile -@@ -169,53 +169,69 @@ endif - # echo "$$P" - - define symlink_system_library --symlink_$1: $$(build_private_libdir)/$1.$$(SHLIB_EXT) --$$(build_private_libdir)/$1.$$(SHLIB_EXT): -- REALPATH=`$$(call spawn,$$(build_depsbindir)/libwhich) -p $$(notdir $$@)` && \ -- $$(call resolve_path,REALPATH) && \ -- [ -e "$$$$REALPATH" ] && \ -- ([ ! -e "$$@" ] || rm "$$@") && \ -- echo ln -sf "$$$$REALPATH" "$$@" && \ -- ln -sf "$$$$REALPATH" "$$@" --ifneq ($2,) --ifneq ($$(USE_SYSTEM_$2),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_$1 --endif -+libname_$2 := $$(notdir $(call versioned_libname,$2,$3)) -+libpath_$2 := $$(shell $$(call spawn,$$(build_depsbindir)/libwhich) -p $$(libname_$2) 2>/dev/null) -+symlink_$2: $$(build_private_libdir)/$$(libname_$2) -+$$(build_private_libdir)/$$(libname_$2): -+ @if [ -e "$$(libpath_$2)" ]; then \ -+ REALPATH=$$(libpath_$2); \ -+ $$(call resolve_path,REALPATH) && \ -+ [ -e "$$$$REALPATH" ] && \ -+ ([ ! -e "$$@" ] || rm "$$@") && \ -+ echo ln -sf "$$$$REALPATH" "$$@" && \ -+ ln -sf "$$$$REALPATH" "$$@"; \ -+ else \ -+ if [ "$4" != "ALLOW_FAILURE" ]; then \ -+ echo "System library symlink failure: Unable to locate $$(libname_$2) on your system!" >&2; \ -+ false; \ -+ fi; \ -+ fi -+ifneq ($$(USE_SYSTEM_$1),0) -+SYMLINK_SYSTEM_LIBRARIES += symlink_$2 - endif - endef - - # the following excludes: libuv.a, libutf8proc.a - --$(eval $(call symlink_system_library,$(LIBMNAME))) - ifneq ($(USE_SYSTEM_LIBM),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME) -+$(eval $(call symlink_system_library,LIBM,$(LIBMNAME))) - else ifneq ($(USE_SYSTEM_OPENLIBM),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME) -+$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME))) - endif - --$(eval $(call symlink_system_library,libpcre2-8,PCRE)) --$(eval $(call symlink_system_library,libdSFMT,DSFMT)) --$(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS)) -+$(eval $(call symlink_system_library,CSL,libgcc_s,1)) -+ifneq (,$(LIBGFORTRAN_VERSION)) -+$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION))) -+endif -+$(eval $(call symlink_system_library,CSL,libquadmath,0)) -+$(eval $(call symlink_system_library,CSL,libstdc++,6)) -+# We allow libssp, libatomic and libgomp to fail as they are not available on all systems -+$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE)) -+$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE)) -+$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE)) -+$(eval $(call symlink_system_library,PCRE,libpcre2-8)) -+$(eval $(call symlink_system_library,DSFMT,libdSFMT)) -+$(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME))) - ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME)) --$(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK)) -+$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME))) - endif --$(eval $(call symlink_system_library,libgmp,GMP)) --$(eval $(call symlink_system_library,libmpfr,MPFR)) --$(eval $(call symlink_system_library,libmbedtls,MBEDTLS)) --$(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS)) --$(eval $(call symlink_system_library,libmbedx509,MBEDTLS)) --$(eval $(call symlink_system_library,libssh2,LIBSSH2)) --$(eval $(call symlink_system_library,libnghttp2,NGHTTP2)) --$(eval $(call symlink_system_library,libcurl,CURL)) --$(eval $(call symlink_system_library,libgit2,LIBGIT2)) --$(eval $(call symlink_system_library,libamd,SUITESPARSE)) --$(eval $(call symlink_system_library,libcamd,SUITESPARSE)) --$(eval $(call symlink_system_library,libccolamd,SUITESPARSE)) --$(eval $(call symlink_system_library,libcholmod,SUITESPARSE)) --$(eval $(call symlink_system_library,libcolamd,SUITESPARSE)) --$(eval $(call symlink_system_library,libumfpack,SUITESPARSE)) --$(eval $(call symlink_system_library,libspqr,SUITESPARSE)) --$(eval $(call symlink_system_library,libsuitesparseconfig,SUITESPARSE)) -+$(eval $(call symlink_system_library,GMP,libgmp)) -+$(eval $(call symlink_system_library,MPFR,libmpfr)) -+$(eval $(call symlink_system_library,MBEDTLS,libmbedtls)) -+$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto)) -+$(eval $(call symlink_system_library,MBEDTLS,libmbedx509)) -+$(eval $(call symlink_system_library,LIBSSH2,libssh2)) -+$(eval $(call symlink_system_library,NGHTTP2,libnghttp2)) -+$(eval $(call symlink_system_library,CURL,libcurl)) -+$(eval $(call symlink_system_library,LIBGIT2,libgit2)) -+$(eval $(call symlink_system_library,SUITESPARSE,libamd)) -+$(eval $(call symlink_system_library,SUITESPARSE,libcamd)) -+$(eval $(call symlink_system_library,SUITESPARSE,libccolamd)) -+$(eval $(call symlink_system_library,SUITESPARSE,libcholmod)) -+$(eval $(call symlink_system_library,SUITESPARSE,libcolamd)) -+$(eval $(call symlink_system_library,SUITESPARSE,libumfpack)) -+$(eval $(call symlink_system_library,SUITESPARSE,libspqr)) -+$(eval $(call symlink_system_library,SUITESPARSE,libsuitesparseconfig)) - # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen): - # libunwind - endif # WINNT -diff --git a/deps/csl.mk b/deps/csl.mk -index 095d4ceec4a1e..423201cbb5a0c 100644 ---- a/deps/csl.mk -+++ b/deps/csl.mk -@@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir) - [ -n "$$$${SRC_LIB}" ] && cp $$$${SRC_LIB} $$(build_shlibdir) - endef - --ifeq ($(OS),WINNT) --define gen_libname --$$(if $(2),lib$(1)-$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT)) --endef --else ifeq ($(OS),Darwin) --define gen_libname --$$(if $(2),lib$(1).$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT)) --endef --else --define gen_libname --$$(if $(2),lib$(1).$(SHLIB_EXT).$(2),lib$(1).$(SHLIB_EXT)) --endef --endif -- - # libgfortran has multiple names; we're just going to copy any version we can find - # Since we're only looking in the location given by `$(FC)` this should only succeed for one. --$(eval $(call copy_csl,$(call gen_libname,gfortran,3))) --$(eval $(call copy_csl,$(call gen_libname,gfortran,4))) --$(eval $(call copy_csl,$(call gen_libname,gfortran,5))) -+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,3))) -+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,4))) -+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,5))) - - # These are all libraries that we should always have --$(eval $(call copy_csl,$(call gen_libname,quadmath,0))) --$(eval $(call copy_csl,$(call gen_libname,stdc++,6))) --$(eval $(call copy_csl,$(call gen_libname,ssp,0))) --$(eval $(call copy_csl,$(call gen_libname,atomic,1))) --$(eval $(call copy_csl,$(call gen_libname,gomp,1))) -+$(eval $(call copy_csl,$(call versioned_libname,libquadmath,0))) -+$(eval $(call copy_csl,$(call versioned_libname,libstdc++,6))) -+$(eval $(call copy_csl,$(call versioned_libname,libssp,0))) -+$(eval $(call copy_csl,$(call versioned_libname,libatomic,1))) -+$(eval $(call copy_csl,$(call versioned_libname,libgomp,1))) - - ifeq ($(OS),WINNT) - # Windwos has special gcc_s names - ifeq ($(ARCH),i686) --$(eval $(call copy_csl,$(call gen_libname,gcc_s_sjlj,1))) -+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_sjlj,1))) - else --$(eval $(call copy_csl,$(call gen_libname,gcc_s_seh,1))) -+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1))) - endif - else --$(eval $(call copy_csl,$(call gen_libname,gcc_s,1))) -+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1))) - endif - # winpthread is only Windows, pthread is only others - ifeq ($(OS),WINNT) --$(eval $(call copy_csl,$(call gen_libname,winpthread,1))) -+$(eval $(call copy_csl,$(call versioned_libname,libwinpthread,1))) - else --$(eval $(call copy_csl,$(call gen_libname,pthread,0))) -+$(eval $(call copy_csl,$(call versioned_libname,libpthread,0))) - endif - - get-csl: - -From 6536b8519b25db844f2a1866d056879cb87d1c66 Mon Sep 17 00:00:00 2001 -From: Elliot Saba <staticfloat@gmail.com> -Date: Fri, 26 Mar 2021 22:32:04 +0000 -Subject: [PATCH 2/2] Expand `JL_PRIVATE_LIBS-1` for versioned library names as - well - -Without this, we fail to install things like `libgcc_s.so.1` when -installed into the private libdir by `symlink_system_libraries`. ---- - Makefile | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 823ff3b86339d..e08f0e959e1b3 100644 ---- a/Makefile -+++ b/Makefile -@@ -290,8 +290,11 @@ endif - done \ - done - for suffix in $(JL_PRIVATE_LIBS-1) ; do \ -- lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \ -- $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \ -+ for lib in $(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; do \ -+ if [ "$${lib##*.}" != "dSYM" ]; then \ -+ $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \ -+ fi \ -+ done \ - done - endif - # Install `7z` into libexec/ diff --git a/dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch index f0abc7b8f60d..f0abc7b8f60d 100644 --- a/dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch +++ b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch index 1398be7ec873..1398be7ec873 100644 --- a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch +++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch index 5a8c2cde93d5..5a8c2cde93d5 100644 --- a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch +++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch index 43b7925a9ce7..43b7925a9ce7 100644 --- a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch +++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch diff --git a/dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch index 0632a6e726f7..0632a6e726f7 100644 --- a/dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch +++ b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch diff --git a/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch deleted file mode 100644 index 24f12d261053..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/Makefile 2021-12-21 09:38:26.782829864 +0100 -+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100 -@@ -336,7 +336,7 @@ - install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \ - done - endif --else ifneq (,$(findstring $(OS),Linux FreeBSD)) -+else ifneq (,$(findstring $(OS),FreeBSD)) - for j in $(JL_TARGETS) ; do \ - $(PATCHELF) --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \ - done -@@ -357,7 +357,7 @@ - endif - - # Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD --ifneq (,$(findstring $(OS),Linux FreeBSD)) -+ifneq (,$(findstring $(OS),FreeBSD)) - $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT) - ifeq ($(BUNDLE_DEBUG_LIBS),1) - $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT) -@@ -365,7 +365,7 @@ - endif - - # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD --ifneq (,$(findstring $(OS),Linux FreeBSD)) -+ifneq (,$(findstring $(OS),FreeBSD)) - $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT) - endif - diff --git a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch new file mode 100644 index 000000000000..7b8c3c7ba51b --- /dev/null +++ b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2021-12-21 09:38:26.782829864 +0100 ++++ b/Makefile 2021-12-21 10:52:40.760565902 +0100 +@@ -365,7 +365,7 @@ + endif + + # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD +-ifneq (,$(findstring $(OS),Linux FreeBSD)) ++ifneq (,$(findstring $(OS),FreeBSD)) + $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT) + endif + diff --git a/dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch index be7d20368f6d..be7d20368f6d 100644 --- a/dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch +++ b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch diff --git a/dev-lang/julia/julia-1.6.5.ebuild b/dev-lang/julia/julia-1.6.5.ebuild index e7bcae84ca7a..534e938e4e3d 100644 --- a/dev-lang/julia/julia-1.6.5.ebuild +++ b/dev-lang/julia/julia-1.6.5.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=7 @@ -64,12 +64,12 @@ PATCHES=( "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch "${FILESDIR}/${PN}"-1.6.5-llvm_bad_perf_fix.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_3.patch "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_4.patch - "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch + "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch + "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch "${FILESDIR}/${PN}"-1.6.5-hardcoded-libs.patch "${FILESDIR}/${PN}"-1.6.5-do_not_set_rpath.patch "${FILESDIR}/${PN}"-1.6.5-lazy_artifacts_fix.patch diff --git a/dev-lang/julia/julia-1.7.0.ebuild b/dev-lang/julia/julia-1.7.0.ebuild deleted file mode 100644 index 57c446a0e3ab..000000000000 --- a/dev-lang/julia/julia-1.7.0.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit llvm pax-utils toolchain-funcs - -# correct versions for stdlibs are in deps/checksums -# for everything else, run with network-sandbox and wait for the crash - -MY_LLVM_V="13.0.1" - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/" - -SRC_URI=" - https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+system-llvm" - -RDEPEND=" - system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) -" -LLVM_MAX_SLOT=13 - -RDEPEND+=" - app-arch/p7zip - dev-libs/gmp:0= - dev-libs/libgit2:0 - >=dev-libs/libpcre2-10.23:0=[jit,unicode] - dev-libs/mpfr:0= - dev-libs/libutf8proc:0=[-cjk] - dev-util/patchelf - >=net-libs/mbedtls-2.2 - net-misc/curl[http2,ssh] - sci-libs/amd:0= - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - sci-libs/umfpack:0= - >=sci-mathematics/dsfmt-2.2.4 - >=sys-libs/libunwind-1.1:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - dev-util/patchelf - virtual/pkgconfig - !system-llvm? ( dev-util/cmake )" - -PATCHES=( - "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch - "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch - "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch - "${FILESDIR}/${PN}"-1.7.0-do_not_set_rpath.patch -) - # just remove patchelf from linux ?? just my own solution to sigsegv error ?? - #"${FILESDIR}/${PN}"-turnoff-patchelf.patch - -pkg_setup() { - use system-llvm && llvm_pkg_setup -} - -src_unpack() { - local tounpack=(${A}) - # the main source tree, followed by deps - unpack "${tounpack[0]}" - - mkdir -p "${S}/deps/srccache/" - for i in "${tounpack[@]:1}"; do - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die - done -} - -src_prepare() { - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - - sed -i \ - -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ - Make.inc || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." - - # julia does not play well with the system versions of libuv - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - LOCALBASE:="${EPREFIX}/usr" - override prefix:="${EPREFIX}/usr" - override libdir:="\$(prefix)/$(get_libdir)" - override CC:=$(tc-getCC) - override CXX:=$(tc-getCXX) - override AR:=$(tc-getAR) - - BUNDLE_DEBUG_LIBS:=0 - USE_BINARYBUILDER:=0 - USE_SYSTEM_CSL:=1 - USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) - USE_SYSTEM_LIBUNWIND:=1 - USE_SYSTEM_PCRE:=1 - USE_SYSTEM_LIBM:=0 - USE_SYSTEM_OPENLIBM:=1 - USE_SYSTEM_DSFMT:=1 - USE_SYSTEM_BLAS:=1 - USE_SYSTEM_LAPACK:=1 - USE_SYSTEM_GMP:=1 - USE_SYSTEM_MPFR:=1 - USE_SYSTEM_SUITESPARSE:=1 - USE_SYSTEM_LIBUV:=0 - USE_SYSTEM_UTF8PROC:=1 - USE_SYSTEM_MBEDTLS:=1 - USE_SYSTEM_LIBSSH2:=1 - USE_SYSTEM_NGHTTP2:=1 - USE_SYSTEM_CURL:=1 - USE_SYSTEM_LIBGIT2:=1 - USE_SYSTEM_PATCHELF:=1 - USE_SYSTEM_ZLIB:=1 - USE_SYSTEM_P7ZIP:=1 - VERBOSE:=1 - EOF -} - -src_compile() { - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - default - pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" -} - -src_install() { - emake install DESTDIR="${D}" - - if ! use system-llvm ; then - local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) - cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die - fi - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die - rmdir "${ED}"/usr/share/doc/julia || die - - # The appdata directory is deprecated. - mv "${ED}"/usr/share/{appdata,metainfo}/ || die -} - -pkg_postinst() { - elog "To use Plots, you will need to install sci-visualization/gr." -} diff --git a/dev-lang/julia/julia-1.7.1.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild index fad64a3a369e..58f9de7db701 100644 --- a/dev-lang/julia/julia-1.7.1.ebuild +++ b/dev-lang/julia/julia-1.7.1-r2.ebuild @@ -8,13 +8,16 @@ inherit llvm pax-utils toolchain-funcs # correct versions for stdlibs are in deps/checksums # for everything else, run with network-sandbox and wait for the crash -MY_LLVM_V="13.0.1" +MY_LLVM_V="13.0.0" DESCRIPTION="High-performance programming language for technical computing" HOMEPAGE="https://julialang.org/" SRC_URI=" https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz + https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.1-llvm_13_compat_part_3.patch + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.1-llvm_13_compat_part_4.patch + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.1-llvm_13_compat_part_5.patch " LICENSE="MIT" @@ -33,8 +36,8 @@ RDEPEND+=" dev-libs/libgit2:0 >=dev-libs/libpcre2-10.23:0=[jit,unicode] dev-libs/mpfr:0= - dev-libs/libutf8proc:0=[-cjk] - dev-util/patchelf + >=dev-libs/libutf8proc-2.6.1:0=[-cjk] + >=dev-util/patchelf-0.13 >=net-libs/mbedtls-2.2 net-misc/curl[http2,ssh] sci-libs/amd:0= @@ -54,22 +57,21 @@ RDEPEND+=" virtual/lapack" DEPEND="${RDEPEND} - dev-util/patchelf virtual/pkgconfig !system-llvm? ( dev-util/cmake )" PATCHES=( "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch - "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch - "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch - "${FILESDIR}/${PN}"-1.7.0-do_not_set_rpath.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch + "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_3.patch + "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch + "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch + "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch + "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch + "${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch + "${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch ) - # just remove patchelf from linux ?? just my own solution to sigsegv error ?? - #"${FILESDIR}/${PN}"-turnoff-patchelf.patch pkg_setup() { use system-llvm && llvm_pkg_setup @@ -130,9 +132,10 @@ src_configure() { USE_SYSTEM_DSFMT:=1 USE_SYSTEM_BLAS:=1 USE_SYSTEM_LAPACK:=1 + USE_SYSTEM_LIBBLASTRAMPOLINE:=0 USE_SYSTEM_GMP:=1 USE_SYSTEM_MPFR:=1 - USE_SYSTEM_SUITESPARSE:=1 + USE_SYSTEM_LIBSUITESPARSE:=1 USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=1 USE_SYSTEM_MBEDTLS:=1 diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 7b02208f80eb..ed694f59df0e 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -6,5 +6,5 @@ DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112 DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982 EBUILD perl-5.34.0-r3.ebuild 26076 BLAKE2B b3bb0bea66cbabfe90855823671eb6faa72e72fbf9ec86dfa7279a028e34aeb8734e80bf7563138b4003500ed25d40d76a7f987c017c0f77122cb2df8f8851e4 SHA512 7d9e8755a050030c7d4df0614609c909b5ed5eaab05e84764fa86ad024edadcbf13e41f9326f4247f0f7c7735f3f67b718e5e35c88023358d562239e0d6aa5d6 EBUILD perl-5.34.0-r5.ebuild 25268 BLAKE2B 0c65f2c0a8e779414e173d4ab989e9b520d8dea63339c3a8578ceed6e07246451014ebc77258c5a7dc74657036a210c6b856d3827999a494f065c2d010c5defc SHA512 076a03cae039e5df49defef09de5c3869d87d7bd85e03adb71099f64428a78371f5758e43193e0e29928b3490941ded376de34008613800fd67537279dde5554 -EBUILD perl-5.34.0-r6.ebuild 25691 BLAKE2B dece7bd6639994cc0a5a7eca3cc6c790f2f9302526cc1a09181f61ae9d9d0914aca223ba1c76943c8b5904f4e67edf19ba7588e8c33714807c3960120bc54b23 SHA512 012343f382ba6cc20b0016fcfb0fd5d159c76cf8cec44bdad7d7df76d895feca3dcc2a476f642c6a31d5e908ab01577ea820fd4d762c2ad08403fd259bbba71e +EBUILD perl-5.34.0-r6.ebuild 25690 BLAKE2B 60d40d54bc76515f6c415e1cb3abe9e4d15f2b00d619504e35eb4457c7ac50e47b9eaff5df8d0c4e81b8c1b448ed2d351d56f8a458894ca003bcf5ea2a751f40 SHA512 e49c4141def934062d153169743859e0f266e9dac746532213e11f6da2a712f3761b35b3b3c3a793b2c20c14c66596f4a1ba80f70864bc740b1dccfcc5d69728 MISC metadata.xml 431 BLAKE2B 89471506c7b258c1806338a5850ee9337f48b8e7497a3cad8b1e8bf18811152071d416732e0267e7d0c13386097990d1ca12bb0051deb7cb70403ab2e9bdb367 SHA512 87d2a0c6a10f71b243b1e9a79306ed0d440a7f447d84fe37f2bd3c40c60e8749fd9d7e97ad482e286153587b57d7db5d6a8df7cef94f332de7175f053dc843e1 diff --git a/dev-lang/perl/perl-5.34.0-r6.ebuild b/dev-lang/perl/perl-5.34.0-r6.ebuild index f3c4092ef4d6..c4bc6a0a3d09 100644 --- a/dev-lang/perl/perl-5.34.0-r6.ebuild +++ b/dev-lang/perl/perl-5.34.0-r6.ebuild @@ -52,7 +52,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="berkdb debug doc gdbm ithreads minimal" diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest index b1340042588f..417e6c84c1eb 100644 --- a/dev-lang/smlnj/Manifest +++ b/dev-lang/smlnj/Manifest @@ -51,6 +51,6 @@ DIST smlnj-110.99.2-smlnj-c.tgz 10609 BLAKE2B b44b5fa92fb8bc7eac4ac49672629810fa DIST smlnj-110.99.2-smlnj-lib.tgz 790390 BLAKE2B 8194c48196e5e58eb22e6f4f1a91b7b8671acfd2425b88b826d0d2f8f0075f309b3cfcfb77df61fdf5944b3f384201a10effec0438efd9a32f3b4ba68f94d6b0 SHA512 46e125b21dc1dd6acc029baed6d6c1052fd517c275f3ba8f9d54d5b461f7e5aedc3bc9b1018c056977f8c9aafd25990eef308637ce840f67567e0184bdfb556e DIST smlnj-110.99.2-system.tgz 281742 BLAKE2B c9af6495f6991cd9e6768ceab1c8841e30ba83d981e2b8b0482851c8cca9db548e22a2abce2ee0764e4e5ad37723d5819e4e44c91e4e69a4b353327e6ea55769 SHA512 aa27b46301ddfe3f6bf26e04a3763c52b016435d7aa9142f30300b026d2587cd85c84992084c2d9cd1a2dd90b1b82897fb106067aff0d16207050302ba985421 DIST smlnj-110.99.2-trace-debug-profile.tgz 3921 BLAKE2B ebc7d3270bcee5464c7eb5a70c851d865ffbf2ba31a084b61074ffe22f7d97c255fe4584fdbf491c7d5e2db65e3efb5648eb5995b81561cdfee152ae8b31c859 SHA512 e1fd41e15934eda2d33b69d21eeb582306dfc09576cc7f69f72cbc599e4b321c453327a7cc31f4689e6d3d87b2fc0453817ef696e565dff4d7ef4c1e18e31c29 -EBUILD smlnj-110.82.ebuild 4197 BLAKE2B 58729e04b68e83af0736d6abe99916aa716b567068f03cb6c8b38d5afddc0d71be2622dc9cf07f155e34200d2ce7562939021aae44bbfc48ece87bb2257a0c07 SHA512 3886cf603e8d531f999ad60ecf229d11c8d0baba916050e3fa86bffd3d318e21a6badf7618547c1ebdaec8703df214951a82f44341d08d35ab0cc10324527ae0 -EBUILD smlnj-110.99.2.ebuild 2725 BLAKE2B 963fb276831f6731925aee3aedb17caeaeb6718d55e14679cf5a759e7e42cf4146f99da8a1e681f362e571e07e37d7ffdbc8c8346962d6dfc4df0517fc2994c6 SHA512 04f56480d41b84d505a64bc0179d5627e36fbf147b017724fbcebe926ce0bce935037e9a1378b1383752d1f95fb3630ccb6ce137d44895ca44bb269fcbbaf654 +EBUILD smlnj-110.82.ebuild 4197 BLAKE2B 5d6e3b0367d5a358b3c5dac4f5bf92892a1e90baaa8a41cb18329aa1bee05de9e3dfa98f6fa802f5ca59285d1b56a6f9d13f393437f2c2dffdd6661257ee3277 SHA512 f65cd61072960aef6a294c8da5e3af18ff4d60634a830859ee533908999dc4c6320d117eb65ff3bdc01bb30612a8a6e896b8481bb4deca5acfdbaf5e994492a6 +EBUILD smlnj-110.99.2.ebuild 2725 BLAKE2B 8b6ce63bc5f8daf83d0766fc6e74f53dd056ecd61bdacaf79fbb6f9e20274dda765ea731f0154653bc82d078ea085231769ae35f6cfc4d4eb0b45184baedf3cd SHA512 31be42bd6a2d52ca91fac230c9e31be8c796046868e2d5b13b1c77b06a07dddc056e35c4c4be9e51a512b5d2558f15b3987e6daa91f921ccc8dffd910e08dfb7 MISC metadata.xml 628 BLAKE2B 09cedb6a5ca151cfc4ac25fd187995cb2295e8aeb45f1f01741de7e01ca84a57ef060630db3a769983c41d7d290445f8b2ba88cfbbb2d8d983b06403bb505b8b SHA512 1df6d363a4d7a1a96035e24280f11a1fa78a34c464df4025c2e2a1f1e1768f1f0aab3d48741316428bd27c17bc457ea3a5882a202b8d510b2c5f28c83943a79e diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild index 68c776772b8d..6e3b7303f61c 100644 --- a/dev-lang/smlnj/smlnj-110.82.ebuild +++ b/dev-lang/smlnj/smlnj-110.82.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="6" @@ -83,11 +83,11 @@ src_prepare() { epatch "${FILESDIR}/${PN}-110.82-pax-p3.patch" default for file in mk.*; do - sed -e "/^AS/s:as:$(tc-getAS):" \ - -e "/^CC/s:gcc:$(tc-getCC):" \ - -e "/^CPP/s:gcc:$(tc-getCC):" \ - -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ - -e "/^PAXMARK/s:true:"$(usex pax-kernel "paxmark.sh" "true")":" \ + sed -e "/^AS/s|as|$(tc-getAS)|" \ + -e "/^CC/s|gcc|$(tc-getCC)|" \ + -e "/^CPP/s|gcc|$(tc-getCC)|" \ + -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \ + -e "/^PAXMARK/s|true|"$(usex pax-kernel "paxmark.sh" "true")"|" \ -i base/runtime/objs/${file} done } @@ -138,7 +138,7 @@ src_install() { DIR=/usr/${SUBDIR} for file in bin/{*,.*}; do [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ - -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file} + -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" -i ${file} done dodir ${DIR}/bin exeinto ${DIR}/bin diff --git a/dev-lang/smlnj/smlnj-110.99.2.ebuild b/dev-lang/smlnj/smlnj-110.99.2.ebuild index 98c8b3ecdf06..247d06dc4ca7 100644 --- a/dev-lang/smlnj/smlnj-110.99.2.ebuild +++ b/dev-lang/smlnj/smlnj-110.99.2.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 @@ -84,10 +84,10 @@ src_prepare() { default # respect CC et al. (bug 243886) - sed -e "/^AS/s:as:$(tc-getAS):" \ - -e "/^CC/s:gcc:$(tc-getCC):" \ - -e "/^CPP/s:gcc:$(tc-getCC):" \ - -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ + sed -e "/^AS/s|as|$(tc-getAS)|" \ + -e "/^CC/s|gcc|$(tc-getCC)|" \ + -e "/^CPP/s|gcc|$(tc-getCC)|" \ + -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \ -i base/runtime/objs/mk.* || die sed -i "s|nm |$(tc-getNM) |g" config/chk-global-names.sh || die @@ -109,7 +109,7 @@ src_install() { for file in bin/{*,.*} ; do [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ - -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" \ + -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" \ -i ${file} done |