diff options
Diffstat (limited to 'dev-ml/llvm-ocaml')
-rw-r--r-- | dev-ml/llvm-ocaml/Manifest | 16 | ||||
-rw-r--r-- | dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild (renamed from dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild) | 2 | ||||
-rw-r--r-- | dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild | 10 | ||||
-rw-r--r-- | dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc1.ebuild (renamed from dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild) | 4 | ||||
-rw-r--r-- | dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc2.ebuild (renamed from dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild) | 14 | ||||
-rw-r--r-- | dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild (renamed from dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild) | 63 |
6 files changed, 50 insertions, 59 deletions
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest index e0757dd27c3b..9d9210e908c7 100644 --- a/dev-ml/llvm-ocaml/Manifest +++ b/dev-ml/llvm-ocaml/Manifest @@ -1,13 +1,13 @@ -DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 -DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597 -DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325 +DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 +DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267 +DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38 -EBUILD llvm-ocaml-10.0.1.9999.ebuild 2981 BLAKE2B 20e8be985a1a936e0eb43605f200d13e5d0c80d1622acce5289bb6e2558a62c3c68dbc9bc098d0d00546c582cec7d24290e945d73853fcd6183066488269b04b SHA512 d500a27f06f21979477307e42b971a9c098e784396e6964f1ae337c57d8ed2ebc464530c0b857b67b39cdb928e22d16dd46c1ee2a04e3f2d2d4a9da760fd6017 -EBUILD llvm-ocaml-10.0.1_rc1.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d -EBUILD llvm-ocaml-10.0.1_rc2.ebuild 2944 BLAKE2B 90f05263b560f7efd2fa7ee1faa072dc53815c06539fae050d16547ca4d806041e6f4e93762a8faf74cd26a10d66f7da5f96930b6c2dc14d0857a6f329e7857e SHA512 577a51d77a5bac32c2d2f66659ea718b89691f5a0535abde10836aaafae0dddc84d6c328c85af24267a2a908956370dca902eb148e161bfd272318f1054fc73d -EBUILD llvm-ocaml-11.0.0.9999.ebuild 2981 BLAKE2B 57a3eb858bd42118df84f90463f18a99e71f9c5f5c50afbb5e33dc22b9b283aa96eadb71a4a39be0d5b0dba877b77279c1a4b272ee69dde718d73b0026bd6850 SHA512 2316cc30a99d5045a2de69267e962be0cfa7d708ae919252390318504c37e3900cfa14af4887aba462d17d317588283c8f1e4b9887844ab03fcf869d48ebd4d0 -EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3 +EBUILD llvm-ocaml-10.0.1.ebuild 2960 BLAKE2B bf67406bf61b50af82f34276f7bfa6abe0bf809656e2addcc51efb7c1be5d4137462c9108239eea5f273a0e68f26c3300b3d2cc3cfe9df0c8555926e481fe231 SHA512 05e79634eb5e5ba38e0b0638a9627b7c8b38dfc7c685eaed8571283ed7791eb5d0ae2f6333cddf9b1f0f19b47e6d0e4c10444a4bc8bcdb69ce7061b25440a1b3 +EBUILD llvm-ocaml-11.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630 +EBUILD llvm-ocaml-11.0.0_rc1.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630 +EBUILD llvm-ocaml-11.0.0_rc2.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630 +EBUILD llvm-ocaml-12.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild index 7cff2bc42841..f945eb117105 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.ebuild @@ -21,7 +21,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~x86" IUSE="debug test ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild index f10bf23e527d..575154be6047 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils llvm llvm.org python-any-r1 +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -82,7 +82,7 @@ src_configure() { # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 # also: custom rules for OCaml do not work for CPPFLAGS use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" - cmake-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -98,13 +98,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc1.ebuild index 7cff2bc42841..575154be6047 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc2.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc1.ebuild @@ -12,8 +12,8 @@ LLVM_COMPONENTS=( llvm ) llvm.org_set_globals # Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc2.ebuild index c7b4967353fd..575154be6047 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc2.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils llvm llvm.org python-any-r1 +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" @@ -12,8 +12,8 @@ LLVM_COMPONENTS=( llvm ) llvm.org_set_globals # Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR VE ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) @@ -82,7 +82,7 @@ src_configure() { # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 # also: custom rules for OCaml do not work for CPPFLAGS use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" - cmake-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -98,13 +98,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild index 7781bf0cb527..575154be6047 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.1.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild @@ -1,30 +1,29 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=llvm-${PV/_/}.src DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" -SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz" +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} -LICENSE="UoI-NCSA" +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="" IUSE="debug test ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" RDEPEND=" @@ -32,46 +31,38 @@ RDEPEND=" dev-ml/ocaml-ctypes:= ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] !sys-devel/llvm[ocaml(-)]" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) ${PYTHON_DEPS}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" - -S=${WORKDIR}/${MY_P} - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-any-r1_pkg_setup } -src_prepare() { - # Python is needed to run tests using lit - python_setup - - cmake-utils_src_prepare -} - src_configure() { local libdir=$(get_libdir) local mycmakeargs=( -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" -DLLVM_BUILD_TESTS=$(usex test) # disable various irrelevant deps and settings -DLLVM_ENABLE_FFI=OFF -DLLVM_ENABLE_TERMINFO=OFF -DHAVE_HISTEDIT_H=NO - -DWITH_POLLY=OFF -DLLVM_ENABLE_ASSERTIONS=$(usex debug) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON @@ -85,13 +76,13 @@ src_configure() { ) use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 # also: custom rules for OCaml do not work for CPPFLAGS use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" - cmake-utils_src_configure + cmake_src_configure local llvm_libdir=$(llvm-config --libdir) # an ugly hack; TODO: figure out a way to pass -L to ocaml... @@ -107,13 +98,13 @@ src_configure() { } src_compile() { - cmake-utils_src_compile ocaml_all + cmake_build ocaml_all } src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check-llvm-bindings-ocaml + cmake_build check-llvm-bindings-ocaml } src_install() { |