diff options
55 files changed, 562 insertions, 2417 deletions
diff --git a/dev-cpp/llama-cpp/Manifest b/dev-cpp/llama-cpp/Manifest new file mode 100644 index 0000000..8062f78 --- /dev/null +++ b/dev-cpp/llama-cpp/Manifest @@ -0,0 +1 @@ +EBUILD llama-cpp-9999.ebuild 1728 BLAKE2B 04f41b05672133b14185d4426d66a79a4f06309f0071c38e5767eb9f78ee81f567ef813804839bd987a2700bf3d48a3bb35ab8999923fa2c1dc30246252230ce SHA512 29482a3d961838dc525cd142699bc34357c8db4d17cb6ac9f99f86deb7ba5c3ab68fa302e148e943bd759a62189e08622ab77a6f62e53c7e35ac0ca1d0ef70fd diff --git a/dev-cpp/llama-cpp/llama-cpp-9999.ebuild b/dev-cpp/llama-cpp/llama-cpp-9999.ebuild new file mode 100644 index 0000000..ef4e288 --- /dev/null +++ b/dev-cpp/llama-cpp/llama-cpp-9999.ebuild @@ -0,0 +1,78 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=5.5 + +inherit cmake llvm rocm + +LLVM_MAX_SLOT=16 + +EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git" +inherit git-r3 + +DESCRIPTION="Port of Facebook's LLaMA model in C/C++" +HOMEPAGE="https://github.com/ggerganov/llama.cpp" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="blas cublas lto tests tools rocm" +CPU_FLAGS_X86=( avx avx2 f16c ) + +DEPEND="blas? ( sci-libs/openblas:= ) + cublas? ( dev-util/nvidia-cuda-toolkit ) + rocm? ( sci-libs/rocBLAS )" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}" + +src_configure() { + if use rocm ; then + CC=/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang + CXX=/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ + export DEVICE_LIB_PATH=/usr/lib/amdgcn/bitcode + export HIP_DEVICE_LIB_PATH=/usr/lib/amdgcn/bitcode + fi + local mycmakeargs=( + -DLLAMA_BLAS="$(usex blas)" + -DLLAMA_CUBLAS="$(usex cublas)" + -DLLAMA_LTO="$(usex lto)" + -DLLAMA_BUILD_TESTS="$(usex tests)" + -DLLAMA_HIPBLAS="$(usex rocm)" + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DLLAMA_BUILD_SERVER=OFF + -DCMAKE_SKIP_BUILD_RPATH=ON + -DBUILD_NUMBER="1" + ) + if use cublas ; then + addpredict /dev/nvidiactl + fi + cmake_src_configure +} + +src_install() { + doheader llama.h + + cd "${BUILD_DIR}" || die + + dolib.so libllama.so + + newbin bin/main llama-cpp + + if use tools ; then + newbin bin/benchmark llama-cpp-benchmark + newbin bin/perplexity llama-cpp-perplexity + newbin bin/q8dot llama-cpp-q8dot + newbin bin/quantize llama-cpp-quantize + newbin bin/quantize-stats llama-cpp-quantize-stats + newbin bin/vdot llama-cpp-vdot + fi + +} + +pkg_postinst() { + elog "The main binary has been installed as \"llama-cpp\"" +} diff --git a/dev-cpp/mailio/Manifest b/dev-cpp/mailio/Manifest new file mode 100644 index 0000000..5f34824 --- /dev/null +++ b/dev-cpp/mailio/Manifest @@ -0,0 +1,2 @@ +DIST 0.23.0.tar.gz 193502 BLAKE2B 3ac76d402f505c6092399efdce6cfff4e4c2a73710cd857e4a565ac521ff07fba5a73455cb7f98b9364c019b7d639d64540843d45a70a933705d91aec2dbaacb SHA512 e1eee9f5b80dab16017af475b8c13f8278fa3d73e1c446e507dc122cb3df5b984b41c04d753e36cf848dd15029524f95cf48e050cee265c8933b0be1ea500a5d +EBUILD mailio-0.23.0.ebuild 409 BLAKE2B d06f2527cd51cc4fc18070ac3b6f9b117a84c8c650274f8516ad209e6073a8ccd35e35605170b9905e667a17aee2a1457a91f924862921fbe37a74eeb2af1257 SHA512 26bb55e80f39d770a1e5f04a4ca1a2fcf1d3e5d43663d2be00b3f55933df40f8bfeec9a52ada42114feae2b19e149586ef97b6e7d3719b5a96b85735bc22faa5 diff --git a/dev-cpp/mailio/mailio-0.23.0.ebuild b/dev-cpp/mailio/mailio-0.23.0.ebuild new file mode 100644 index 0000000..2c95fd9 --- /dev/null +++ b/dev-cpp/mailio/mailio-0.23.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 20242 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols." +HOMEPAGE="https://github.com/karastojko/mailio" + +SRC_URI="https://github.com/karastojko/mailio/archive/refs/tags/${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-cpp/tgbot-cpp/Manifest b/dev-cpp/tgbot-cpp/Manifest new file mode 100644 index 0000000..0749ee7 --- /dev/null +++ b/dev-cpp/tgbot-cpp/Manifest @@ -0,0 +1,4 @@ +DIST tgbot-cpp-1.6.tar.gz 158699 BLAKE2B 50965c6fc65e78663a044ad359227200a3dc83768c7560c1d84bef05bfedfd080dd65a132dd33020196696d8233af48cbaeb5bd4e07c01e6baed4fe3d0421fea SHA512 c7dd9efb1b0edfe34de06205ed26ad076d0e61a48be22df440290478ab55917c7d926af0ea7d1c76b82b5859f4f2454217feb6dc5b7c7680e6f6177f063242a0 +DIST tgbot-cpp-1.7.2.tar.gz 162819 BLAKE2B ea03a962089eba0c52abc1ced72fce521cb4f25c5c6a19fff1f6b5ceb3e9e7b37cf4cf016d3c9aae53a7b7958fd3b387a5bb871a67316ddc89a9e84a258f691a SHA512 44f16e2cef6ea6407f6a707885734cd0e850d89553a35c12b63c0864ea952377f07553c9cbf5ee464a1e8390723cd9fff867caafa725c97612a664d13ca87ec1 +EBUILD tgbot-cpp-1.6.ebuild 748 BLAKE2B eb5341b9ece666355b8bfaad51b5c4b40253b998227e2f7e83738170e7ede0d46e88f53b1aa8307bd8e6ef67ca105a49234f85a86e5cebbdc612f7b7d3f2b8a8 SHA512 332f66c1cf71d5061549ef37bdd20848cbcce7ea7ca94768b3b4d2df883c3afe503d077a5cc78c3d663bf128bfb62d61ebea32d9c402ae4d3b110972a5135630 +EBUILD tgbot-cpp-1.7.2.ebuild 748 BLAKE2B eb5341b9ece666355b8bfaad51b5c4b40253b998227e2f7e83738170e7ede0d46e88f53b1aa8307bd8e6ef67ca105a49234f85a86e5cebbdc612f7b7d3f2b8a8 SHA512 332f66c1cf71d5061549ef37bdd20848cbcce7ea7ca94768b3b4d2df883c3afe503d077a5cc78c3d663bf128bfb62d61ebea32d9c402ae4d3b110972a5135630 diff --git a/dev-cpp/tgbot-cpp/tgbot-cpp-1.6.ebuild b/dev-cpp/tgbot-cpp/tgbot-cpp-1.6.ebuild new file mode 100644 index 0000000..de8d848 --- /dev/null +++ b/dev-cpp/tgbot-cpp/tgbot-cpp-1.6.ebuild @@ -0,0 +1,33 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ library for Telegram bot API" +HOMEPAGE="https://github.com/reo7sp/tgbot-cpp" +SRC_URI="https://github.com/reo7sp/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+shared doc test" +RESTRICT="mirror !test? ( test )" + +DEPEND=" + sys-libs/zlib + dev-libs/openssl + >=net-misc/curl-7.56.0 + >=dev-libs/boost-1.59.0" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +src_configure() { + mycmakeargs=( + -DENABLE_TESTS=$(usex test ON OFF) + -DBUILD_SHARED_LIBS=$(usex shared ON OFF) + -DBUILD_DOCUMENTATION=$(usex doc ON OFF) + ) + cmake_src_configure +} diff --git a/dev-cpp/tgbot-cpp/tgbot-cpp-1.7.2.ebuild b/dev-cpp/tgbot-cpp/tgbot-cpp-1.7.2.ebuild new file mode 100644 index 0000000..de8d848 --- /dev/null +++ b/dev-cpp/tgbot-cpp/tgbot-cpp-1.7.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="C++ library for Telegram bot API" +HOMEPAGE="https://github.com/reo7sp/tgbot-cpp" +SRC_URI="https://github.com/reo7sp/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+shared doc test" +RESTRICT="mirror !test? ( test )" + +DEPEND=" + sys-libs/zlib + dev-libs/openssl + >=net-misc/curl-7.56.0 + >=dev-libs/boost-1.59.0" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +src_configure() { + mycmakeargs=( + -DENABLE_TESTS=$(usex test ON OFF) + -DBUILD_SHARED_LIBS=$(usex shared ON OFF) + -DBUILD_DOCUMENTATION=$(usex doc ON OFF) + ) + cmake_src_configure +} diff --git a/dev-libs/minIni/Manifest b/dev-libs/minIni/Manifest deleted file mode 100644 index c4d1759..0000000 --- a/dev-libs/minIni/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD minIni-9999.ebuild 410 SHA256 aa6ea72efde615a8c5c40f6796017ba7a1cd187ad6ae7801ab07bca6074a0309 SHA512 d00596999c875489773c1c96bf402d0dc75b0058ec3462bf8b9f7ffd81055aaa1d753dfe344e06711b47beee08944bf144d3826374251b4dff7ce7412b271ebf WHIRLPOOL 9f9c2d32f2f93b027e0495fe7a4ba89b63377c6dca9fc79781b64764fee1a9dbbac6afbb325b16c29d41f63e63800220d76cfeaeeb22d63f34b880474b8035b2 diff --git a/dev-libs/minIni/minIni-9999.ebuild b/dev-libs/minIni/minIni-9999.ebuild deleted file mode 100644 index cb4b5d3..0000000 --- a/dev-libs/minIni/minIni-9999.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit cmake-utils git-r3 - -DESCRIPTION="library for reading and writing ini files" -HOMEPAGE="http://github.com/AuthenticEshkinKot/minIni" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" - -RDEPEND="" -DEPEND="" - -EGIT_REPO_URI="git://github.com/AuthenticEshkinKot/minIni.git" diff --git a/dev-libs/openxlsx/files/install-enabled.patch b/dev-libs/openxlsx/files/install-enabled.patch deleted file mode 100644 index 6070bae..0000000 --- a/dev-libs/openxlsx/files/install-enabled.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dee569a3e5fac58020579594acb90ccce888c44c Mon Sep 17 00:00:00 2001 -From: Igor Ulyanov <disinbox@gmail.com> -Date: Sat, 9 Nov 2019 12:26:54 +0300 -Subject: [PATCH] install enabled - ---- - library/openxlsx/CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/library/openxlsx/CMakeLists.txt b/library/openxlsx/CMakeLists.txt -index a83d2da..be94a6b 100644 ---- a/library/openxlsx/CMakeLists.txt -+++ b/library/openxlsx/CMakeLists.txt -@@ -215,10 +215,10 @@ file(COPY ${CMAKE_CURRENT_BINARY_DIR}/openxlsx_export.h DESTINATION ${OPENXLSX_I - #======================================================================================================================= - # Install OpenXLSX Library - #======================================================================================================================= --#include(GNUInstallDirs) --#install(TARGETS OpenXLSX --# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} --# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} --# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --#install(FILES ${OPENXLSX_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenXLSX) -+include(GNUInstallDirs) -+install(TARGETS OpenXLSX -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(FILES ${OPENXLSX_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenXLSX) - --- -2.23.0 - diff --git a/dev-libs/openxlsx/files/install-headers.patch b/dev-libs/openxlsx/files/install-headers.patch deleted file mode 100644 index 04c421b..0000000 --- a/dev-libs/openxlsx/files/install-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0707b750c5d922ce5b835d00ba247101723373b7 Mon Sep 17 00:00:00 2001 -From: Igor Ulyanov <disinbox@gmail.com> -Date: Sat, 9 Nov 2019 13:35:53 +0300 -Subject: [PATCH] install headers - ---- - library/openxlsx/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/library/openxlsx/CMakeLists.txt b/library/openxlsx/CMakeLists.txt -index be94a6b..4577658 100644 ---- a/library/openxlsx/CMakeLists.txt -+++ b/library/openxlsx/CMakeLists.txt -@@ -210,7 +210,10 @@ file(REMOVE_RECURSE ${OPENXLSX_INSTALLDIR}/include/) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/interfaces/c++/headers/ DESTINATION ${OPENXLSX_INSTALLDIR}/include/OpenXLSX) - file(COPY ${CMAKE_CURRENT_BINARY_DIR}/openxlsx_export.h DESTINATION ${OPENXLSX_INSTALLDIR}/include/OpenXLSX) - -- -+set(OPENXLSX_HEADERS -+ ${OPENXLSX_CXX_INTERFACE_HEADERS} -+ ${CMAKE_CURRENT_BINARY_DIR}/openxlsx_export.h -+ ) - - #======================================================================================================================= - # Install OpenXLSX Library --- -2.23.0 - diff --git a/dev-libs/openxlsx/openxlsx-9999.ebuild b/dev-libs/openxlsx/openxlsx-9999.ebuild deleted file mode 100644 index b2b1396..0000000 --- a/dev-libs/openxlsx/openxlsx-9999.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2019 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="7" - -inherit cmake-utils git-r3 - -DESCRIPTION="OpenXLSX is a C++ library for reading, writing, creating and modifying Microsoft Excel files, with the .xlsx format" -HOMEPAGE="https://github.com/troldal/OpenXLSX" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" - -RDEPEND="dev-libs/pugixml - dev-libs/libzip" -DEPEND="" - -PATCHES=("${FILESDIR}/install-enabled.patch" - "${FILESDIR}/install-headers.patch" - ) - -EGIT_REPO_URI="https://github.com/troldal/OpenXLSX.git" diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest deleted file mode 100644 index 6a1b7c6..0000000 --- a/dev-python/scikit-build/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314 -EBUILD scikit-build-0.10.0.ebuild 760 BLAKE2B eccf64ffcede553d82b321ffa20a5ad0ddd9a70fb0e0aa8ff892841347bb0b97fb913960d848fc7a93324dbec91295ca2f50ace23e59e81c670f1e56c4b22c96 SHA512 e74577cbde60531fe085be1e04e1dcaa9463e2ef6452063a0a6535a9f3212f7e936049016667107031c7f3607c26aa28e1994825d5fbfa0e8ca3cb1f31aef2a1 -MISC metadata.xml 482 BLAKE2B e2ed207a1b75c0325730fde82205a823ca93345ae33c66bdd7433794f306006a01cb19b8f3c74bc55d44e03daf713e993e542268b090d547f3b6b8d2fe5ff3e0 SHA512 6d602cc4748560874269bf20d77f2531d153f74527db06e752d5dc325be585c858fc760faf6af0fccea370e2119b110b69f9aff7ba524d915e4f85c2c878b05e diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml deleted file mode 100644 index ae07a9b..0000000 --- a/dev-python/scikit-build/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>b@edevau.net</email> - <name>Andreas Billmeier</name> - </maintainer> - <herd>python</herd> - <upstream> - <remote-id type="pypi">scikit-build</remote-id> - <maintainer status="unknown"> - <email>scikit-build@googlegroups.com</email> - <name>The scikit-build team</name> - </maintainer> - </upstream> -</pkgmetadata> diff --git a/dev-python/scikit-build/scikit-build-0.10.0.ebuild b/dev-python/scikit-build/scikit-build-0.10.0.ebuild deleted file mode 100644 index 15114d5..0000000 --- a/dev-python/scikit-build/scikit-build-0.10.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions" -HOMEPAGE="https://github.com/scikit-build/scikit-build https://pypi.org/project/scikit-build/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=">=dev-python/wheel-0.29.0[${PYTHON_USEDEP}]" -DEPEND="${REDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - nosetests --verbose || die - py.test -v -v || die -} diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest deleted file mode 100644 index 6b2544e..0000000 --- a/media-video/simplescreenrecorder/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST 0.3.6.tar.gz 1640585 SHA256 146f5bf26bd56d68ff4506c9756526fbf60c8737cb023759250c357935b309b5 SHA512 54e07050ae58c2d59327b13be6613754ada26891c157c6e9d121db2658508245c8f9a6c92921fdc125cdf82611099abf9c89d64ee093a6592fc81fb9c96cb09d WHIRLPOOL 715be064a3e8fd86d299a22d92f812f45fa522652bb5ab21c1492a05dd384b2cc385ce62ab9cb74fe8e9ee7168c29ccc3ef5eae3d2412189ed2c8e1c891bd998 -EBUILD simplescreenrecorder-0.3.6.ebuild 3023 SHA256 fa6e26c365c6d3ae5752284d32bca251ef038a1b4854878faa321b807989a1de SHA512 a2a0df0745608d5bcb2ddc4bcf8aea7d50d81564d0c2e9a323b08e2866e6eece168f912bf12494f596c95978a8764fb691b23ada06fd3191531a9cca691b094b WHIRLPOOL 43890098823317e24b4c287d6f1ad01ed0057d165827e7b72ca2e764670c24d5f7ef7cc5aa8aa89771ad74c0cb91c9e45cfda23289bdcb417990bc978c5f6f04 diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.6.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.6.ebuild deleted file mode 100644 index e808338..0000000 --- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.6.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit flag-o-matic multilib-minimal - -if [[ ${PV} = 9999 ]]; then - inherit git-2 -fi - -DESCRIPTION="A Simple Screen Recorder" -HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder" -LICENSE="GPL-3" -PKGNAME="ssr" -S=${WORKDIR}/${PKGNAME}-${PV} -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git - https://github.com/MaartenBaert/${PKGNAME}.git" - EGIT_BOOTSTRAP="" - KEYWORDS="" -else - SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -SLOT="0" -IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264 +qt4 qt5" -REQUIRED_USE="^^ ( qt4 qt5 )" - -RDEPEND=" - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - virtual/glu[${MULTILIB_USEDEP}] - media-libs/alsa-lib - media-libs/mesa[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext - x11-libs/libXfixes[${MULTILIB_USEDEP}] - jack? ( media-sound/jack-audio-connection-kit ) - pulseaudio? ( media-sound/pulseaudio ) - || ( - media-video/ffmpeg:0[vorbis?,vpx?,x264?,mp3?,theora?] - media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] - ) - " -DEPEND="${RDEPEND}" - -pkg_setup() { - if [[ ${PV} == "9999" ]]; then - elog - elog "This ebuild merges the latest revision available from upstream's" - elog "git repository, and might fail to compile or work properly once" - elog "merged." - elog - fi - - if [[ ${ABI} == amd64 ]]; then - elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system" - elog "When added 32bit GLInject libraries are also included. This is" - elog "required if you want to use OpenGL recording on 32bit applications." - elog - fi - - if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then - ewarn - ewarn "media-libs/x264 is currently built with 10bit useflag." - ewarn "This is known to prevent simplescreenrecorder from recording x264 videos" - ewarn "correctly. Please build media-libs/x264 without 10bit if you want to " - ewarn "record videos with x264." - ewarn - fi - - # QT requires -fPIC. Compile fails otherwise. - # Recently removed from the default compile options upstream - # https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180 - append-flags -fPIC -} - -multilib_src_configure() { - - local myconf=( - --enable-dependency-tracking - $(multilib_native_use_enable debug assert) - $(multilib_native_use_with pulseaudio) - $(multilib_native_use_with jack) - $(multilib_native_use_with qt5) - $(use_enable asm x86-asm) - ) - - # libav doesn't have AVFrame::channels - # https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159 - if has_version media-video/libav; then - myconf+=( --disable-ffmpeg-versions ) - fi - - multilib_is_native_abi || myconf+=( --disable-ssrprogram ) - - ECONF_SOURCE="${S}" \ - econf \ - ${myconf[@]} - -} diff --git a/net-misc/xupnpd/Manifest b/net-misc/xupnpd/Manifest deleted file mode 100644 index 457270a..0000000 --- a/net-misc/xupnpd/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX makefile.patch 790 RMD160 ceb1fe5ea8166ff0a558668d6dc2ec5747e0e63e SHA1 b2993aa461d54256498bcada552f051973412fc6 SHA256 997c03f32f4c6fdf1aecd064022489d7cbda5d386276ff4b5fadcd453fdaaf9d -AUX xupnpd.envd 46 RMD160 33f640e6dfeb43ce91a2915ecd3f1443459ec6d8 SHA1 b5eedbae070ed0d164179b451ff776b889c02907 SHA256 5df3f7da911af94dee314b1dfe0f2f737404bfe4f2bac15459e6bdbbd6bc7911 -AUX xupnpd.init 526 RMD160 8a25b3bacce7bbf856118b13970a6660196fcdb1 SHA1 a3d6f3e54e965e17fd1f80ea65e440d108de16e3 SHA256 2db1412eca31ee18c681c7cc2b56b1e417e30657efe8c271c684db8527b77f0b -EBUILD xupnpd-9999.ebuild 1891 RMD160 598934b9e184b188e70c163f733d4d2f7ccbf8f8 SHA1 4081fff7a0bb58471dca7759e3db985877476fac SHA256 8e1c62aca323c0a29a90e1fc8bbf7ead8adf7ad708efaa77635822d3a713ebdf diff --git a/net-misc/xupnpd/files/makefile.patch b/net-misc/xupnpd/files/makefile.patch deleted file mode 100644 index 7a051ab..0000000 --- a/net-misc/xupnpd/files/makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index ad6622f..ad0c9a4 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,13 +1,11 @@ --LUA = lua-5.1.4 --#LUA = lua-5.2.0 --CFLAGS = -fno-exceptions -fno-rtti -O2 -I$(LUA) -L$(LUA) -+CC ?= gcc -+CXX ?= g++ -+ - SRC = main.cpp soap.cpp mem.cpp mcast.cpp luaxlib.cpp luaxcore.cpp luajson.cpp luajson_parser.cpp - - x86: -- make -C $(LUA) CC=gcc a -- gcc -O2 -c -o md5.o md5c.c -- gcc $(CFLAGS) -DWITH_LIBUUID -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -o xupnpd $(SRC) md5.o -llua -ldl -lm -luuid -- strip xupnpd -+ $(CC) $(CFLAGS) -c -o md5.o md5c.c -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -fno-exceptions -fno-rtti -DWITH_LIBUUID -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -o xupnpd $(SRC) md5.o -llua -ldl -lm -luuid - - x86_bsd: - make -C $(LUA) CC=gcc a diff --git a/net-misc/xupnpd/files/xupnpd.envd b/net-misc/xupnpd/files/xupnpd.envd deleted file mode 100644 index b722166..0000000 --- a/net-misc/xupnpd/files/xupnpd.envd +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT="/usr/share/xupnpd/xupnpd.lua" diff --git a/net-misc/xupnpd/files/xupnpd.init b/net-misc/xupnpd/files/xupnpd.init deleted file mode 100644 index 704b411..0000000 --- a/net-misc/xupnpd/files/xupnpd.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need localmount net - after bootmisc - use logger -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/bin/xupnpd \ - --pidfile /var/run/xupnpd.pid \ - -e XUPNPDROOTDIR=/usr/share/xupnpd - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/bin/xupnpd \ - --pidfile /var/run/xupnpd.pid \ - eend $? -} - diff --git a/net-misc/xupnpd/xupnpd-9999.ebuild b/net-misc/xupnpd/xupnpd-9999.ebuild deleted file mode 100644 index 4fe5a87..0000000 --- a/net-misc/xupnpd/xupnpd-9999.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit subversion - -DESCRIPTION="Light DLNA Media Server" -HOMEPAGE="http://xupnpd.org/ https://code.google.com/p/tsdemuxer/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND="=dev-lang/lua-5.1*" -RDEPEND="${DEPEND}" - -ESVN_REPO_URI="http://tsdemuxer.googlecode.com/svn/trunk/xupnpd" - -pkg_setup() { - tc-export CC CXX -} - -src_unpack() { - subversion_src_unpack - subversion_wc_info -} - -src_prepare() { - cd src || die "Can't cd to src" - rm -rf lua-5* || die "Faild removing bundled lua" - epatch "${FILESDIR}"/makefile.patch - sed -i -e "/cfg\.version/s/1.0-rc8/1.0-rc8-${ESVN_WC_REVISION}/" xupnpd.lua || die "Failed sed to change version" - sed -i -e "/cfg\.playlists/s/\.\/playlists/\/etc\/xupnpd\/playlists/" xupnpd.lua || die "Failed sed to change playlists poath" -} - -src_compile() { - cd src || die "Can't cd to src" - emake || die "emake failed" -} - -src_install() { - dodoc README src/ui/*.txt - - dobin src/xupnpd - - insinto /usr/share/xupnpd/ - doins src/xupnpd_*.lua - - insinto /etc/xupnpd/playlists/ - doins src/playlists/*.m3u - - insinto /etc/xupnpd/playlists/example/ - doins src/playlists/example/*.m3u - - insinto /usr/share/xupnpd/plugins/ - doins src/plugins/*.lua - - insinto /usr/share/xupnpd/ui/ - doins src/ui/*.lua src/ui/*.css src/ui/*.html - - insinto /usr/share/xupnpd/www/ - doins src/www/*.html src/www/*.xml src/www/*.mp4 src/www/*.ico src/www/icon-48x48.png - - sed "s/cfg.ssdp_interface='lo'/cfg.ssdp_interface='eth0'/g;s/cfg.ssdp_loop=1/cfg.ssdp_loop=0/g;s/cfg.mcast_interface='eth1'/cfg.mcast_interface='eth0'/g" \ - < src/xupnpd.lua > "$D"/usr/share/xupnpd/xupnpd.lua || die "Failed sed to modify config" - dosym /usr/share/xupnpd/xupnpd.lua /etc/xupnpd/xupnpd.lua - - newenvd "${FILESDIR}"/xupnpd.envd 99xupnpd - newinitd "${FILESDIR}"/xupnpd.init xupnpd -} diff --git a/sci-geosciences/osgearth/ChangeLog b/sci-geosciences/osgearth/ChangeLog deleted file mode 100644 index 400fb55..0000000 --- a/sci-geosciences/osgearth/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -# ChangeLog for sci-geosciences/osgearth -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.7 2015/04/04 06:30:32 mr_bones_ Exp $ - - 04 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> - -files/osgearth-2.5-cmake-options.patch, -osgearth-2.5.ebuild: - old - - 25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml: - drop maintainership - -*osgearth-2.6 (10 Oct 2014) - - 10 Oct 2014; Julian Ospald <hasufell@gentoo.org> +osgearth-2.6.ebuild, - +files/osgearth-2.6-cmake-options.patch, - +files/osgearth-2.6-disable-qt5.patch: - version bump - -*osgearth-2.5 (22 Nov 2013) - - 22 Nov 2013; Julian Ospald <hasufell@gentoo.org> - +files/osgearth-2.5-cmake-options.patch, +osgearth-2.5.ebuild, - -files/osgearth-2.4-FindMiniZip.cmake.patch, -osgearth-2.4.ebuild: - version bump, remove old - - 03 Nov 2013; Julian Ospald <hasufell@gentoo.org> osgearth-2.4.ebuild: - fix dev-lang/v8 dep wrt #484786 - - 21 Jul 2013; Julian Ospald <hasufell@gentoo.org> osgearth-2.4.ebuild: - fix deps - -*osgearth-2.4 (21 Jul 2013) - - 21 Jul 2013; Julian Ospald <hasufell@gentoo.org> +osgearth-2.4.ebuild, - +files/osgearth-2.4-FindMiniZip.cmake.patch, +metadata.xml: - initial import diff --git a/sci-geosciences/osgearth/Manifest b/sci-geosciences/osgearth/Manifest deleted file mode 100644 index f9e9c49..0000000 --- a/sci-geosciences/osgearth/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX osgearth-2.6-cmake-options.patch 907 BLAKE2B 0c4022418c00b7ff84fbc604d56958dd23ab33de98301b991d51eeaaf1f5cc6cfd4bc08fe7b16907c21a9423cd0eae416fe3670a71c403b4875efcc7ac9aee52 SHA512 f62ca6d4c9f041e3fd29c591cb408ccd17abb75d8fa49e63300786b8a257daa6a69180699d634b891bb56e25c60bd806b44e59087608d7d8480472f4b613daf2 -EBUILD osgearth-9999.ebuild 1614 BLAKE2B 5815683560b91a1c20c667ce4c326781d95bd401345c95694dd5c15379aceaad5d150278b601f89cc44d5ddedfe6813c2569e81ded14261ca81829a528b9512c SHA512 01897554b66d650da5207e3aa45b04300c3d864815171f98100cd0b80edbabec8810dbd4e932998a1079f7c05d4a70be47b874b9bf056ba2ec1a8b4c334dabbc -MISC ChangeLog 1255 BLAKE2B 8e03f2d0d64e9dc9bc615721b2beb4c6ec420792e15c7df98b6cc3fffa78b69aa7d118beebc72c226a5d63c2ea401fabec0eea7872057afbf5007007bc0d3fec SHA512 32966315c90540601a63d003bbd5ef2782f51ee779e920598bf6a7dc4d97ba36eebeed41bd8282c520f6877bc5ee8972df989323442c7ca2cb6767bec8592f31 -MISC metadata.xml 793 BLAKE2B 80a943c2a977b1c6c27957ae6e08d656489f9a893f7f37540a2811706682128370d246f458021c916d0bbf158c9c08fdd568bc8484acd0ec7edd8dd100087fb1 SHA512 907a5959c80668b34f91f928b36e31f381bc9878e86a2b29a84408eeb44b333f1830baa43c3cc906b37aa82d5d6566ea4da789fe1a8f963877e1002ed3e55339 diff --git a/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch deleted file mode 100644 index 389609b..0000000 --- a/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit d92cee4d9870fab08fdfadf9ab0bfb4658a09aa3 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Nov 22 14:06:34 2013 +0100 - - add cmake options - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 34cd375..dbb4cb4 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -129,8 +129,17 @@ - - # JavaScript Engines: - SET(V8_DIR "" CACHE PATH "set to base V8 install path") --FIND_PACKAGE(V8) --FIND_PACKAGE(JavaScriptCore) -+OPTION(OSGEARTH_USE_V8 "Enable to use V8 JavaScript engine" ON) -+IF(OSGEARTH_USE_V8) -+ FIND_PACKAGE(V8) -+ENDIF(OSGEARTH_USE_V8) -+ -+OPTION(OSGEARTH_USE_JAVASCRIPTCORE "Enable use of JavaScriptCore" ON) -+OPTION(OSGEARTH_USE_LIBNOISE "Enable use of LibNoise" ON) -+ -+IF (OSGEARTH_USE_JAVASCRIPTCORE) -+ FIND_PACKAGE(JavaScriptCore) -+ENDIF (OSGEARTH_USE_JAVASCRIPTCORE) - - SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") - IF (WITH_EXTERNAL_DUKTAPE) diff --git a/sci-geosciences/osgearth/metadata.xml b/sci-geosciences/osgearth/metadata.xml deleted file mode 100644 index f1a2be1..0000000 --- a/sci-geosciences/osgearth/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>maintainer-needed@gentoo.org</email> - </maintainer> - <longdescription lang="en"> - osgEarth is a C++ terrain rendering toolkit. Just create a - simple XML file, point it at your imagery, elevation, and - vector data, load it into your favorite OpenSceneGraph - application, and go! osgEarth supports all kinds of data and - comes with lots of examples to help you get up and running - quickly and easily. - </longdescription> - <upstream> - <doc lang="en">http://docs.osgearth.org/en/latest</doc> - <bugs-to>https://github.com/gwaldron/osgearth/issues</bugs-to> - <remote-id type="github">gwaldron/osgearth</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-geosciences/osgearth/osgearth-9999.ebuild b/sci-geosciences/osgearth/osgearth-9999.ebuild deleted file mode 100644 index fb134f0..0000000 --- a/sci-geosciences/osgearth/osgearth-9999.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/osgearth-2.6.ebuild,v 1.1 2014/10/10 20:18:46 hasufell Exp $ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="Dynamic map generation toolkit for OpenSceneGraph" -HOMEPAGE="http://osgearth.org/" - -if [[ "${PV}" = "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/Displacer/osgearth.git" -else - SRC_URI="https://github.com/gwaldron/osgearth/archive/${P}.tar.gz" - S=${WORKDIR}/${PN}-${P} -fi - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc qt4" - -RDEPEND=" - dev-db/sqlite:3 - >=dev-games/openscenegraph-3.2.1[curl,qt4?] - dev-libs/tinyxml - net-misc/curl - sci-libs/gdal - sci-libs/geos - sys-libs/zlib[minizip] - virtual/opengl - x11-libs/libX11 - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-python/sphinx )" - -#PATCHES=( "${FILESDIR}"/${P}-{cmake-options}.patch ) - -src_configure() { - # V8 disabled due to - # https://github.com/gwaldron/osgearth/issues/333 - local mycmakeargs=( - -DWITH_EXTERNAL_TINYXML=ON - $(cmake-utils_use qt4 OSGEARTH_USE_QT) - -DOSGEARTH_USE_V8=OFF - -DOSGEARTH_USE_JAVASCRIPTCORE=OFF - -DOSGEARTH_USE_LIBNOISE=OFF - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - emake -C "${S}"/docs man html info - fi -} - -src_install() { - cmake-utils_src_install - - if use doc ; then - dohtml -r "${S}"/docs/build/html/* - doman "${S}"/docs/build/man/* - doinfo "${S}"/docs/build/texinfo/*.info* - fi -} diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest deleted file mode 100644 index e2ac3a6..0000000 --- a/sci-libs/gsl/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX cblas.pc.in 290 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719 WHIRLPOOL f8e93aa2c61d3ac08664c3162f0e754c1d6cefca0a4d4ab8ee8f763e6ec46049ff5537c7f9266200856b58ffab88fb9af115eb4be32deb99ed6d2005abcb13ec -AUX eselect.cblas.gsl 216 SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7 SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc WHIRLPOOL 1a0591e670a1ca51fa6cc4b2883931a49f3da59c2c673d786f6acdb72b50b7fee22ee30f2d3c6ac864c149381c23ca5c41ba586f159830cdeff97b86cf6a03f3 -AUX gsl-1.13-cblas-vars.patch 403 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40 SHA512 c323a2f08683f70dbb2c2e1b0d7d1706a74f71d41aad892008d381525cf4a34e0f5d120763f2cf2ad57b0ddf5ee36eeabf401299be821fec66710d12e1c0e8ca WHIRLPOOL 7a0752597eebb47dd4da359a0368c9c1a755ee607b53651d040dd3bb4f58746e234cdafd77d3e259f0f028572161719472a881441caebbf2860c1dd40d4a795e -AUX gsl-1.13-cblas.patch 15524 SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890 SHA512 ed96a576a4c218d002e091088f04e2654c651d0050e8487ef69686fd7715bf59cd56c40751bcf558314dff59ece8acb47bfa28d3a405b2ecf3fc56e30d46bdaa WHIRLPOOL c9e7146512e16a65f35687a7f832c9e0e958c6b7d7471a61527eeac3fcb616c5a16cc26ab483b8cefa194cb232a662439a06625da38cb8b86bdf0f5444ad25d5 -AUX gsl-1.14-cblas.patch 17218 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d SHA512 8d009f7b7e4c6cb90864b90cc86a8c5b6b3d80d899225758683639d0e1a114355bd4f8adfb41bc9ead57990a3274cff65743c59b86fc1bc699c46a61fb31fd42 WHIRLPOOL f3b52170a5818a5d8d2812272fbbdd688626cbeb8679fb0eb16fb34a7e85a88da3302b3a4f79264e9ae39c79143f3bf5db90d678c04a2d34bcf186962e990b70 -AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5 -AUX gsl-1.16-cblas.patch 17458 SHA256 568f6bf06b9441f741c028eaf7b12edb0e96093a16ea7a2d975e0cbde261c083 SHA512 70cae5682bfc7788e6f67ec355b52e291f32c2500b9baf9dd336d7cbb42b5eac4d89ecafeb23c4b478836d3c137d40d47dd17d375708df3c2dd41781a78f56bf WHIRLPOOL a7a5e6b52dc0466ad180853f5824d071d715743ef850ec808c7615fcc3b4f98d940c6f896faf44647c8e0915a6e5b6b7575ff9b66a59e337e04cd18d94cc7807 -DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa3900006e52e494e9e2fcd34ec06301 -EBUILD gsl-1.16-r1.ebuild 3209 SHA256 676ee9090e035789aa05611d066c5da966d66ac3b19f4e654c00641e8ff03ca6 SHA512 eb6cbee8e525f04397497659b2b79db8d7d0346e73b92a9f1f28fc52833348d614698e609ad98493e28417ce6cf4b795e2ca38686e6953e0a31fc4292f0457d7 WHIRLPOOL efced46f5fa5747db08a1fe16133c3970a6cf749a50ea1a6e5b8be9e87e41daeb13053e7d199158f8b6a4091354c99b075b91ed419343913c5665bed11f4f004 -MISC 0001-multilib-gsl.patch 1258 SHA256 d5f38018d0cd4b3258369a8acadf9ff5e8ce36a8e2713d85e069f3ebb03c9916 SHA512 e2b5740d119d951bfdf7e4977b41eab20f44bc6eb6e96b7f5e9d2858f6c1534a82924bb13516876a84ecdbef712cb53559da6d48f1dfff2c22e2b8cf9571b040 WHIRLPOOL 730b41964316ae6a69a0aff9bc9e6220aff6851ca3e8eea8f0a900ad929c93c87d70a32feee161d7bdfa22cde8a414dc7cdd965025cad7421b93f93a79e0abe0 diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in deleted file mode 100644 index a2580f8..0000000 --- a/sci-libs/gsl/files/cblas.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/@LIBDIR@ -includedir=${prefix}/include - -Name: cblas -Description: GSL C Implementation of the Basic Linear Algebra Subprograms -Version: @PV@ -URL: http://www.gnu.org/software/gsl -Libs: -L${libdir} -lcblas -Libs.private: -lm -Cflags: -I${includedir} diff --git a/sci-libs/gsl/files/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl deleted file mode 100644 index af6fee5..0000000 --- a/sci-libs/gsl/files/eselect.cblas.gsl +++ /dev/null @@ -1,5 +0,0 @@ -libgslcblas.so /usr/@LIBDIR@/libcblas.so -libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0 -libgslcblas.a /usr/@LIBDIR@/libcblas.a -../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc -gsl/gsl_cblas.h /usr/include/cblas.h diff --git a/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch b/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch deleted file mode 100644 index 47f06ca..0000000 --- a/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2009-09-20 22:41:14.000000000 +0400 -+++ Makefile.am 2009-09-20 22:39:10.000000000 +0400 -@@ -55,6 +55,8 @@ - -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' - diff --git a/sci-libs/gsl/files/gsl-1.13-cblas.patch b/sci-libs/gsl/files/gsl-1.13-cblas.patch deleted file mode 100644 index be86c3a..0000000 --- a/sci-libs/gsl/files/gsl-1.13-cblas.patch +++ /dev/null @@ -1,260 +0,0 @@ ---- acx_cblas.m4.orig 1970-01-01 01:00:00.000000000 +0100 -+++ acx_cblas.m4 2009-01-19 15:45:43.319918648 +0000 -@@ -0,0 +1,60 @@ -+AC_DEFUN([ACX_CBLAS],[ -+ use_cblas=no -+ use_cblas_libs="-lcblas -lblas" -+ use_cblas_cflags="" -+ -+ AC_ARG_WITH(cblas, -+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) -+ -+ case $with_cblas in -+ yes) use_cblas=yes ;; -+ no | "" ) use_cblas=no ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; -+ *) use_cblas_libs="-l$with_cblas" ;; -+ esac -+ -+ AC_ARG_WITH(cblas-libs, -+ [AS_HELP_STRING([--with-cblas-libs=<libs>], -+ [external cblas libraries to link with (default is "$use_cblas_libs")])], -+ [use_cblas_libs=$withval], []) -+ -+ AC_ARG_WITH(cblas-cflags, -+ [AS_HELP_STRING([--with-cblas-cflags=<flags>], -+ [extra cflags to compile with external cblas ("-I<dir>")])], -+ [use_cblas_cflags=$withval], []) -+ -+ if test x$use_cblas != xno; then -+ if test "x$CBLAS_LIBS" = x; then -+ CBLAS_LIBS="$use_cblas_libs" -+ fi -+ if test "x$CBLAS_FLAGS" = x; then -+ CBLAS_CFLAGS="$use_cblas_cflags" -+ fi -+ -+ CFLAGS_sav="$CFLAGS" -+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" -+ AC_CHECK_HEADER(cblas.h, , -+ [AC_MSG_ERROR([ -+ *** Header file cblas.h not found. -+ *** If you installed cblas header in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-cflags="-I<include_dir>"]) -+ ]) -+ CFLAGS="$CFLAGS_sav" -+ -+ LIBS_sav="$LIBS" -+ LIBS="$LIBS $CBLAS_LIBS -lm" -+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) -+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], -+ [AC_MSG_ERROR([ -+ *** Linking with cblas with $LIBS failed. -+ *** If you installed cblas library in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) -+ ]) -+ AC_MSG_RESULT($use_cblas) -+ LIBS="$LIBS_sav" -+ AC_SUBST(CBLAS_CFLAGS) -+ AC_SUBST(CBLAS_LIBS) -+ fi -+]) ---- bspline/Makefile.am.orig 2009-06-29 13:30:17.000000000 +0100 -+++ bspline/Makefile.am 2009-09-17 22:31:53.000000000 +0100 -@@ -12,6 +12,6 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la -+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la - - test_SOURCES = test.c ---- configure.ac.orig 2008-12-15 14:52:45.000000000 +0000 -+++ configure.ac 2009-01-19 15:45:36.267801871 +0000 -@@ -169,6 +169,16 @@ - AC_CHECK_LIB(m, cos) - fi - -+sinclude(acx_cblas.m4) -+ACX_CBLAS -+if test "x$CBLAS_LIBS" != "x"; then -+ CBLAS_LINK_LIBS="$CBLAS_LIBS" -+else -+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" -+ CBLAS_LIBS="-lgslcblas" -+fi -+AC_SUBST(CBLAS_LINK_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) ---- eigen/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ eigen/Makefile.am 2009-01-19 15:46:59.999090878 +0000 -@@ -11,7 +11,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la - - test_SOURCES = test.c - ---- gsl-config.in.orig 2008-02-05 13:22:10.000000000 +0000 -+++ gsl-config.in 2009-01-19 15:45:06.176046040 +0000 -@@ -58,11 +58,11 @@ - ;; - - --cflags) -- echo @GSL_CFLAGS@ -+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm - ;; - ---- gsl.pc.in.orig 2008-11-19 09:13:46.000000000 +0000 -+++ gsl.pc.in 2009-01-19 15:45:15.227937645 +0000 -@@ -6,5 +6,5 @@ - Name: GSL - Description: GNU Scientific Library - Version: @VERSION@ --Libs: @GSL_LIBS@ -lgslcblas @LIBS@ --Cflags: @GSL_CFLAGS@ -+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@ -+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@ ---- interpolation/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ interpolation/Makefile.am 2009-01-19 15:47:00.019091996 +0000 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - ---- linalg/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ linalg/Makefile.am 2009-01-19 15:47:00.023091716 +0000 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - ---- Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ Makefile.am 2009-01-19 15:45:50.463861656 +0000 -@@ -17,13 +17,12 @@ - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - - MINGW32_HOST = @MINGW32_HOST@ - if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la - libgsl_la_LDFLAGS += -no-undefined - endif - -@@ -33,10 +32,10 @@ - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la - - check_SCRIPTS = test_gsl_histogram.sh - TESTS = test_gsl_histogram.sh ---- multifit/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ multifit/Makefile.am 2009-01-19 15:47:00.031091716 +0000 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c --test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - ---- multimin/Makefile.am.orig 2008-11-29 17:51:18.000000000 +0000 -+++ multimin/Makefile.am 2009-01-19 15:47:00.035091996 +0000 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - ---- multiroots/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ multiroots/Makefile.am 2009-01-19 15:47:00.035091996 +0000 -@@ -15,5 +15,5 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - ---- ode-initval/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ ode-initval/Makefile.am 2009-01-19 15:47:00.039090878 +0000 -@@ -12,7 +12,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - ---- poly/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ poly/Makefile.am 2009-01-19 15:47:00.047090599 +0000 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --check_PROGRAMS = test -+#check_PROGRAMS = test - - test_SOURCES = test.c - test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ---- specfunc/Makefile.am.orig 2008-11-27 20:03:28.000000000 +0000 -+++ specfunc/Makefile.am 2009-01-19 15:47:00.063090599 +0000 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c - ---- wavelet/Makefile.am.orig 2008-11-27 20:03:29.000000000 +0000 -+++ wavelet/Makefile.am 2009-01-19 15:47:00.163091437 +0000 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - diff --git a/sci-libs/gsl/files/gsl-1.14-cblas.patch b/sci-libs/gsl/files/gsl-1.14-cblas.patch deleted file mode 100644 index b8d9fb7..0000000 --- a/sci-libs/gsl/files/gsl-1.14-cblas.patch +++ /dev/null @@ -1,285 +0,0 @@ -diff -Nur gsl-1.14.orig/acx_cblas.m4 gsl-1.14/acx_cblas.m4 ---- gsl-1.14.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ gsl-1.14/acx_cblas.m4 2010-04-09 02:19:59.000000000 +0100 -@@ -0,0 +1,60 @@ -+AC_DEFUN([ACX_CBLAS],[ -+ use_cblas=no -+ use_cblas_libs="-lcblas -lblas" -+ use_cblas_cflags="" -+ -+ AC_ARG_WITH(cblas, -+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) -+ -+ case $with_cblas in -+ yes) use_cblas=yes ;; -+ no | "" ) use_cblas=no ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; -+ *) use_cblas_libs="-l$with_cblas" ;; -+ esac -+ -+ AC_ARG_WITH(cblas-libs, -+ [AS_HELP_STRING([--with-cblas-libs=<libs>], -+ [external cblas libraries to link with (default is "$use_cblas_libs")])], -+ [use_cblas_libs=$withval], []) -+ -+ AC_ARG_WITH(cblas-cflags, -+ [AS_HELP_STRING([--with-cblas-cflags=<flags>], -+ [extra cflags to compile with external cblas ("-I<dir>")])], -+ [use_cblas_cflags=$withval], []) -+ -+ if test x$use_cblas != xno; then -+ if test "x$CBLAS_LIBS" = x; then -+ CBLAS_LIBS="$use_cblas_libs" -+ fi -+ if test "x$CBLAS_FLAGS" = x; then -+ CBLAS_CFLAGS="$use_cblas_cflags" -+ fi -+ -+ CFLAGS_sav="$CFLAGS" -+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" -+ AC_CHECK_HEADER(cblas.h, , -+ [AC_MSG_ERROR([ -+ *** Header file cblas.h not found. -+ *** If you installed cblas header in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-cflags="-I<include_dir>"]) -+ ]) -+ CFLAGS="$CFLAGS_sav" -+ -+ LIBS_sav="$LIBS" -+ LIBS="$LIBS $CBLAS_LIBS -lm" -+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) -+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], -+ [AC_MSG_ERROR([ -+ *** Linking with cblas with $LIBS failed. -+ *** If you installed cblas library in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) -+ ]) -+ AC_MSG_RESULT($use_cblas) -+ LIBS="$LIBS_sav" -+ AC_SUBST(CBLAS_CFLAGS) -+ AC_SUBST(CBLAS_LIBS) -+ fi -+]) -diff -Nur gsl-1.14.orig/bspline/Makefile.am gsl-1.14/bspline/Makefile.am ---- gsl-1.14.orig/bspline/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/bspline/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -12,6 +12,6 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la -+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la - - test_SOURCES = test.c -diff -Nur gsl-1.14.orig/configure.ac gsl-1.14/configure.ac ---- gsl-1.14.orig/configure.ac 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/configure.ac 2010-04-09 02:19:59.000000000 +0100 -@@ -185,6 +185,16 @@ - AC_CHECK_LIB(m, cos) - fi - -+sinclude(acx_cblas.m4) -+ACX_CBLAS -+if test "x$CBLAS_LIBS" != "x"; then -+ CBLAS_LINK_LIBS="$CBLAS_LIBS" -+else -+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" -+ CBLAS_LIBS="-lgslcblas" -+fi -+AC_SUBST(CBLAS_LINK_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) -diff -Nur gsl-1.14.orig/eigen/Makefile.am gsl-1.14/eigen/Makefile.am ---- gsl-1.14.orig/eigen/Makefile.am 2010-04-09 02:04:46.000000000 +0100 -+++ gsl-1.14/eigen/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -11,7 +11,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la - - test_SOURCES = test.c - -diff -Nur gsl-1.14.orig/gsl-config.in gsl-1.14/gsl-config.in ---- gsl-1.14.orig/gsl-config.in 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/gsl-config.in 2010-04-09 02:19:59.000000000 +0100 -@@ -58,11 +58,11 @@ - ;; - - --cflags) -- echo @GSL_CFLAGS@ -+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm - ;; - -diff -Nur gsl-1.14.orig/gsl.pc.in gsl-1.14/gsl.pc.in ---- gsl-1.14.orig/gsl.pc.in 2010-04-09 02:04:46.000000000 +0100 -+++ gsl-1.14/gsl.pc.in 2010-04-09 02:19:59.000000000 +0100 -@@ -6,5 +6,5 @@ - Name: GSL - Description: GNU Scientific Library - Version: @VERSION@ --Libs: @GSL_LIBS@ -lgslcblas @LIBS@ --Cflags: @GSL_CFLAGS@ -+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@ -+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@ -diff -Nur gsl-1.14.orig/interpolation/Makefile.am gsl-1.14/interpolation/Makefile.am ---- gsl-1.14.orig/interpolation/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/interpolation/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.14.orig/linalg/Makefile.am gsl-1.14/linalg/Makefile.am ---- gsl-1.14.orig/linalg/Makefile.am 2010-04-09 02:04:46.000000000 +0100 -+++ gsl-1.14/linalg/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.14.orig/Makefile.am gsl-1.14/Makefile.am ---- gsl-1.14.orig/Makefile.am 2010-04-09 02:04:46.000000000 +0100 -+++ gsl-1.14/Makefile.am 2010-04-09 02:20:13.000000000 +0100 -@@ -19,13 +19,12 @@ - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - - MINGW32_HOST = @MINGW32_HOST@ - if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la - libgsl_la_LDFLAGS += -no-undefined - endif - -@@ -35,10 +34,10 @@ - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la - - check_SCRIPTS = test_gsl_histogram.sh - TESTS = test_gsl_histogram.sh -@@ -56,6 +55,8 @@ - -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' - -diff -Nur gsl-1.14.orig/multifit/Makefile.am gsl-1.14/multifit/Makefile.am ---- gsl-1.14.orig/multifit/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/multifit/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c --test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - -diff -Nur gsl-1.14.orig/multimin/Makefile.am gsl-1.14/multimin/Makefile.am ---- gsl-1.14.orig/multimin/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/multimin/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.14.orig/multiroots/Makefile.am gsl-1.14/multiroots/Makefile.am ---- gsl-1.14.orig/multiroots/Makefile.am 2010-04-09 02:04:46.000000000 +0100 -+++ gsl-1.14/multiroots/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -15,5 +15,5 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.14.orig/ode-initval/Makefile.am gsl-1.14/ode-initval/Makefile.am ---- gsl-1.14.orig/ode-initval/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/ode-initval/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -12,7 +12,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.14.orig/poly/Makefile.am gsl-1.14/poly/Makefile.am ---- gsl-1.14.orig/poly/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/poly/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --check_PROGRAMS = test -+#check_PROGRAMS = test - - test_SOURCES = test.c - test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -diff -Nur gsl-1.14.orig/specfunc/Makefile.am gsl-1.14/specfunc/Makefile.am ---- gsl-1.14.orig/specfunc/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/specfunc/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c - -diff -Nur gsl-1.14.orig/wavelet/Makefile.am gsl-1.14/wavelet/Makefile.am ---- gsl-1.14.orig/wavelet/Makefile.am 2010-04-09 02:04:47.000000000 +0100 -+++ gsl-1.14/wavelet/Makefile.am 2010-04-09 02:19:59.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch deleted file mode 100644 index dd402f3..0000000 --- a/sci-libs/gsl/files/gsl-1.15-cblas.patch +++ /dev/null @@ -1,286 +0,0 @@ -diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4 ---- gsl-1.15.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100 -+++ gsl-1.15/acx_cblas.m4 2011-07-28 22:16:03.000000000 +0100 -@@ -0,0 +1,60 @@ -+AC_DEFUN([ACX_CBLAS],[ -+ use_cblas=no -+ use_cblas_libs="-lcblas -lblas" -+ use_cblas_cflags="" -+ -+ AC_ARG_WITH(cblas, -+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) -+ -+ case $with_cblas in -+ yes) use_cblas=yes ;; -+ no | "" ) use_cblas=no ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; -+ *) use_cblas_libs="-l$with_cblas" ;; -+ esac -+ -+ AC_ARG_WITH(cblas-libs, -+ [AS_HELP_STRING([--with-cblas-libs=<libs>], -+ [external cblas libraries to link with (default is "$use_cblas_libs")])], -+ [use_cblas_libs=$withval], []) -+ -+ AC_ARG_WITH(cblas-cflags, -+ [AS_HELP_STRING([--with-cblas-cflags=<flags>], -+ [extra cflags to compile with external cblas ("-I<dir>")])], -+ [use_cblas_cflags=$withval], []) -+ -+ if test x$use_cblas != xno; then -+ if test "x$CBLAS_LIBS" = x; then -+ CBLAS_LIBS="$use_cblas_libs" -+ fi -+ if test "x$CBLAS_FLAGS" = x; then -+ CBLAS_CFLAGS="$use_cblas_cflags" -+ fi -+ -+ CFLAGS_sav="$CFLAGS" -+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" -+ AC_CHECK_HEADER(cblas.h, , -+ [AC_MSG_ERROR([ -+ *** Header file cblas.h not found. -+ *** If you installed cblas header in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-cflags="-I<include_dir>"]) -+ ]) -+ CFLAGS="$CFLAGS_sav" -+ -+ LIBS_sav="$LIBS" -+ LIBS="$LIBS $CBLAS_LIBS -lm" -+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) -+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], -+ [AC_MSG_ERROR([ -+ *** Linking with cblas with $LIBS failed. -+ *** If you installed cblas library in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) -+ ]) -+ AC_MSG_RESULT($use_cblas) -+ LIBS="$LIBS_sav" -+ AC_SUBST(CBLAS_CFLAGS) -+ AC_SUBST(CBLAS_LIBS) -+ fi -+]) -diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am ---- gsl-1.15.orig/bspline/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/bspline/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,6 +12,6 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la -+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la - - test_SOURCES = test.c -diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac ---- gsl-1.15.orig/configure.ac 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/configure.ac 2011-07-28 22:16:03.000000000 +0100 -@@ -190,6 +190,16 @@ - AC_CHECK_LIB(m, cos) - fi - -+sinclude(acx_cblas.m4) -+ACX_CBLAS -+if test "x$CBLAS_LIBS" != "x"; then -+ CBLAS_LINK_LIBS="$CBLAS_LIBS" -+else -+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" -+ CBLAS_LIBS="-lgslcblas" -+fi -+AC_SUBST(CBLAS_LINK_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) -diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am ---- gsl-1.15.orig/eigen/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/eigen/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -11,7 +11,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in ---- gsl-1.15.orig/gsl-config.in 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/gsl-config.in 2011-07-28 22:16:03.000000000 +0100 -@@ -58,11 +58,11 @@ - ;; - - --cflags) -- echo @GSL_CFLAGS@ -+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@ - ;; - -diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in ---- gsl-1.15.orig/gsl.pc.in 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/gsl.pc.in 2011-07-28 22:20:14.000000000 +0100 -@@ -2,7 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --GSL_CBLAS_LIB=-lgslcblas -+GSL_CBLAS_LIB=@CBLAS_LIBS@ - - Name: GSL - Description: GNU Scientific Library -diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am ---- gsl-1.15.orig/interpolation/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/interpolation/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am ---- gsl-1.15.orig/linalg/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/linalg/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am ---- gsl-1.15.orig/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -19,13 +19,12 @@ - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - - MINGW32_HOST = @MINGW32_HOST@ - if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la - libgsl_la_LDFLAGS += -no-undefined - endif - -@@ -35,10 +34,10 @@ - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la - - check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test - TESTS = test_gsl_histogram.sh pkgconfig.test -@@ -57,6 +56,8 @@ - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ - -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \ - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' - -diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am ---- gsl-1.15.orig/multifit/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multifit/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c --test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - -diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am ---- gsl-1.15.orig/multimin/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multimin/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am ---- gsl-1.15.orig/multiroots/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/multiroots/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -15,5 +15,5 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am ---- gsl-1.15.orig/ode-initval/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/ode-initval/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am ---- gsl-1.15.orig/poly/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/poly/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --check_PROGRAMS = test -+#check_PROGRAMS = test - - test_SOURCES = test.c - test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am ---- gsl-1.15.orig/specfunc/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/specfunc/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c - -diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am ---- gsl-1.15.orig/wavelet/Makefile.am 2011-07-28 22:15:49.000000000 +0100 -+++ gsl-1.15/wavelet/Makefile.am 2011-07-28 22:16:03.000000000 +0100 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - diff --git a/sci-libs/gsl/files/gsl-1.16-cblas.patch b/sci-libs/gsl/files/gsl-1.16-cblas.patch deleted file mode 100644 index c29ef52..0000000 --- a/sci-libs/gsl/files/gsl-1.16-cblas.patch +++ /dev/null @@ -1,294 +0,0 @@ -diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4 ---- gsl-1.16.orig/ax_cblas.m4 1969-12-31 16:00:00.000000000 -0800 -+++ gsl-1.16/ax_cblas.m4 2013-08-19 15:48:54.376300825 -0700 -@@ -0,0 +1,69 @@ -+AC_DEFUN([AX_CBLAS],[ -+ -+ ext_cblas=no -+ ext_cblas_libs="-lcblas" -+ ext_cblas_cflags="" -+ -+ AC_ARG_WITH(cblas-external, -+ [AS_HELP_STRING([--with-cblas-external], -+ [Use external CBLAS library (default is no)])], -+ [with_ext_cblas=$withval], -+ [with_ext_cblas=no]) -+ -+ case $with_ext_cblas in -+ no) ext_cblas=no ;; -+ yes) ext_cblas=yes ;; -+ -* | */* | *.a | *.so | *.so.* | *.o) -+ ext_cblas=yes -+ ext_cblas_libs="$with_cblas" ;; -+ *) ext_cblas=yes -+ ext_cblas_libs="-l$with_cblas" ;; -+ esac -+ -+ AC_ARG_WITH(cblas-external-libs, -+ [AS_HELP_STRING([--with-cblas-external-libs=<libs>], -+ [External cblas libraries to link with (default is "$ext_cblas_libs")])], -+ [ext_cblas_libs=$withval], -+ []) -+ -+ AC_ARG_WITH(cblas-external-cflags, -+ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>], -+ [Pre-processing flags to compile with external cblas ("-I<dir>")])], -+ [ext_cblas_cflags=$withval], -+ []) -+ -+ if test x$ext_cblas != xno; then -+ if test "x$CBLAS_LIBS" = x; then -+ CBLAS_LIBS="$ext_cblas_libs" -+ fi -+ if test "x$CBLAS_CFLAGS" = x; then -+ CBLAS_CFLAGS="$ext_cblas_cflags" -+ fi -+ -+ CFLAGS_sav="$CFLAGS" -+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" -+ AC_CHECK_HEADER(cblas.h, , -+ [AC_MSG_ERROR([ -+ *** Header file cblas.h not found. -+ *** If you installed cblas header in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-external-cflags="-I<include_dir>"]) -+ ]) -+ CFLAGS="$CFLAGS_sav" -+ -+ LIBS_sav="$LIBS" -+ LIBS="$LIBS $CBLAS_LIBS -lm" -+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) -+ AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes], -+ [AC_MSG_ERROR([ -+ *** Linking with cblas with $LIBS failed. -+ *** If you installed cblas library in a non standard place, -+ *** specify its install prefix using the following option -+ *** --with-cblas-external-libs="-L<lib_dir> -l<lib>"]) -+ ]) -+ AC_MSG_RESULT($ext_cblas) -+ LIBS="$LIBS_sav" -+ AC_SUBST([CBLAS_CFLAGS]) -+ AC_SUBST([CBLAS_LIBS]) -+ fi -+]) -diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am ---- gsl-1.16.orig/bspline/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/bspline/Makefile.am 2013-08-19 15:25:27.728497742 -0700 -@@ -12,6 +12,6 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la -+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la - - test_SOURCES = test.c -diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac ---- gsl-1.16.orig/configure.ac 2013-07-19 08:14:45.000000000 -0700 -+++ gsl-1.16/configure.ac 2013-08-19 15:28:24.172640793 -0700 -@@ -191,6 +191,16 @@ - AC_CHECK_LIB(m, cos) - fi - -+sinclude(ax_cblas.m4) -+AX_CBLAS -+if test "x$CBLAS_LIBS" != "x"; then -+ CBLAS_LINK_LIBS="$CBLAS_LIBS" -+else -+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" -+ CBLAS_LIBS="-lgslcblas" -+fi -+AC_SUBST(CBLAS_LINK_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) -diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am ---- gsl-1.16.orig/eigen/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/eigen/Makefile.am 2013-08-19 15:25:27.728497742 -0700 -@@ -11,7 +11,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la -+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la - - test_SOURCES = test.c - -diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in ---- gsl-1.16.orig/gsl-config.in 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/gsl-config.in 2013-08-19 15:25:27.728497742 -0700 -@@ -58,11 +58,11 @@ - ;; - - --cflags) -- echo @GSL_CFLAGS@ -+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@ - ;; - -diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in ---- gsl-1.16.orig/gsl.pc.in 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/gsl.pc.in 2013-08-19 15:25:27.728497742 -0700 -@@ -2,7 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --GSL_CBLAS_LIB=-lgslcblas -+GSL_CBLAS_LIB=@CBLAS_LIBS@ - - Name: GSL - Description: GNU Scientific Library -diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am ---- gsl-1.16.orig/interpolation/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/interpolation/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am ---- gsl-1.16.orig/linalg/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/linalg/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am ---- gsl-1.16.orig/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -19,13 +19,12 @@ - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - - MINGW32_HOST = @MINGW32_HOST@ - if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la - libgsl_la_LDFLAGS += -no-undefined - endif - -@@ -35,10 +34,10 @@ - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la - - check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test - TESTS = test_gsl_histogram.sh pkgconfig.test -@@ -57,6 +56,8 @@ - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ - -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \ - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ - -e 's|@LIBS[@]|$(LIBS)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' - ---- gsl-1.16.orig/multifit/Makefile.am 2013-07-18 06:04:26.000000000 +1000 -+++ gsl-1.16/multifit/Makefile.am 2013-11-22 16:57:26.170330257 +1100 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c --test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la -+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la - -diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am ---- gsl-1.16.orig/multimin/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/multimin/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -13,8 +13,8 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - #demo_SOURCES = demo.c --#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am ---- gsl-1.16.orig/multiroots/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/multiroots/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -15,5 +15,5 @@ - TESTS = $(check_PROGRAMS) - - test_SOURCES = test.c test_funcs.c test_funcs.h --test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - -diff -Nur gsl-1.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am ---- gsl-1.16.orig/ode-initval/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/ode-initval/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -12,7 +12,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - -diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am ---- gsl-1.16.orig/poly/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/poly/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --check_PROGRAMS = test -+#check_PROGRAMS = test - - test_SOURCES = test.c - test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la -diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am ---- gsl-1.16.orig/specfunc/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/specfunc/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -12,7 +12,7 @@ - - check_PROGRAMS = test - --test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c - -diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am ---- gsl-1.16.orig/wavelet/Makefile.am 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/wavelet/Makefile.am 2013-08-19 15:25:27.729497736 -0700 -@@ -10,7 +10,7 @@ - - TESTS = $(check_PROGRAMS) - --test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la -+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la - - test_SOURCES = test.c - diff --git a/sci-libs/gsl/gsl-1.16-r1.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild deleted file mode 100644 index d7cd4e1..0000000 --- a/sci-libs/gsl/gsl-1.16-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.16.ebuild,v 1.1 2014/04/16 13:34:45 hasufell Exp $ - -EAPI=5 - -inherit multilib multilib-minimal eutils flag-o-matic autotools toolchain-funcs - -DESCRIPTION="The GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="cblas-external static-libs" - -RDEPEND="cblas-external? ( virtual/cblas )" -DEPEND="${RDEPEND} - app-admin/eselect-cblas - virtual/pkgconfig" - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) - -pkg_pretend() { - # prevent to use external cblas from a previously installed gsl - local current_lib - if use cblas-external; then - current_lib=$(eselect cblas show | cut -d' ' -f2) - if [[ ${current_lib} == gsl ]]; then - ewarn "USE flag cblas-external is set: linking gsl with an external cblas." - ewarn "However the current selected external cblas is gsl." - ewarn "Please install and/or eselect another cblas" - die "Circular gsl dependency" - fi - fi -} - -src_prepare() { - ESELECT_PROF="gsl" - - # bug 349005 - [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(tc-getCC)$ != *apple* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ - && filter-mfpmath sse - filter-flags -ffast-math - - epatch "${FILESDIR}"/${P}-cblas.patch - eautoreconf - - cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ - sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \ - "${T}"/eselect.cblas.gsl || die - fi - multilib_copy_sources -} - -multilib_src_configure() { - if use cblas-external; then - export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" - export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" - fi - econf \ - --enable-shared \ - $(use_with cblas-external) \ - $(use_enable static-libs static) -} - -multilib_src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + - - # take care of pkgconfig file for cblas implementation. - sed -e "s/@LIBDIR@/$(get_libdir)/" \ - -e "s/@PV@/${PV}/" \ - -e "/^prefix=/s:=:=${EPREFIX}:" \ - -e "/^libdir=/s:=:=${EPREFIX}:" \ - "${FILESDIR}"/cblas.pc.in > cblas.pc \ - || die "sed cblas.pc failed" - insinto /usr/$(get_libdir)/blas/gsl - doins cblas.pc || die "installing cblas.pc failed" - eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \ - ${ESELECT_PROF} -} - -pkg_postinst() { - local p=cblas - local current_lib=$(eselect ${p} show | cut -d' ' -f2) - if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then - # work around eselect bug #189942 - local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config - [[ -e ${configfile} ]] && rm -f ${configfile} - eselect ${p} set ${ESELECT_PROF} - elog "${p} has been eselected to ${ESELECT_PROF}" - else - elog "Current eselected ${p} is ${current_lib}" - elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):" - elog "\t eselect ${p} set ${ESELECT_PROF}" - fi -} diff --git a/sci-libs/onnxruntime/Manifest b/sci-libs/onnxruntime/Manifest new file mode 100644 index 0000000..e6fcbb9 --- /dev/null +++ b/sci-libs/onnxruntime/Manifest @@ -0,0 +1,17 @@ +AUX onnxruntime-1.9.1-HIP-REQUIRED-for-ROCM.patch 1050 BLAKE2B f90e4f3de9e418f14d94ad9a585331485fcc913fadd372912f0336a783ad9199057c896a7af0836ec3c4cb57505495deaf5d6971414b0b7607e3d76bf67b3cf9 SHA512 5392e6534a11b490c49cd7710f74403f68175c5a5841b05fb3caab08ac5e24d3d88874d62bb0264b2100e78508cc70dda9fc0a503c2e865dc09881dde6281558 +AUX onnxruntime-1.9.1-directories-dirty-and-gfx1100-target.patch 1647 BLAKE2B 1a346366a729fb45b84e152ad952fc377671779d13f9b3132326b02a8ee203e5cd1d27df3a099d9efb7e9bfe20e9f4efa87d449ca643f7dbd5f9b87d8b27f52a SHA512 4ad05e7891fab332959fbbfc9989362c91535e8140367937f6f8569846fb2fd3c14e0372a265ca1cc1865aaf7e345bebf9099a51bbf590ec7ef7f276cdb627c9 +AUX onnxruntime-1.9.1-fix-RepeatedIterator-compile-error.patch 1356 BLAKE2B 28f8c64f1092954b36726cd5550e3db9ce84aebfe158ed987b5e31104ae73c38c59a6e94d8fdaf15ca08ce186df3fae1e0f0e9c13c3d68ea45c8d9953d6218ab SHA512 97e59b8ce0ea217b77ffdac9167c7565fc6f72c6db1bbd68e71e5b3bdc616056c4abd0aa323e36b03f065202605ede0502e3ad112c5d092e1c1b707463817f5e +AUX onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch 1848 BLAKE2B 248992b6ac21c4caa2501e326a4aa157605a3bfa84a33a397ded8937ab71dfe8253360bb6b5038aa9cdf189533accfd54aa69a2d7f74e7244f85c6f9c7f2ef3f SHA512 877c03ffe53e3d5fb24d0db103b9a031a51d998985f22d8295207159ef7cd65174c6c86ce1b179861fd40fa1abfedd01df68410b4892b5b4922ea93e65594c3a +AUX onnxruntime-1.9.1-hip_add_library-workaround.patch 909 BLAKE2B d2faf978023637011f0b8111dc2304e8f0b08c6eb2d3d7d61072830bab275fb4d0a81d0620dd68c1d840bdc61026a9c86377191835afdfa9dd58b794006cafca SHA512 8b1fb4fdeff553a01e867b53ded9864e2ea860b9ab83566bd55f9a35a538611470993c60d802984dde453ef4e4c5e397a0961606198f7a69d6649ba9ab34f670 +AUX onnxruntime-1.9.1-system_libs.patch 3196 BLAKE2B b9107002944c53daaa9ac7da7daad84366f4e3ddfec6d7af677f960fc9cb95a8370dcd109c3942ab259e9193a93985514df653f10d5e6d66b993a3a9cb938396 SHA512 5b739446c8adc0dec6442577f6fbaca57a2c0f0acce83ae20a96cf3d12218118dbc318c979b69f03aeb21b02c8b02b1c64efb2c17bfc00d846698aa5af3494a4 +AUX onnxruntime-1.9.1-uppercase-for-hip_add_library.patch 1045 BLAKE2B 5280d6ec764491593b4b7665991f215fe8169398fa65fef6184b578cf66715894cc0a2602b14c49b1544d42918f743f2a1a74d21775df4c0ccbc65f1b2b96a16 SHA512 db5a5a9b3f666079145da568aa0e8df919e5afb6421249d8bba1b74983286116be3905c358b50a06a2a232a8c5f8041c2fc5e74ef3789674d1ae0250fcb9e4ba +DIST SafeInt-a104e0cf23.tar.gz 541952 BLAKE2B 6a7d025dce9aae6090704783aef4d1e71298c6e99af1d322f2ecf6c1504bf1c0c38140255f77b6f178fe23edb61b23a633b191c1b7d2b736692ba33a27916843 SHA512 95a0784e0d79e1a712e454475d1863732b5cf03abd83687e84fc9f1b993ecf0d47a3a252cd5b86a2baea3c194406c8b4678d6d6f8d86e89a18602270ddee18b9 +DIST boost_mp11-21cace4e574.tar.gz 104182 BLAKE2B 9c4c103cab0a6d738a38bc0afd7752233592f47b55434de4af15f927f1b2711ca5fc47e8a2edb5e2991e9d554ae7303dd19a0386109b470f052089b25df79101 SHA512 82b32466c2287f87b16b3244793dac6eb1a34c52f3ebabf5a19f1f2527253e14f23349290e5ba9b5171503e2392debc7e1e4c75ce5fa0c7c9778afe658984423 +DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063 +DIST onnx-1f63dcb7fc.tar.gz 9407541 BLAKE2B 6e701385a1c24c3f8f69427368ed79b3b190358a6496a1c45d59f096487edce893d567c934a768f1b64b65004baea9202266ac0d2fcd6a898cec3d4fcb0e333d SHA512 d42680f663951aa5168ee7cd5cfc59b67bf1831da3eadc400d360a2a9e2562d993467afadf2d8389a26c9b71f33faf7e18c20200ee846ece96ccca0c919986aa +DIST onnxruntime-1.14.0.tar.gz 199507980 BLAKE2B 2a559c1be54f3c8a6cdec3b31e8847c23c32c30083da7699f429a7b6ecb2b8d4be7c9df87814f69bde3c5bfedd987733c6794835a15c93d397c1c09f72b6b029 SHA512 b250bea82fdfb99807c72c52a141df16ed9885b4e05bf1b64992537583c93a3eb85b5b3668296b4229b37ebdea41e30a97dcea3f58f651252467fc7e8e9caf76 +DIST onnxruntime-1.9.1.tar.gz 290241910 BLAKE2B c0bbd2f987978f1d995c652904a79af32b520a2160e486cdb4b002ae00f730f511d827998a2d9da32fc6582d7ced7ab6f712b60ee2ce94a6bdd640d3a8a9d693 SHA512 66c4bff4c4f633885ba7d0601337d0f16c0eeef7e3c1f492f2d21f27f06f748260e28105083b5defbebf624f4f26dc59355de7e3e0ef81c6c27b01b936a98ce9 +DIST optional-lite-4acf4553ba.tar.gz 48384 BLAKE2B 63c310bb115310df95a3a95fd917b2c9c0dd91533aec06390a285d923f8b80f1f6a9322fae6837d2bcc933e5b0261ea1262157f177960a47fad48fa4a0135aa9 SHA512 f3ab8dc3b6705ebd201943cbcdce5cf5c75b1ced317561890d74be351e707b65db4a6b3bce6bef91f94d28c68715e58be9c7b522adec93c1acbb31ceb8fc0447 +DIST pytorch-cpuinfo-5916273f79.tar.gz 3496223 BLAKE2B 4da452faf12138fbc1abd266d8ae6e0a0192f48a84faccb55fd05c3ac85d0bea2ecbd80b5eda69bb51c6704a223f90dd83d1f0fc79d56d35dd21cae5c5b8fab5 SHA512 50e537b61d991e8579577fb1ecf8d9ceb2171dbad96dfe159a062eadfdc0b2372b94988fc6f223c20e327453c7f55042ee06779f5b5fe0922f4470f746c9686b +EBUILD onnxruntime-1.14.0.ebuild 2308 BLAKE2B f2eb8bd3eb866288c2f6369487a7e765ffe2bf718879856892b8fb57752cbbb71ff98bf1fad465b65ab473e8bb9abfffd0bddbda2441e88ba195056b1d395c82 SHA512 917297f36e05512756fd6f13f54ec0a413709585413320c9e6a26428a886c3c5935d8a91d3823109858392cd9173b3f72bd83a89f6453d3c83d0bc0bef2099e6 +EBUILD onnxruntime-1.9.1.ebuild 3488 BLAKE2B 99adde17cc42157c689b74aa1d0cb83a13ad8f3ceb093b4278ba4d5ab5425f1742ec4b6ccb89bea7963f7cd8a243c2269700ebec394a61622407025d752b87ce SHA512 f381053696cfba972dc8f0ac082f872d91dd60fca288903c41bb7717425557b4e9a1c5328f3eefb558d95853c00ed6ace80632d4542f650ad4e3d351ee23cc35 diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-HIP-REQUIRED-for-ROCM.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-HIP-REQUIRED-for-ROCM.patch new file mode 100644 index 0000000..3053340 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-HIP-REQUIRED-for-ROCM.patch @@ -0,0 +1,25 @@ +From 124512ae9351bc0e704c6349902a6f446792a85e Mon Sep 17 00:00:00 2001 +From: Igor Ulyanov <disinbox@gmail.com> +Date: Sun, 26 Feb 2023 12:44:18 +0300 +Subject: [PATCH] HIP REQUIRED for ROCM + +--- + cmake/onnxruntime_providers.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake +index 5b5ff585ca..ee847b2ec8 100644 +--- a/onnxruntime-1.9.1/cmake/onnxruntime_providers.cmake ++++ b/onnxruntime-1.9.1/cmake/onnxruntime_providers.cmake +@@ -1008,7 +1008,7 @@ if (onnxruntime_USE_ROCM) + list(APPEND CMAKE_PREFIX_PATH ${onnxruntime_ROCM_HOME} ${onnxruntime_ROCM_HOME}/hip ${onnxruntime_ROCM_HOME}/hcc ${onnxruntime_ROCM_HOME}/miopen ${onnxruntime_ROCM_HOME}/hiprand ${onnxruntime_ROCM_HOME}/rocrand) + + set(CMAKE_MODULE_PATH "${onnxruntime_ROCM_HOME}/hip/cmake" ${CMAKE_MODULE_PATH}) +- find_package(HIP) ++ find_package(HIP REQUIRED) + find_package(hiprand REQUIRED) + find_library(HIP_LIB amdhip64 REQUIRED) + find_library(ROC_BLAS rocblas REQUIRED) +-- +2.39.1 + diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-directories-dirty-and-gfx1100-target.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-directories-dirty-and-gfx1100-target.patch new file mode 100644 index 0000000..0abd819 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-directories-dirty-and-gfx1100-target.patch @@ -0,0 +1,40 @@ +From d62ce01a096db93cf4f22ca12681bdead9d0d64b Mon Sep 17 00:00:00 2001 +From: Igor Ulyanov <disinbox@gmail.com> +Date: Sun, 26 Feb 2023 16:19:31 +0300 +Subject: [PATCH] directories (dirty) and gfx1100 target + +--- + cmake/onnxruntime_providers.cmake | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake +index ea465ca817..6eb3f30fc8 100644 +--- a/onnxruntime-1.9.1/cmake/onnxruntime_providers.cmake ++++ b/onnxruntime-1.9.1/cmake/onnxruntime_providers.cmake +@@ -1016,6 +1016,14 @@ if (onnxruntime_USE_ROCM) + find_library(RCCL_LIB rccl REQUIRED) + set(ONNXRUNTIME_ROCM_LIBS ${HIP_LIB} ${ROC_BLAS} ${MIOPEN_LIB} ${RCCL_LIB}) + ++ include_directories("/usr/include/rocblas/") ++ include_directories("/usr/include/miopen/") ++ include_directories("/usr/include/rccl/") ++ include_directories("/usr/include/rocsparse/") ++ include_directories("/usr/include/hipsparse/") ++ include_directories("/usr/include/hiprand/") ++ include_directories("/usr/include/hipfft/") ++ + file(GLOB_RECURSE onnxruntime_providers_rocm_cc_srcs CONFIGURE_DEPENDS + "${ONNXRUNTIME_ROOT}/core/providers/rocm/*.h" + "${ONNXRUNTIME_ROOT}/core/providers/rocm/*.cc" +@@ -1099,7 +1107,7 @@ if (onnxruntime_USE_ROCM) + list(APPEND HIP_CLANG_FLAGS -fno-gpu-rdc) + + # Generate GPU code for GFX9 Generation +- list(APPEND HIP_CLANG_FLAGS --amdgpu-target=gfx906 --amdgpu-target=gfx908) ++ list(APPEND HIP_CLANG_FLAGS --amdgpu-target=gfx1100) + + include("/usr/lib64/cmake/hip/FindHIP.cmake") + hip_add_library(onnxruntime_providers_rocm ${onnxruntime_providers_rocm_src}) +-- +2.39.1 + diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-fix-RepeatedIterator-compile-error.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-fix-RepeatedIterator-compile-error.patch new file mode 100644 index 0000000..95fd603 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-fix-RepeatedIterator-compile-error.patch @@ -0,0 +1,25 @@ +From 35ff9ccba664d3d1f369163f9778739c6c36aab1 Mon Sep 17 00:00:00 2001 +From: Igor Ulyanov <disinbox@gmail.com> +Date: Sat, 18 Feb 2023 21:13:37 +0300 +Subject: [PATCH] fix RepeatedIterator compile error + +--- + onnxruntime/core/framework/tensorprotoutils.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/onnxruntime/core/framework/tensorprotoutils.cc b/onnxruntime/core/framework/tensorprotoutils.cc +index ce23ae1de5..1472e430f5 100644 +--- a/onnxruntime-1.9.1/onnxruntime/core/framework/tensorprotoutils.cc ++++ b/onnxruntime-1.9.1/onnxruntime/core/framework/tensorprotoutils.cc +@@ -256,7 +256,7 @@ Status UnpackTensor(const ONNX_NAMESPACE::TensorProto& tensor, const void* raw_d + ") does not match the data size(", tensor.field_size(), ") in proto"); \ + auto& data = tensor.field_name(); \ + for (auto data_iter = data.cbegin(); data_iter != data.cend(); ++data_iter) \ +- *p_data++ = *reinterpret_cast<const T*>(data_iter); \ ++ *p_data++ = *(data_iter); \ + return Status::OK(); \ + } + +-- +2.39.1 + diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch new file mode 100644 index 0000000..ac57841 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-get-rocm-version-from-hipconfig.patch @@ -0,0 +1,37 @@ +From d299f50832f88f7d4e46b760f277782cee30f01f Mon Sep 17 00:00:00 2001 +From: Igor Ulyanov <disinbox@gmail.com> +Date: Sun, 19 Feb 2023 19:45:15 +0300 +Subject: [PATCH] get rocm version from hipconfig + +--- + cmake/CMakeLists.txt | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 2534b99ff4..e79d43451e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1609,8 +1609,9 @@ if (onnxruntime_USE_ROCM) + + # replicate strategy used by pytorch to get ROCM_VERSION + # https://github.com/pytorch/pytorch/blob/8eb21488fdcdb8b0e6fa2e46179b5fa6c42e75af/cmake/public/LoadHIP.cmake#L153-L173 +- file(READ "${ROCM_PATH}/.info/version-dev" ROCM_VERSION_DEV_RAW) +- string(REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)-.*$" ROCM_VERSION_DEV_MATCH ${ROCM_VERSION_DEV_RAW}) ++ # file(READ "${ROCM_PATH}/.info/version-dev" ROCM_VERSION_DEV_RAW) ++ execute_process(COMMAND hipconfig -v OUTPUT_VARIABLE ROCM_VERSION_DEV_RAW) ++ string(REGEX MATCH "^([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?$" ROCM_VERSION_DEV_MATCH ${ROCM_VERSION_DEV_RAW}) + if(ROCM_VERSION_DEV_MATCH) + set(ROCM_VERSION_DEV_MAJOR ${CMAKE_MATCH_1}) + set(ROCM_VERSION_DEV_MINOR ${CMAKE_MATCH_2}) +@@ -1618,7 +1619,7 @@ if (onnxruntime_USE_ROCM) + set(ROCM_VERSION_DEV "${ROCM_VERSION_DEV_MAJOR}.${ROCM_VERSION_DEV_MINOR}.${ROCM_VERSION_DEV_PATCH}") + math(EXPR ROCM_VERSION_DEV_INT "(${ROCM_VERSION_DEV_MAJOR}*10000) + (${ROCM_VERSION_DEV_MINOR}*100) + ${ROCM_VERSION_DEV_PATCH}") + endif() +- message("\n***** ROCm version from ${ROCM_PATH}/.info/version-dev ****\n") ++ message("\n***** ROCm version from hipconfig -v ****\n") + message("ROCM_VERSION_DEV: ${ROCM_VERSION_DEV}") + message("ROCM_VERSION_DEV_MAJOR: ${ROCM_VERSION_DEV_MAJOR}") + message("ROCM_VERSION_DEV_MINOR: ${ROCM_VERSION_DEV_MINOR}") +-- +2.39.1 + diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-hip_add_library-workaround.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-hip_add_library-workaround.patch new file mode 100644 index 0000000..21ae344 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-hip_add_library-workaround.patch @@ -0,0 +1,24 @@ +From 0ddc72085b33e7f099dc1e7aaf17964226b6e266 Mon Sep 17 00:00:00 2001 +From: Igor Ulyanov <disinbox@gmail.com> +Date: Sun, 26 Feb 2023 15:43:48 +0300 +Subject: [PATCH] hip_add_library workaround + +--- + cmake/onnxruntime_providers.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake +index ee847b2ec8..ea465ca817 100644 +--- a/onnxruntime-1.9.1/cmake/onnxruntime_providers.cmake ++++ b/onnxruntime-1.9.1/cmake/onnxruntime_providers.cmake +@@ -1101,6 +1101,7 @@ if (onnxruntime_USE_ROCM) + # Generate GPU code for GFX9 Generation + list(APPEND HIP_CLANG_FLAGS --amdgpu-target=gfx906 --amdgpu-target=gfx908) + ++ include("/usr/lib64/cmake/hip/FindHIP.cmake") + hip_add_library(onnxruntime_providers_rocm ${onnxruntime_providers_rocm_src}) + + target_link_libraries(onnxruntime_providers_rocm PRIVATE ${ONNXRUNTIME_ROCM_LIBS}) +-- +2.39.1 + diff --git a/sci-libs/onnxruntime/files/onnxruntime-1.9.1-system_libs.patch b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-system_libs.patch new file mode 100644 index 0000000..669eb18 --- /dev/null +++ b/sci-libs/onnxruntime/files/onnxruntime-1.9.1-system_libs.patch @@ -0,0 +1,92 @@ +diff --git a/CMakeLists.txt.old b/CMakeLists.txt +index 2534b99..d144047 100644 +--- a/CMakeLists.txt.old ++++ b/CMakeLists.txt +@@ -540,7 +540,7 @@ if (MSVC) + set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh") + endif() + endif() +- ++ + + #Always enable exception handling, even for Windows ARM + if(NOT onnxruntime_DISABLE_EXCEPTIONS) +@@ -833,7 +833,13 @@ get_filename_component(ORTTRAINING_ROOT "${ORTTRAINING_ROOT}" ABSOLUTE) + get_filename_component(REPO_ROOT "${REPO_ROOT}" ABSOLUTE) + set(ONNXRUNTIME_INCLUDE_DIR ${REPO_ROOT}/include/onnxruntime) + +-add_subdirectory(external/date EXCLUDE_FROM_ALL) ++if(onnxruntime_PREFER_SYSTEM_LIB) ++ find_package(date REQUIRED) ++ add_library(date_interface ALIAS date::date) ++endif() ++if(NOT TARGET date::date) ++ add_subdirectory(external/date EXCLUDE_FROM_ALL) ++endif() + + set(SAFEINT_INCLUDE_DIR ${REPO_ROOT}/cmake/external/SafeInt) + add_library(safeint_interface INTERFACE) +@@ -844,16 +850,33 @@ if(onnxruntime_DISABLE_EXCEPTIONS) + add_compile_definitions(optional_CONFIG_NO_EXCEPTIONS=1) + endif() + +-add_subdirectory(external/mp11 EXCLUDE_FROM_ALL) ++if(onnxruntime_PREFER_SYSTEM_LIB) ++ find_package(boost_mp11) ++endif() ++if(NOT TARGET Boost::mp11) ++ add_subdirectory(external/mp11 EXCLUDE_FROM_ALL) ++endif() + +-set(JSON_BuildTests OFF CACHE INTERNAL "") +-set(JSON_Install OFF CACHE INTERNAL "") +-add_subdirectory(external/json EXCLUDE_FROM_ALL) ++if(onnxruntime_PREFER_SYSTEM_LIB) ++ find_package(nlohmann_json REQUIRED) ++endif() ++if(NOT TARGET nlohmann_json::nlohmann_json) ++ set(JSON_BuildTests OFF CACHE INTERNAL "") ++ set(JSON_Install OFF CACHE INTERNAL "") ++ add_subdirectory(external/json EXCLUDE_FROM_ALL) ++endif() + ++find_package(PkgConfig) + if(onnxruntime_PREFER_SYSTEM_LIB) +- find_package(re2) ++ pkg_check_modules(RE2 re2) + endif() +-if(NOT TARGET re2::re2) ++if(RE2_FOUND) ++ add_library(re2::re2 INTERFACE IMPORTED) ++ set_target_properties(re2::re2 PROPERTIES ++ INTERFACE_COMPILE_OPTIONS "${RE2_CFLAGS}" ++ INTERFACE_LINK_LIBRARIES "${RE2_LDFLAGS}" ++ ) ++else() + add_subdirectory(external/re2 EXCLUDE_FROM_ALL) + set_target_properties(re2 PROPERTIES FOLDER "External/re2") + set(RE2_INCLUDE_DIR ${REPO_ROOT}/cmake/external/re2) +@@ -885,12 +908,12 @@ else() + elseif(WINDOWS_STORE OR (WIN32 AND NOT CMAKE_CXX_STANDARD_LIBRARIES MATCHES kernel32.lib)) + message(WARNING "Cpuinfo not included in Windows Store or WCOS builds") + set(CPUINFO_SUPPORTED FALSE) +- endif() ++ endif() + elseif(NOT ${onnxruntime_target_platform} MATCHES "^(i[3-6]86|AMD64|x86(_64)?|armv[5-8].*|aarch64|arm64)$") + message(WARNING + "Target processor architecture \"${onnxruntime_target_platform}\" is not supported in cpuinfo. " + "cpuinfo not included.") +- set(CPUINFO_SUPPORTED FALSE) ++ set(CPUINFO_SUPPORTED FALSE) + endif() + endif() + +@@ -907,7 +930,7 @@ if(CPUINFO_SUPPORTED) + set(IOS ON CACHE INTERNAL "") + set(IOS_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE INTERNAL "") + endif() +- ++ + string(APPEND CMAKE_CXX_FLAGS " -DCPUINFO_SUPPORTED") + add_subdirectory(external/pytorch_cpuinfo EXCLUDE_FROM_ALL) + if(MSVC) diff --git a/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild b/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild new file mode 100644 index 0000000..7c23cab --- /dev/null +++ b/sci-libs/onnxruntime/onnxruntime-1.9.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 2021 Haelwenn (lanodan) Monnier <contact@hacktivis.me> +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +CPUINFO_COMMIT=5916273f79a21551890fd3d56fc5375a78d1598d +ONNX_COMMIT=1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35 +MP11_COMMIT=21cace4e574180ba64d9307a5e4ea9e5e94d3e8d +OPTIONAL_LITE_COMMIT=4acf4553baa886e10e6613fe1452b706b0250e78 +SAFEINT_COMMIT=a104e0cf23be4fe848f7ef1f3e8996fe429b06bb +FLATBUFFERS_PV=1.12.0 + +DESCRIPTION="cross-platform, high performance ML inferencing and training accelerator" +HOMEPAGE="https://github.com/microsoft/onnxruntime" +SRC_URI=" + https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/pytorch/cpuinfo/archive/${CPUINFO_COMMIT}.tar.gz -> pytorch-cpuinfo-${CPUINFO_COMMIT:0:10}.tar.gz + https://github.com/onnx/onnx/archive/${ONNX_COMMIT}.tar.gz -> onnx-${ONNX_COMMIT:0:10}.tar.gz + https://github.com/boostorg/mp11/archive/${MP11_COMMIT}.tar.gz -> boost_mp11-${MP11_COMMIT:0:11}.tar.gz + https://github.com/google/flatbuffers/archive/v${FLATBUFFERS_PV}.tar.gz -> flatbuffers-${FLATBUFFERS_PV}.tar.gz + https://github.com/martinmoene/optional-lite/archive/${OPTIONAL_LITE_COMMIT}.tar.gz -> optional-lite-${OPTIONAL_LITE_COMMIT:0:10}.tar.gz + https://github.com/dcleblanc/SafeInt/archive/${SAFEINT_COMMIT}.tar.gz -> SafeInt-${SAFEINT_COMMIT:0:10}.tar.gz +" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="benchmark test rocm" + +# libonnxruntime_framework.so: undefined reference to `onnx::AttributeProto_AttributeType_Name[abi:cxx11](onnx::AttributeProto_AttributeType)' +RESTRICT="test" + +S="${WORKDIR}/${P}/cmake" + +# Needs https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch on eigen-3.4.0 +RDEPEND=" + dev-python/numpy + dev-libs/date:= + >=dev-libs/boost-1.66:= + dev-libs/protobuf:= + dev-libs/re2:= + dev-libs/flatbuffers:= + dev-cpp/nlohmann_json:= + dev-libs/nsync + dev-cpp/eigen:3 + benchmark? ( dev-cpp/benchmark ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${P}-system_libs.patch" + "${FILESDIR}/${P}-get-rocm-version-from-hipconfig.patch" +) + +src_unpack() { + if [[ -n ${A} ]]; then + unpack ${A} + fi + eapply "${FILESDIR}/${P}-fix-RepeatedIterator-compile-error.patch" + eapply "${FILESDIR}/${P}-HIP-REQUIRED-for-ROCM.patch" + eapply "${FILESDIR}/${P}-hip_add_library-workaround.patch" + eapply "${FILESDIR}/${P}-directories-dirty-and-gfx1100-target.patch" +} + +src_prepare() { + cmake_src_prepare + + rm -r "${S}/external/pytorch_cpuinfo" || die + mv "${WORKDIR}/cpuinfo-${CPUINFO_COMMIT}" "${S}/external/pytorch_cpuinfo" || die + + rm -r "${S}/external/onnx" || die + mv "${WORKDIR}/onnx-${ONNX_COMMIT}" "${S}/external/onnx" || die + + rm -r "${S}/external/mp11" || die + mv "${WORKDIR}/mp11-${MP11_COMMIT}" "${S}/external/mp11" || die + + rm -r "${S}/external/flatbuffers" || die + mv "${WORKDIR}/flatbuffers-${FLATBUFFERS_PV}" "${S}/external/flatbuffers" || die + + rm -r "${S}/external/optional-lite" || die + mv "${WORKDIR}/optional-lite-${OPTIONAL_LITE_COMMIT}" "${S}/external/optional-lite" || die + + rm -r "${S}/external/SafeInt/safeint" || die + mv "${WORKDIR}/SafeInt-${SAFEINT_COMMIT}" "${S}/external/SafeInt/safeint" || die +} + +src_configure() { + append-cppflags "-I/usr/include/eigen3" + + local mycmakeargs=( + -Donnxruntime_PREFER_SYSTEM_LIB=ON + -Donnxruntime_BUILD_BENCHMARKS=$(usex benchmark) + -Donnxruntime_BUILD_UNIT_TESTS=$(usex test) + -Donnxruntime_USE_ROCM=$(usex rocm) + ) + + cmake_src_configure +} diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest index 99286f9..5e3c524 100644 --- a/sci-libs/scikits_image/Manifest +++ b/sci-libs/scikits_image/Manifest @@ -1,3 +1,8 @@ DIST scikit-image-0.15.0.tar.gz 32288867 BLAKE2B 48198e1c6e4213ddc15674b9adc52238bf37bc3bd221e4adeb2f308c420671c08fc6d2e56dcfc471d8ff2b90faf750f5c49de607648138be88f50ae15b9acd21 SHA512 9d0be54ddd564c0f28eae979b6f348011f7b38c8811f70ad460330905e706fe145dd6a30b502d15126450148fdbb3f54a271227d46e2d078030054ad00f35bc3 +DIST scikit-image-0.16.2.tar.gz 28945695 BLAKE2B e092d05ce302dee1c501429f7bc8499a5bfea029637b8d90d6ade18625b43cd94d3e33a52909b1888065f6e12e51e784487b72cc0f4f5747a1ffb9034ec13116 SHA512 55393f90a00488bb177600db1a6479a297d9b73f3e9bdbaa59fdb3a3a862c50f6d35a33b4e8a1923cf3dc8bc78ab800c628824bb53fb045f4d518ad1b3a796c4 +DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e EBUILD scikits_image-0.15.0.ebuild 1761 BLAKE2B e80c46e921db842fa12e546a4633ee0ab8138fd063ecb53dc74ebd506e60e2ffed3110e73ebc974787c2583366db742aabf719c995f4fa42a91ffb1f3df50d8d SHA512 aec59061f62c4a742c564f9840e20aee2a194c707c33fb34b68a5467dc89d935380e4728dc0004672b9cfa862f83021484b89e8ff685046dd609177b595f17bf +EBUILD scikits_image-0.16.2.ebuild 1761 BLAKE2B e80c46e921db842fa12e546a4633ee0ab8138fd063ecb53dc74ebd506e60e2ffed3110e73ebc974787c2583366db742aabf719c995f4fa42a91ffb1f3df50d8d SHA512 aec59061f62c4a742c564f9840e20aee2a194c707c33fb34b68a5467dc89d935380e4728dc0004672b9cfa862f83021484b89e8ff685046dd609177b595f17bf +EBUILD scikits_image-0.17.2.ebuild 1790 BLAKE2B 8ded31b357117418fc7b300051d09a5efbebdd1ca15cac414f7c8d97ae0ab92d12a3481b5f874b89edcf3da6cae0fa9e0ad96a3676201a840a07829b04312d84 SHA512 4d4fc66424011833eaec3c9027081efc65d805f2a8ea177d08167127f15eb8d9fb57d70aaa7c2b9fd9eb44827e03143d8633aa9f296a468fafb35e5033f099f0 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40 +MISC scikits_image-0.16.2.ebuild_ 2047 BLAKE2B 2a2398ffdc9f18c06379a9663c52350fbb882d950e8f0c22c28d48dbbae324507cbb1f47e41f326f35125069988625a2067c77f03825960c996649d8248610ed SHA512 cb8a27cd4ef172d250b0e07838d6a16cfb299a31c1f466c9e81d1c82dd69f72e5657f53615d04050d6b85bc21235ef0b971f8eb09cabc8505588ce31ff2cce22 diff --git a/sci-libs/scikits_image/scikits_image-0.15.0.ebuild b/sci-libs/scikits_image/scikits_image-0.17.2.ebuild index 9a6348f..e6aa045 100644 --- a/sci-libs/scikits_image/scikits_image-0.15.0.ebuild +++ b/sci-libs/scikits_image/scikits_image-0.17.2.ebuild @@ -1,9 +1,9 @@ -# 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 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit distutils-r1 eutils virtualx @@ -18,6 +18,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc freeimage pyamg test" +RESTRICT="!test? ( test )" RDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] @@ -30,13 +31,13 @@ RDEPEND=" freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} - >=dev-python/cython-0.23[${PYTHON_USEDEP}] + >=dev-python/cython-0.28[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] )" S="${WORKDIR}/${MYP}" -DOCS=( CONTRIBUTORS.txt RELEASE.txt ) +DOCS=( CONTRIBUTORS.txt RELEASE.txt TODO.txt ) python_test() { distutils_install_for_testing @@ -44,7 +45,7 @@ python_test() { echo "backend : Agg" > matplotlibrc || die #echo "backend.qt4 : PyQt4" >> matplotlibrc || die #echo "backend.qt4 : PySide" >> matplotlibrc || die - MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die + MPLCONFIGDIR=. virtx nosetests --exe -v skimage } pkg_postinst() { diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest deleted file mode 100644 index b72c09f..0000000 --- a/sci-libs/tensorflow/Manifest +++ /dev/null @@ -1,40 +0,0 @@ -AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d -AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b -AUX tensorflow-2.1.0-cuda_10.2_support_bin2c.patch 518 BLAKE2B 945a7e2a4b0379c05a274bbc2582fabf37b3447282d14dc28725b8d3b4e8d0a17bada117775e22697f9c2ba5549223a89c4849c49cf007e10ab9da3933255051 SHA512 01f4e5a02b2c68bc39b5be251257a2a484aa66aabaeca33a3e4ab9d434928cb63fb3846fa8870c565a40706acc686d3522e953ae3cc9fbd41d49d27c27838d8d -AUX tensorflow-2.1.0-external_libs.patch 1024 BLAKE2B ab7bbe1f041f25f3d7cf29140d19e07d3c5af83d556895f01cf022c0191dd4fe7ae0e181f01cb94dbf69bb7e6e4a4dfb3765ce7c62d54746189a5e01b7dba460 SHA512 81118b3478925cb163ed3b1b5395247c0528b349a6f0d78535f09ce693e64bb776ddf94a33b4d959bed9c91a030bcf9084bd5b07d2aa4a72b8d4bacc72d93cfb -AUX tensorflow-2.1.0-python3.8-pywrap_tensor.patch 666 BLAKE2B 7d261c297e800872030bbaf279b50ba854464c1d90babd10a1baadd2a19a33192bcb77718abe4fdd11829ea657f0e061ca0b2d19ac0bbbb68fe1d7274eb39bff SHA512 4e5ac3b6cb4be5de2a21f5cd1dfb84c04ceb1046b7aefd200a2326469c256abe3f0f3514463658b3be902a146145017874c0ba150df9d6e711e2e9cca21934c2 -AUX tensorflow-rocm-3.0.0_configure_bazel.patch 11930 BLAKE2B 1f67f62993dd980df7c8a4276ed4eaf0e93908654d3ae2decbb876428ca3b96421ae63bb469344b6e9ab74936d8af16e75c2d94552d3b9db94a5c0c6e3dc400a SHA512 ecbb5d96de8e89459a0bc6d93eb1d90a5fb2ce53eb2affca677d9429e6efa29c7263eb9ce3f64a75c49ba9afa905192ba321ca0c5cc9bcf384cf1a6325b57f66 -DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9 -DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4 -DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9 -DIST astunparse.licence 3936 BLAKE2B 080f2c4602fa1a5df4fa97d0f99122f4aaba4ed891559802f6be0372b7869276dcb477e681c4fc438f027810a9a921d3f18c2cb2c644f11f5d101805ae95813d SHA512 eae99d58f3ec50290b78c3288802b54b791e02cc66bb0e3fff6611c74316d7a3ec6e5d6ce0c8a1e5cfe9808ad0601fd3d8627b663d6f31a59ad269d73b97622f -DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826 -DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb492db172b1d2a849ed5f14f91dbb76606335d369e4b15c4eec41adfe3a23cdc5b4f3b2f1351a5e9c25103c002b96a2 SHA512 4729941cedca8ddb876a621b28221d3c17dbb5dd72af27e55f48274208f21db986c5e7cb8adb742c42124bfa8073eb782b49e2557cb3f3f95ca56833fef925c0 -DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6 -DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d -DIST bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697 -DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035 -DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a -DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03 -DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c -DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489 -DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed -DIST eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz 2580537 BLAKE2B 927897c80f3529da40a76ddde26113403926d730fa4539aa9e4121406e8d3852abcfdbc55d178723300e9daa26176f6170db06bb49a59cb190e8c7e6dfdea4dd SHA512 d5461e615044aa94b6ac9ab2815536f4bdf2b9ccfeb578cc7bc62554ba928b4192450f72f1350f3231ed44d2bb90e95218de9a5d0bcee9ec02867499a6dc5db0 -DIST eigen-b9362fb8f76fbba805b56afbc0f5de0a279631b5.tar.gz 2585987 BLAKE2B 08798df1dd1816dad55eac187fea2949d998888cad497718ce4c84ae103807ef6f6e8b6db6ec30a732bba891d3c1eb8671385689e13e4de4ebc69ec0e0d5c572 SHA512 25aeca62e29661ca04d887ad148b461de7034f4fa5e7163b99da2788f1735b580d893415a7bf708355a83202e2b8c6307f68ec30a04c14cd18ef7be071501b15 -DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00 -DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951 -DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f -DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b -DIST llvm-c8695ba9cdebfc25af3312a84d91ae6f0f98487b.tar.gz 121058267 BLAKE2B 7d766874828c715583a1b800825ee9fe55ed0a3bcd5112a23cbc472ba5bdd9ef755b4c07d24c3166fcef714bbee6611f0604c836e59603845f88329216d9b9b2 SHA512 0492021b891c2df853fb6b72bf3bb0eaf2252fe82a58f5722869e00d6962ee6fa83d765963900f3156c6118f357fd3ccec4fd15f598e08dfd2ce6e93c7434cc3 -DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88 -DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e -DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16 -DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa -DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450 -DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e -DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856 -DIST tensorflow-2.1.0_rc2.tar.gz 41641498 BLAKE2B 1ab001f6804cd6b2b3122cd5bf84905d81b1632f363134dc30aee92869077da2420799d0e70ea050004ac854a7e887a44176806b8cdfab5f12b9c8f7440d22be SHA512 7b8c9a83b5c25b36f680cfdaeefdc932cab93ecfc25622cd46ac14b2f5582eea4f04c6bdd5d63058266d5e0bf2cd9e1fb7a0647be62fb4ec4b910b0e7b4214e0 -DIST tensorflow-9999.zip 54805526 BLAKE2B 511b8a47fc0f402770e0a8feba301fe0d53ecc9442377be4f424c07d1ed10bd4fbe333a367852b8d664b0727f27a42d8eeca489018f3166a07c3f0f1dea9f257 SHA512 cb471c5182f390a086aede06776f2f1cd634078c2ae291416267d18ca65e82ffc794f212a31a63bba9fcce3f132958aec6bf23c00e417de68a255e070d8cc908 -EBUILD tensorflow-2.1.0_rc2.ebuild 12715 BLAKE2B bb90067d7da705a3b6ee1ff3ecba1fbd5f32148059c97311ba3218b9466edb4f2f8c9b1a8f1c53d9b9eeea8580b7fae7554161bfd3a97bb3c45466d9927b7405 SHA512 93790fc74dfc7f5b69f14c8f7f2fa96796cce53c3f9ae8717399a2f674ab98994704828fb149e14cd482267f87b7b23a7e47a5bbd7ffc2765a37d540190c2c47 -EBUILD tensorflow-9999.ebuild 13521 BLAKE2B 548f8821929533475c16efbaa183ecfb63982dd16f3d9bc777cd458dba0efd0313ae37ae307b8adda70d1434708d5a9ae73dfd15e29e07b02eb1779b74feaaab SHA512 2ddebc1fa32e4d2791f19be8d5601950da8ad606aabe3d4b4ea3ad972a775ba8ab5961a4691db115b645fce7c97cc0025c9359de2a667a387dedd15bee4dd6d7 -MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30 diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch deleted file mode 100644 index 08c7458..0000000 --- a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9a44d8e10d726cae992e611575b9dcb1627beede Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Wed, 11 Sep 2019 12:08:34 +0800 -Subject: [PATCH 1/2] WORKSPACE: add rules-docker http_archive, - bazel-toolchains uses git_repo - -git_repository() rules cannot pull from --distdir and fail when building -without internet access. Use http_archive instead and pin the sha256 -hash as well. - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - WORKSPACE | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/WORKSPACE b/WORKSPACE -index 74ea14d0fd..ccff2ba30f 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -12,6 +12,15 @@ http_archive( - ], - ) - -+http_archive( -+ name = "io_bazel_rules_docker", -+ sha256 = "7d453450e1eb70e238eea6b31f4115607ec1200e91afea01c25f9804f37e39c8", -+ strip_prefix = "rules_docker-0.10.0", -+ urls = [ -+ "https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz", -+ ], -+) -+ - # Load tf_repositories() before loading dependencies for other repository so - # that dependencies like com_google_protobuf won't be overridden. - load("//tensorflow:workspace.bzl", "tf_repositories") --- -2.21.0 - diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch deleted file mode 100644 index f8b72da..0000000 --- a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 05f57f785aeb58146b3873d4a0c614d897c56293 Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Wed, 11 Sep 2019 18:18:42 +0800 -Subject: [PATCH 2/2] systemlibs: unbundle functools32 - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - tensorflow/workspace.bzl | 1 + - third_party/systemlibs/functools32.BUILD | 15 +++++++++++++++ - third_party/systemlibs/syslibs_configure.bzl | 1 + - 3 files changed, 17 insertions(+) - create mode 100644 third_party/systemlibs/functools32.BUILD - -diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl -index d9fadc1030..760b7cd905 100755 ---- a/tensorflow/workspace.bzl -+++ b/tensorflow/workspace.bzl -@@ -325,6 +325,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): - build_file = clean_dep("//third_party:functools32.BUILD"), - sha256 = "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d", - strip_prefix = "functools32-3.2.3-2", -+ system_build_file = clean_dep("//third_party/systemlibs:functools32.BUILD"), - urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz", - "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz", -diff --git a/third_party/systemlibs/functools32.BUILD b/third_party/systemlibs/functools32.BUILD -new file mode 100644 -index 0000000000..5567ef6943 ---- /dev/null -+++ b/third_party/systemlibs/functools32.BUILD -@@ -0,0 +1,15 @@ -+# Description: -+# functools32 provides a backport of the functools module for Python 2. -+ -+licenses(["notice"]) # Python 2.0 -+ -+package(default_visibility = ["//visibility:public"]) -+ -+filegroup( -+ name = "LICENSE", -+) -+ -+py_library( -+ name = "functools32", -+ srcs_version = "PY2AND3", -+) -diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl -index f83c0dd3d5..0884be8416 100644 ---- a/third_party/systemlibs/syslibs_configure.bzl -+++ b/third_party/systemlibs/syslibs_configure.bzl -@@ -22,6 +22,7 @@ VALID_LIBS = [ - "double_conversion", - "enum34_archive", - "flatbuffers", -+ "functools32_archive", - "gast_archive", - "gif_archive", - "grpc", --- -2.21.0 - diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch deleted file mode 100644 index 4cc2f60..0000000 --- a/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/third_party/nccl/build_defs.bzl.tpl b/third_party/nccl/build_defs.bzl.tpl -index 5719139855..5f5c3a1008 100644 ---- a/third_party/nccl/build_defs.bzl.tpl -+++ b/third_party/nccl/build_defs.bzl.tpl -@@ -113,7 +113,6 @@ def _device_link_impl(ctx): - "--cmdline=--compile-only", - "--link", - "--compress-all", -- "--bin2c-path=%s" % bin2c.dirname, - "--create=%s" % tmp_fatbin.path, - "--embedded-fatbin=%s" % fatbin_h.path, - ] + images, diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch deleted file mode 100644 index 194cdc1..0000000 --- a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index babb14b509..bcdd4f46e2 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -67,7 +67,7 @@ http_archive( - http_archive( - name = "bazel_skylib", - sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0", -- urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"], -+ urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"], - ) # https://github.com/bazelbuild/bazel-skylib/releases - http_archive( - name = "com_github_apple_swift_swift_protobuf", -diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl -index 8619cddfdd..4b57df0cbe 100644 ---- a/third_party/systemlibs/syslibs_configure.bzl -+++ b/third_party/systemlibs/syslibs_configure.bzl -@@ -27,7 +27,7 @@ VALID_LIBS = [ - "grpc", - "hwloc", - "icu", -- "jpeg", -+ "libjpeg_turbo", - "jsoncpp_git", - "keras_applications_archive", - "lmdb", diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch deleted file mode 100644 index bc53750..0000000 --- a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tensorflow/python/eager/pywrap_tensor.cc.ORIG 2019-09-27 23:56:33.000000000 +0200 -+++ b/tensorflow/python/eager/pywrap_tensor.cc 2019-11-27 16:39:00.996713385 +0100 -@@ -839,7 +839,7 @@ - sizeof(EagerTensor), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)EagerTensor_dealloc, /* tp_dealloc */ -- nullptr, /* tp_print */ -+ 0, /* tp_vectorcall_offset */ - nullptr, /* tp_getattr */ - nullptr, /* tp_setattr */ - nullptr, /* tp_compare */ diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml deleted file mode 100644 index 6161514..0000000 --- a/sci-libs/tensorflow/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>perfinion@gentoo.org</email> - <name>Jason Zaman</name> - </maintainer> - <longdescription lang="en"> - An open source machine learning framework for everyone - </longdescription> - <use> - <flag name="cuda">Enable support for nVidia CUDA</flag> - <flag name="xla">XLA (Accelerated Linear Algebra) Optimizing Compiler for TensorFlow</flag> - </use> - <upstream> - <remote-id type="github">tensorflow/tensorflow</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild deleted file mode 100644 index c9bde6c..0000000 --- a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild +++ /dev/null @@ -1,376 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla rocm" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_$i" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -bazel_external_uris=" - https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz - https://gitlab.com/libeigen/eigen/-/archive/4e696901f873a2347f76d931cf2f701e31e15d05/eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz -> eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz - https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz - https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz - https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz - https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz - https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip - https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz - https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz - https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz - https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz - https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz - cuda? ( - https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz - https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip - ) - python? ( - https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz - https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt - https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz - )" - -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${bazel_external_uris}" - -RDEPEND=" - app-arch/snappy - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu - ~dev-libs/jsoncpp-1.9.1 - dev-libs/libpcre - dev-libs/nsync - dev-libs/openssl:0= - >=dev-libs/protobuf-3.8.0:= - >=dev-libs/re2-0.2019.06.01 - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.22.0 - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2 - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - dev-libs/cudnn - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-1.8.0 - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/gast[${PYTHON_USEDEP}] - >=dev-python/numpy-1.16[${PYTHON_USEDEP}] - dev-python/google-pasta[${PYTHON_USEDEP}] - dev-python/opt-einsum[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}] - >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - python? ( - dev-python/mock - dev-python/setuptools - )" -PDEPEND="python? ( - >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.8.0 - dev-java/java-config - dev-lang/swig - || ( - =dev-util/bazel-0.27* - =dev-util/bazel-0.29* - ) - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - dev-python/cython - dev-python/mock - >=dev-python/grpcio-tools-1.22.0 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch" - "${FILESDIR}/tensorflow-2.1.0-external_libs.patch" - "${FILESDIR}/tensorflow-2.1.0-python3.8-pywrap_tensor.patch" -) -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="10G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities" - ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:" - ewarn "https://www.tensorflow.org/guide/migrate" - - local num_pythons_enabled - num_pythons_enabled=0 - count_impls(){ - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 10G to build C/C++ libs, 5G per python impl - CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - bazel_setup_bazelrc - - if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then - eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch" - fi - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=$(usex rocm 1 0) - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - export ROCM_TOOLKIT_PATH=${EPREFIX%/} - fi - - if use python; then - python_export PYTHON_SITEDIR - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - fi - - # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2 - local SYSLIBS=( - absl_py - astor_archive - boringssl - com_github_googleapis_googleapis - com_github_googlecloudplatform_google_cloud_cpp - com_google_protobuf - curl - cython - double_conversion - enum34_archive - flatbuffers - functools32_archive - gast_archive - gif - grpc - hwloc - icu - libjpeg_turbo - jsoncpp_git - keras_applications_archive - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - pcre - png - six_archive - snappy - swig - termcolor_archive - wrapt - zlib_archive - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" - fi - - # fail early if any deps are missing - ebazel build --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" - use python && python_foreach_impl run_in_build_dir do_compile - ebazel shutdown -} - -src_install() { - local i j - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py install - - # libtensorflow_framework.so is in /usr/lib already - python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - ebazel build //tensorflow:install_headers - ebazel shutdown - insinto /usr/include/${PN}/ - doins -r bazel-genfiles/tensorflow/include/* - - einfo "Installing libs" - # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - for l in libtensorflow{,_framework,_cc}.so; do - dolib.so bazel-bin/tensorflow/${l} - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) - done - - einstalldocs -} diff --git a/sys-apps/opencorsairlink/opencorsairlink-9999.ebuild b/sys-apps/opencorsairlink/opencorsairlink-9999.ebuild new file mode 100644 index 0000000..98909ff --- /dev/null +++ b/sys-apps/opencorsairlink/opencorsairlink-9999.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit git-r3 + +EGIT_REPO_URI="https://github.com/audiohacked/OpenCorsairLink.git" + +DESCRIPTION="Status & control utility that interacts with CorsairLink products" +HOMEPAGE="https://github.com/audiohacked/OpenCorsairLink" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +pkg_setup() { + export PREFIX=/usr +} |