root
4 years ago
parent
ffe74f16b5
commit
4dda124e48
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,25 @@
|
||||
From 198e62063ed817357204284a15f95ffc7230044c Mon Sep 17 00:00:00 2001
|
||||
From: Aleksey <rhash.admin@gmail.com>
|
||||
Date: Thu, 2 Jan 2020 21:16:51 +0300
|
||||
Subject: [PATCH] fix segfault on rhash -rc
|
||||
|
||||
---
|
||||
file.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/file.c b/file.c
|
||||
index 6f593f9..0d18f45 100644
|
||||
--- a/file.c
|
||||
+++ b/file.c
|
||||
@@ -361,8 +361,9 @@ int file_init_by_print_path(file_t* file, file_t* prepend_dir, const char* print
|
||||
const char* path = make_path(prepend_dir->real_path, print_path, 0);
|
||||
file_init(file, path, init_flags & ~FileInitReusePath);
|
||||
}
|
||||
- if (!prepend_dir || IS_DOT_STR(prepend_dir->print_path) ||
|
||||
- (!prepend_dir->print_path && opt.path_separator != ALIEN_PATH_SEPARATOR)) {
|
||||
+ if (!prepend_dir || (prepend_dir->print_path ?
|
||||
+ IS_DOT_STR(prepend_dir->print_path) :
|
||||
+ opt.path_separator != ALIEN_PATH_SEPARATOR)) {
|
||||
if ((init_flags & FileInitReusePath) != 0) {
|
||||
file->print_path = print_path;
|
||||
file->mode |= FileDontFreePrintPath;
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,34 @@
|
||||
From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001
|
||||
From: Jean Ghali <jghali@libertysurf.fr>
|
||||
Date: Sat, 28 Dec 2019 21:32:29 +0000
|
||||
Subject: [PATCH] Fix failure to build with poppler 0.84.0
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870
|
||||
---
|
||||
scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
|
||||
index ffcfa8450b..d788f9f06c 100644
|
||||
--- a/scribus/plugins/import/pdf/slaoutput.cpp
|
||||
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
|
||||
@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
|
||||
catalog = catA;
|
||||
pdfDoc = doc;
|
||||
updateGUICounter = 0;
|
||||
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
|
||||
+ m_fontEngine = new SplashFontEngine(true, true, true, true);
|
||||
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
|
||||
+ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true);
|
||||
+#else
|
||||
m_fontEngine = new SplashFontEngine(
|
||||
#if HAVE_T1LIB_H
|
||||
globalParams->getEnableT1lib(),
|
||||
@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
|
||||
true,
|
||||
#endif
|
||||
true);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
|
||||
Binary file not shown.
@ -0,0 +1,273 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite,ssl"
|
||||
|
||||
inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
|
||||
|
||||
DESCRIPTION="Ebook management application"
|
||||
HOMEPAGE="https://calibre-ebook.com/"
|
||||
SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="
|
||||
GPL-3+
|
||||
GPL-3
|
||||
GPL-2+
|
||||
GPL-2
|
||||
GPL-1+
|
||||
LGPL-3+
|
||||
LGPL-2.1+
|
||||
LGPL-2.1
|
||||
BSD
|
||||
MIT
|
||||
Old-MIT
|
||||
Apache-2.0
|
||||
public-domain
|
||||
|| ( Artistic GPL-1+ )
|
||||
CC-BY-3.0
|
||||
OFL-1.1
|
||||
PSF-2
|
||||
"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
SLOT="0"
|
||||
IUSE="ios +udisks"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
>=app-text/hunspell-1.7:=
|
||||
>=app-text/podofo-0.9.6_pre20171027:=
|
||||
>=app-text/poppler-0.26.5[qt5]
|
||||
>=dev-libs/chmlib-0.40:=
|
||||
dev-libs/glib:2=
|
||||
dev-libs/hyphen:=
|
||||
>=dev-libs/icu-57.1:=
|
||||
dev-libs/libinput:=
|
||||
>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
|
||||
>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
|
||||
>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
|
||||
>=dev-libs/dbus-glib-0.106
|
||||
>=sys-apps/dbus-1.10.8
|
||||
dev-python/dnspython[${PYTHON_USEDEP}]
|
||||
>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
|
||||
>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
|
||||
dev-python/regex[${PYTHON_USEDEP}]
|
||||
dev-qt/qtcore:5=
|
||||
dev-qt/qtdbus:5=
|
||||
dev-qt/qtgui:5=
|
||||
>=dev-qt/qtwebengine-5.12
|
||||
dev-qt/qtwidgets:5=
|
||||
dev-util/desktop-file-utils
|
||||
dev-util/gtk-update-icon-cache
|
||||
media-fonts/liberation-fonts
|
||||
media-libs/fontconfig:=
|
||||
>=media-libs/freetype-2:=
|
||||
>=media-libs/libmtp-1.1.11:=
|
||||
>=media-libs/libwmf-0.2.8
|
||||
>=media-gfx/optipng-0.7.6
|
||||
>=sys-libs/zlib-1.2.11:=
|
||||
virtual/libusb:1=
|
||||
x11-libs/libxkbcommon:=
|
||||
x11-libs/libX11:=
|
||||
x11-libs/libXext:=
|
||||
x11-libs/libXrender:=
|
||||
x11-misc/shared-mime-info
|
||||
>=x11-misc/xdg-utils-1.0.2-r2
|
||||
ios? (
|
||||
>=app-pda/usbmuxd-1.0.8
|
||||
>=app-pda/libimobiledevice-1.2.0
|
||||
)
|
||||
udisks? ( virtual/libudev )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
|
||||
dev-python/sip[${PYTHON_USEDEP}]
|
||||
>=virtual/podofo-build-0.9.6_pre20171027
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
|
||||
eerror "Calibre cannot be built with this version of gcc."
|
||||
eerror "You need at least gcc-6.0"
|
||||
die "Your C compiler is too old for this package."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# no_updates: do not annoy user with "new version is availible all the time
|
||||
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
|
||||
eapply \
|
||||
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
|
||||
"${FILESDIR}/${PN}-disable_plugins.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix outdated version constant.
|
||||
#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
|
||||
# -i src/calibre/constants.py || \
|
||||
# die "sed failed to patch constants.py"
|
||||
|
||||
# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
|
||||
# calls xdg-* (bug #258938).
|
||||
sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
|
||||
-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
|
||||
-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
|
||||
-e "s|, PreserveMIMEDefaults():|:|" \
|
||||
-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
|
||||
-e "s|cmd\[2\]|cmd[4]|" \
|
||||
-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
|
||||
-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
|
||||
-i src/calibre/linux.py || die "sed failed to patch linux.py"
|
||||
|
||||
# Disable unnecessary privilege dropping for bug #287067.
|
||||
sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
|
||||
-i setup/install.py || die "sed failed to patch install.py"
|
||||
|
||||
sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
|
||||
\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
|
||||
'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
|
||||
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
|
||||
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
|
||||
'-i', 'Makefile'])" \
|
||||
-i setup/build.py || die "sed failed to patch build.py"
|
||||
|
||||
# use system beautifulsoup, instead of bundled
|
||||
rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
|
||||
|| die "could not remove bundled beautifulsoup"
|
||||
find "${S}" -type f -name \*.py -exec \
|
||||
sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
|
||||
|| die "could not sed bundled beautifulsoup out of the source tree"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Bypass kbuildsycoca and update-mime-database in order to
|
||||
# avoid sandbox violations if xdg-mime tries to call them.
|
||||
cat - > "${T}/kbuildsycoca" <<-EOF
|
||||
#!${BASH}
|
||||
echo $0 : $@
|
||||
exit 0
|
||||
EOF
|
||||
|
||||
cp "${T}"/{kbuildsycoca,update-mime-database} || die
|
||||
chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
|
||||
|
||||
export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
|
||||
|
||||
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
|
||||
# violation with kbuildsycoca as in bug #287067, comment #13.
|
||||
export -n DISPLAY
|
||||
|
||||
# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
|
||||
# File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
|
||||
# return _parse_localename(localename)
|
||||
# File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
|
||||
# raise ValueError, 'unknown locale: %s' % localename
|
||||
#ValueError: unknown locale: 46
|
||||
export -n LANG LANGUAGE ${!LC_*}
|
||||
export LC_ALL=C #684484
|
||||
|
||||
# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
|
||||
# variables to point to our fake temporary $HOME.
|
||||
export HOME="${T}/fake_homedir"
|
||||
export XDG_CONFIG_HOME="${HOME}/.config"
|
||||
export XDG_DATA_HOME="${HOME}/.local/share"
|
||||
export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
|
||||
mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
|
||||
|
||||
tc-export CC CXX
|
||||
# Bug #334243 - respect LDFLAGS when building extensions
|
||||
export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
|
||||
local libdir=$(get_libdir)
|
||||
[[ -n $libdir ]] || die "get_libdir returned an empty string"
|
||||
|
||||
addpredict /dev/dri #665310
|
||||
|
||||
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
|
||||
"${PYTHON}" setup.py install \
|
||||
--root="${D}" \
|
||||
--prefix="${EPREFIX}/usr" \
|
||||
--libdir="${EPREFIX}/usr/${libdir}" \
|
||||
--staging-root="${ED}/usr" \
|
||||
--staging-libdir="${ED}/usr/${libdir}" || die
|
||||
|
||||
rm "${ED}/usr/share/applications/defaults.list" || die
|
||||
find "${ED}"/usr/share -type d -empty -delete
|
||||
|
||||
cd "${ED}"/usr/share/calibre/fonts/liberation || die
|
||||
local x
|
||||
for x in * ; do
|
||||
[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
|
||||
ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
|
||||
done
|
||||
|
||||
einfo "Converting python shebangs"
|
||||
python_fix_shebang --force "${ED}"
|
||||
|
||||
einfo "Compiling python modules"
|
||||
python_optimize "${ED}"/usr/lib/calibre
|
||||
|
||||
newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
|
||||
newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
|
||||
|
||||
bashcomp_alias calibre \
|
||||
lrfviewer \
|
||||
calibre-debug \
|
||||
ebook-meta \
|
||||
calibre-server \
|
||||
ebook-viewer \
|
||||
ebook-polish \
|
||||
fetch-ebook-metadata \
|
||||
lrf2lrs \
|
||||
ebook-convert \
|
||||
ebook-edit \
|
||||
calibre-smtp \
|
||||
ebook-device
|
||||
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Indentify stray directories from upstream's "Binary install"
|
||||
# method (see bug 622728).
|
||||
CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
|
||||
CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
|
||||
printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
|
||||
local x
|
||||
for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
|
||||
if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
|
||||
elog "Purging '${x}'"
|
||||
rm -rf "${x}"
|
||||
fi
|
||||
done
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST phpMyAdmin-4.9.2-all-languages.tar.xz 6118472 BLAKE2B 07093982aebf83017a1773a1cd1acac8b7a4cc9bf666f7c62fdef4b3b46441f5ee1da37746610b0ed6b92a67296d908dbf24ba1ea546c1b573c3593a02b90088 SHA512 426689c31f963a9cbe34b2116888aa0264801aa5ef18fb0e4b89811b032d4018c770538e823bccb684fb066ed27fcf6dc6e0fb4198d1e082e7eea15595b67727
|
||||
DIST phpMyAdmin-4.9.3-all-languages.tar.xz 6136280 BLAKE2B 638fef4a3b50a9c3d528c21d29a2c6d96fe2d425e0cbba03f55fce2bbbda8992cc5723be19ba40bd31ed2adf37fdbc3f382a22c9634bed37f3ac6107e40d06cc SHA512 ac6ec72efde6aad6b20d651328ad0d9440f11b150c38f4043f0e3916b97a15908f60b13a5948ec8767d62499a9d31d0bbe4d764f97f7236de3d7ba9cfc422379
|
||||
DIST phpMyAdmin-5.0.0-all-languages.tar.xz 8130456 BLAKE2B f8006ed4b78674d835c348104bd0d6a84ee26ab918080a38cda218399b74d62c8b7fa23d75c87d1705090fe751e39d47f1c66edf2bac03f68a52e5ed40209042 SHA512 7b29193a7376044d05a97f7cf3080c90db23433ba4de98e95dc1162ab740c4facd9a7b52816a9e65b23a72d908746d27ca4df008e752af7117fa89ff7af962c9
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit eutils webapp
|
||||
|
||||
MY_PV=${PV/_/-}
|
||||
MY_PN="phpMyAdmin"
|
||||
MY_P="${MY_PN}-${MY_PV}-all-languages"
|
||||
|
||||
DESCRIPTION="Web-based administration for MySQL database in PHP"
|
||||
HOMEPAGE="https://www.phpmyadmin.net/"
|
||||
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="setup"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/php[ctype,filter,json,session,unicode]
|
||||
|| (
|
||||
dev-lang/php[mysqli]
|
||||
dev-lang/php[mysql]
|
||||
)
|
||||
virtual/httpd-php:*
|
||||
"
|
||||
|
||||
need_httpd_cgi
|
||||
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
webapp_pkg_setup
|
||||
}
|
||||
|
||||
src_install() {
|
||||
webapp_src_preinst
|
||||
|
||||
dodoc README RELEASE-DATE-${MY_PV} ChangeLog
|
||||
rm -f LICENSE README* RELEASE-DATE-${MY_PV}
|
||||
|
||||
if ! use setup; then
|
||||
rm -rf setup || die "Cannot remove setup utility"
|
||||
elog "The phpMyAdmin setup utility has been removed."
|
||||
elog "It is a regular target of various exploits. If you need it, set USE=setup."
|
||||
else
|
||||
elog "You should consider disabling the setup USE flag"
|
||||
elog "to exclude the setup utility if you don't use it."
|
||||
elog "It regularly is the target of various exploits."
|
||||
fi
|
||||
|
||||
insinto "${MY_HTDOCSDIR#${EPREFIX}}"
|
||||
doins -r .
|
||||
|
||||
webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
|
||||
webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
|
||||
|
||||
webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
|
||||
webapp_src_install
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,5 +1,2 @@
|
||||
DIST libfmt-5.3.0.tar.gz 662493 BLAKE2B 462c54c227132b2398977ff575f74e63e973825968b106e09cb0f3da859f1d851a6dd1799c05e3ae6adff2ac972f4af259c42fdf8429346b2830134571c31480 SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
|
||||
DIST libfmt-6.0.0.tar.gz 708425 BLAKE2B c04fb7f701e98442848a36489b09eca3dd64f736f668f04173db3afe77da6d933f5f13a2fe38489a5880fa1e4d8549dd34acc9fa37fbb0d6cdee3b6598610726 SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
|
||||
DIST libfmt-6.1.0.tar.gz 722127 BLAKE2B 2916293ebaff27a06f22e3c99bc1aee835d633a2b2eaa06d50dadff54f7ee20ed32c6e642f607274fdeeaf647a6aef03fde454555fa90c3ad790bb1be9c88a24 SHA512 51ee5fbe0ae7f9427289b7de37192652f16c63dd5fbf2d52dbf34e89d690ccd7ca5fd7962774d27a2d80fb1ccfa6836c171b519cfa0c41367772ebf8ef1fa81f
|
||||
DIST libfmt-6.1.1.tar.gz 722236 BLAKE2B 5497a89af4511d4b8356757fed17c5dc8bcc66cb60c85e2dc05db524a5eb5ae0247347bd3c6ca61edd12f0a469c26477de95290f977cf27f2413ba91d39dafdc SHA512 8018bec519ce788331c8be8d51a19d4eaceb6a2f33d6618ebe78d953fbef28a70d5b61f0db1c051cbe1e0ee26f3c09197caac196a4c20d1b6abd7f86619f5fef
|
||||
DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-multilib eapi7-ver
|
||||
|
||||
DESCRIPTION="Small, safe and fast formatting library"
|
||||
HOMEPAGE="https://github.com/fmtlib/fmt"
|
||||
|
||||
LICENSE="MIT"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
SLOT="0/$(ver_cut 1)"
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
S="${WORKDIR}/fmt-${PV}"
|
||||
fi
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
|
||||
-DFMT_LIB_DIR="$(get_libdir)"
|
||||
-DFMT_TEST=$(usex test)
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-multilib eapi7-ver
|
||||
|
||||
DESCRIPTION="Small, safe and fast formatting library"
|
||||
HOMEPAGE="https://github.com/fmtlib/fmt"
|
||||
|
||||
LICENSE="MIT"
|
||||
IUSE="test"
|
||||
SLOT="0/$(ver_cut 1)"
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
S="${WORKDIR}/fmt-${PV}"
|
||||
fi
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
|
||||
-DFMT_LIB_DIR="$(get_libdir)"
|
||||
-DFMT_TEST=$(usex test)
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-multilib eapi7-ver
|
||||
|
||||
DESCRIPTION="Small, safe and fast formatting library"
|
||||
HOMEPAGE="https://github.com/fmtlib/fmt"
|
||||
|
||||
LICENSE="MIT"
|
||||
IUSE="test"
|
||||
SLOT="0/$(ver_cut 1)"
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
S="${WORKDIR}/fmt-${PV}"
|
||||
fi
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
|
||||
-DFMT_LIB_DIR="$(get_libdir)"
|
||||
-DFMT_TEST=$(usex test)
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
From 93c7ab4284f0609abab7cf2f9b8bdefe21fe0038 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Deutschmann <whissi@whissi.de>
|
||||
Date: Tue, 11 Dec 2018 16:50:12 +0100
|
||||
Subject: [PATCH] tests: make dummyclient.py compatible with Python2 and
|
||||
Python3
|
||||
|
||||
Closes: https://github.com/rsyslog/librelp/issues/163
|
||||
---
|
||||
tests/dummyclient.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/dummyclient.py b/tests/dummyclient.py
|
||||
index 6f99c79..8b0041e 100755
|
||||
--- a/tests/dummyclient.py
|
||||
+++ b/tests/dummyclient.py
|
||||
@@ -4,7 +4,7 @@
|
||||
import os
|
||||
|
||||
port = int(os.environ['TESTPORT'])
|
||||
-print "dummyclient info: opening and closing port " + str(port) + " without sending data"
|
||||
+print("dummyclient info: opening and closing port " + str(port) + " without sending data")
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.connect(("127.0.0.1", port))
|
||||
s.close()
|
||||
@ -1,11 +0,0 @@
|
||||
--- nss/lib/ckfw/manifest.mn
|
||||
+++ nss/lib/ckfw/manifest.mn
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
CORE_DEPTH = ../..
|
||||
|
||||
-DIRS = builtins
|
||||
+DIRS = builtins pem
|
||||
|
||||
PRIVATE_EXPORTS = \
|
||||
ck.h \
|
||||
@ -1,274 +0,0 @@
|
||||
From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001
|
||||
From: "Jory A. Pratt" <anarchy@gentoo.org>
|
||||
Date: Fri, 28 Jul 2017 14:00:41 -0500
|
||||
Subject: [PATCH] add pkg-config file
|
||||
|
||||
Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
|
||||
---
|
||||
Makefile | 11 +---
|
||||
config/Makefile | 40 ++++++++++++++
|
||||
config/nss-config.in | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
config/nss.pc.in | 12 +++++
|
||||
manifest.mn | 2 +-
|
||||
5 files changed, 199 insertions(+), 11 deletions(-)
|
||||
create mode 100644 config/Makefile
|
||||
create mode 100644 config/nss-config.in
|
||||
create mode 100644 config/nss.pc.in
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 48bae37..9850883 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
-nss_build_all: build_nspr all latest
|
||||
+nss_build_all: all latest
|
||||
|
||||
nss_clean_all: clobber_nspr clobber
|
||||
|
||||
@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
|
||||
--prefix='$(NSS_GYP_PREFIX)'
|
||||
endif
|
||||
|
||||
-build_nspr: $(NSPR_CONFIG_STATUS)
|
||||
- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
|
||||
-
|
||||
-install_nspr: build_nspr
|
||||
- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
|
||||
-
|
||||
-clobber_nspr: $(NSPR_CONFIG_STATUS)
|
||||
- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
|
||||
-
|
||||
build_docs:
|
||||
$(MAKE) -C $(CORE_DEPTH)/doc
|
||||
|
||||
diff --git a/config/Makefile b/config/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..600fe48
|
||||
--- /dev/null
|
||||
+++ b/config/Makefile
|
||||
@@ -0,0 +1,40 @@
|
||||
+CORE_DEPTH = ..
|
||||
+DEPTH = ..
|
||||
+
|
||||
+include $(CORE_DEPTH)/coreconf/config.mk
|
||||
+
|
||||
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||
+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||
+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||
+PREFIX = /usr
|
||||
+
|
||||
+all: export libs
|
||||
+
|
||||
+export:
|
||||
+ # Create the nss.pc file
|
||||
+ mkdir -p $(DIST)/lib/pkgconfig
|
||||
+ sed -e "s,@prefix@,$(PREFIX)," \
|
||||
+ -e "s,@exec_prefix@,\$${prefix}," \
|
||||
+ -e "s,@libdir@,\$${prefix}/lib64," \
|
||||
+ -e "s,@includedir@,\$${prefix}/include/nss," \
|
||||
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
|
||||
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
|
||||
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
|
||||
+ nss.pc.in > nss.pc
|
||||
+ chmod 0644 nss.pc
|
||||
+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
|
||||
+
|
||||
+ # Create the nss-config script
|
||||
+ mkdir -p $(DIST)/bin
|
||||
+ sed -e "s,@prefix@,$(PREFIX)," \
|
||||
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
|
||||
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
|
||||
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
|
||||
+ nss-config.in > nss-config
|
||||
+ chmod 0755 nss-config
|
||||
+ ln -sf ../../../config/nss-config $(DIST)/bin
|
||||
+
|
||||
+libs:
|
||||
+
|
||||
+dummy: all export libs
|
||||
+
|
||||
diff --git a/config/nss-config.in b/config/nss-config.in
|
||||
new file mode 100644
|
||||
index 0000000..1d7c444
|
||||
--- /dev/null
|
||||
+++ b/config/nss-config.in
|
||||
@@ -0,0 +1,145 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+prefix=@prefix@
|
||||
+
|
||||
+major_version=@NSS_MAJOR_VERSION@
|
||||
+minor_version=@NSS_MINOR_VERSION@
|
||||
+patch_version=@NSS_PATCH_VERSION@
|
||||
+
|
||||
+usage()
|
||||
+{
|
||||
+ cat <<EOF
|
||||
+Usage: nss-config [OPTIONS] [LIBRARIES]
|
||||
+Options:
|
||||
+ [--prefix[=DIR]]
|
||||
+ [--exec-prefix[=DIR]]
|
||||
+ [--includedir[=DIR]]
|
||||
+ [--libdir[=DIR]]
|
||||
+ [--version]
|
||||
+ [--libs]
|
||||
+ [--cflags]
|
||||
+Dynamic Libraries:
|
||||
+ nss
|
||||
+ ssl
|
||||
+ smime
|
||||
+ nssutil
|
||||
+EOF
|
||||
+ exit $1
|
||||
+}
|
||||
+
|
||||
+if test $# -eq 0; then
|
||||
+ usage 1 1>&2
|
||||
+fi
|
||||
+
|
||||
+lib_ssl=yes
|
||||
+lib_smime=yes
|
||||
+lib_nss=yes
|
||||
+lib_nssutil=yes
|
||||
+
|
||||
+while test $# -gt 0; do
|
||||
+ case "$1" in
|
||||
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||
+ *) optarg= ;;
|
||||
+ esac
|
||||
+
|
||||
+ case $1 in
|
||||
+ --prefix=*)
|
||||
+ prefix=$optarg
|
||||
+ ;;
|
||||
+ --prefix)
|
||||
+ echo_prefix=yes
|
||||
+ ;;
|
||||
+ --exec-prefix=*)
|
||||
+ exec_prefix=$optarg
|
||||
+ ;;
|
||||
+ --exec-prefix)
|
||||
+ echo_exec_prefix=yes
|
||||
+ ;;
|
||||
+ --includedir=*)
|
||||
+ includedir=$optarg
|
||||
+ ;;
|
||||
+ --includedir)
|
||||
+ echo_includedir=yes
|
||||
+ ;;
|
||||
+ --libdir=*)
|
||||
+ libdir=$optarg
|
||||
+ ;;
|
||||
+ --libdir)
|
||||
+ echo_libdir=yes
|
||||
+ ;;
|
||||
+ --version)
|
||||
+ echo ${major_version}.${minor_version}.${patch_version}
|
||||
+ ;;
|
||||
+ --cflags)
|
||||
+ echo_cflags=yes
|
||||
+ ;;
|
||||
+ --libs)
|
||||
+ echo_libs=yes
|
||||
+ ;;
|
||||
+ ssl)
|
||||
+ lib_ssl=yes
|
||||
+ ;;
|
||||
+ smime)
|
||||
+ lib_smime=yes
|
||||
+ ;;
|
||||
+ nss)
|
||||
+ lib_nss=yes
|
||||
+ ;;
|
||||
+ nssutil)
|
||||
+ lib_nssutil=yes
|
||||
+ ;;
|
||||
+ *)
|
||||
+ usage 1 1>&2
|
||||
+ ;;
|
||||
+ esac
|
||||
+ shift
|
||||
+done
|
||||
+
|
||||
+# Set variables that may be dependent upon other variables
|
||||
+if test -z "$exec_prefix"; then
|
||||
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
|
||||
+fi
|
||||
+if test -z "$includedir"; then
|
||||
+ includedir=`pkg-config --variable=includedir nss`
|
||||
+fi
|
||||
+if test -z "$libdir"; then
|
||||
+ libdir=`pkg-config --variable=libdir nss`
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_prefix" = "yes"; then
|
||||
+ echo $prefix
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_exec_prefix" = "yes"; then
|
||||
+ echo $exec_prefix
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_includedir" = "yes"; then
|
||||
+ echo $includedir
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_libdir" = "yes"; then
|
||||
+ echo $libdir
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_cflags" = "yes"; then
|
||||
+ echo -I$includedir
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_libs" = "yes"; then
|
||||
+ libdirs=""
|
||||
+ if test -n "$lib_ssl"; then
|
||||
+ libdirs="$libdirs -lssl${major_version}"
|
||||
+ fi
|
||||
+ if test -n "$lib_smime"; then
|
||||
+ libdirs="$libdirs -lsmime${major_version}"
|
||||
+ fi
|
||||
+ if test -n "$lib_nss"; then
|
||||
+ libdirs="$libdirs -lnss${major_version}"
|
||||
+ fi
|
||||
+ if test -n "$lib_nssutil"; then
|
||||
+ libdirs="$libdirs -lnssutil${major_version}"
|
||||
+ fi
|
||||
+ echo $libdirs
|
||||
+fi
|
||||
+
|
||||
diff --git a/config/nss.pc.in b/config/nss.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..df9e2cf
|
||||
--- /dev/null
|
||||
+++ b/config/nss.pc.in
|
||||
@@ -0,0 +1,12 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+
|
||||
+Name: NSS
|
||||
+Description: Network Security Services
|
||||
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
|
||||
+Requires: nspr >= 4.8
|
||||
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
|
||||
+Cflags: -I${includedir}
|
||||
+
|
||||
diff --git a/manifest.mn b/manifest.mn
|
||||
index 500a5ad..87c905e 100644
|
||||
--- a/manifest.mn
|
||||
+++ b/manifest.mn
|
||||
@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
|
||||
|
||||
RELEASE = nss
|
||||
|
||||
-DIRS = coreconf lib cmd cpputil gtests
|
||||
+DIRS = coreconf lib cmd cpputil config
|
||||
--
|
||||
2.13.3
|
||||
|
||||
@ -1,531 +0,0 @@
|
||||
From d54a1f812ae23ec11d2af6ed93ba1a11609421a8 Mon Sep 17 00:00:00 2001
|
||||
From: "J.C. Jones" <jjones@mozilla.com>
|
||||
Date: Mon, 14 Jan 2019 10:35:25 -0700
|
||||
Subject: [PATCH] Bug 1507135 - Add additional null checks to CMS message
|
||||
functions r=mt
|
||||
|
||||
Differential review: https://phabricator.services.mozilla.com//D16488
|
||||
|
||||
--HG--
|
||||
branch : NSS_3_36_BRANCH
|
||||
extra : transplant_source : 1%02%80%21%BE%C8B%D5%21%D7%0CR%00%ED%B6%EA%84a%FA%23
|
||||
---
|
||||
lib/smime/cmsmessage.c | 69 ++++++++++++++++++++++++++++++++++++------
|
||||
1 file changed, 59 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c
|
||||
index 27d1256ec..f41a432b1 100644
|
||||
--- a/lib/smime/cmsmessage.c
|
||||
+++ b/lib/smime/cmsmessage.c
|
||||
@@ -29,8 +29,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
|
||||
|
||||
if (poolp == NULL) {
|
||||
poolp = PORT_NewArena(1024); /* XXX what is right value? */
|
||||
- if (poolp == NULL)
|
||||
+ if (poolp == NULL) {
|
||||
return NULL;
|
||||
+ }
|
||||
poolp_is_ours = PR_TRUE;
|
||||
}
|
||||
|
||||
@@ -44,8 +45,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
|
||||
if (mark) {
|
||||
PORT_ArenaRelease(poolp, mark);
|
||||
}
|
||||
- } else
|
||||
+ } else {
|
||||
PORT_FreeArena(poolp, PR_FALSE);
|
||||
+ }
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -53,8 +55,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
|
||||
cmsg->poolp_is_ours = poolp_is_ours;
|
||||
cmsg->refCount = 1;
|
||||
|
||||
- if (mark)
|
||||
+ if (mark) {
|
||||
PORT_ArenaUnmark(poolp, mark);
|
||||
+ }
|
||||
|
||||
return cmsg;
|
||||
}
|
||||
@@ -73,8 +76,13 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
|
||||
NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg,
|
||||
SECAlgorithmID **detached_digestalgs, SECItem **detached_digests)
|
||||
{
|
||||
- if (pwfn)
|
||||
+ if (cmsg == NULL) {
|
||||
+ return;
|
||||
+ }
|
||||
+ if (pwfn) {
|
||||
PK11_SetPasswordFunc(pwfn);
|
||||
+ }
|
||||
+
|
||||
cmsg->pwfn_arg = pwfn_arg;
|
||||
cmsg->decrypt_key_cb = decrypt_key_cb;
|
||||
cmsg->decrypt_key_cb_arg = decrypt_key_cb_arg;
|
||||
@@ -89,18 +97,21 @@ void
|
||||
NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
|
||||
{
|
||||
PORT_Assert(cmsg->refCount > 0);
|
||||
- if (cmsg->refCount <= 0) /* oops */
|
||||
+ if (cmsg->refCount <= 0) { /* oops */
|
||||
return;
|
||||
+ }
|
||||
|
||||
cmsg->refCount--; /* thread safety? */
|
||||
- if (cmsg->refCount > 0)
|
||||
+ if (cmsg->refCount > 0) {
|
||||
return;
|
||||
+ }
|
||||
|
||||
NSS_CMSContentInfo_Destroy(&(cmsg->contentInfo));
|
||||
|
||||
/* if poolp is not NULL, cmsg is the owner of its arena */
|
||||
- if (cmsg->poolp_is_ours)
|
||||
+ if (cmsg->poolp_is_ours) {
|
||||
PORT_FreeArena(cmsg->poolp, PR_FALSE); /* XXX clear it? */
|
||||
+ }
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -112,8 +123,9 @@ NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
|
||||
NSSCMSMessage *
|
||||
NSS_CMSMessage_Copy(NSSCMSMessage *cmsg)
|
||||
{
|
||||
- if (cmsg == NULL)
|
||||
+ if (cmsg == NULL) {
|
||||
return NULL;
|
||||
+ }
|
||||
|
||||
PORT_Assert(cmsg->refCount > 0);
|
||||
|
||||
@@ -127,6 +139,10 @@ NSS_CMSMessage_Copy(NSSCMSMessage *cmsg)
|
||||
PLArenaPool *
|
||||
NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg)
|
||||
{
|
||||
+ if (cmsg == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
return cmsg->poolp;
|
||||
}
|
||||
|
||||
@@ -136,6 +152,10 @@ NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg)
|
||||
NSSCMSContentInfo *
|
||||
NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg)
|
||||
{
|
||||
+ if (cmsg == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
return &(cmsg->contentInfo);
|
||||
}
|
||||
|
||||
@@ -147,6 +167,10 @@ NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg)
|
||||
SECItem *
|
||||
NSS_CMSMessage_GetContent(NSSCMSMessage *cmsg)
|
||||
{
|
||||
+ if (cmsg == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
/* this is a shortcut */
|
||||
NSSCMSContentInfo *cinfo = NSS_CMSMessage_GetContentInfo(cmsg);
|
||||
SECItem *pItem = NSS_CMSContentInfo_GetInnerContent(cinfo);
|
||||
@@ -164,6 +188,10 @@ NSS_CMSMessage_ContentLevelCount(NSSCMSMessage *cmsg)
|
||||
int count = 0;
|
||||
NSSCMSContentInfo *cinfo;
|
||||
|
||||
+ if (cmsg == NULL) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
/* walk down the chain of contentinfos */
|
||||
for (cinfo = &(cmsg->contentInfo); cinfo != NULL;) {
|
||||
count++;
|
||||
@@ -183,6 +211,10 @@ NSS_CMSMessage_ContentLevel(NSSCMSMessage *cmsg, int n)
|
||||
int count = 0;
|
||||
NSSCMSContentInfo *cinfo;
|
||||
|
||||
+ if (cmsg == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
/* walk down the chain of contentinfos */
|
||||
for (cinfo = &(cmsg->contentInfo); cinfo != NULL && count < n;
|
||||
cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
|
||||
@@ -200,6 +232,10 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg)
|
||||
{
|
||||
NSSCMSContentInfo *cinfo;
|
||||
|
||||
+ if (cmsg == NULL) {
|
||||
+ return PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
/* descend into CMS message */
|
||||
for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
|
||||
cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
|
||||
@@ -221,6 +257,10 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg)
|
||||
{
|
||||
NSSCMSContentInfo *cinfo;
|
||||
|
||||
+ if (cmsg == NULL) {
|
||||
+ return PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
/* walk down the chain of contentinfos */
|
||||
for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
|
||||
cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
|
||||
@@ -251,13 +291,21 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg)
|
||||
{
|
||||
NSSCMSContentInfo *cinfo;
|
||||
|
||||
+ if (cmsg == NULL) {
|
||||
+ return PR_FALSE;
|
||||
+ }
|
||||
+
|
||||
/* walk down the chain of contentinfos */
|
||||
for (cinfo = &(cmsg->contentInfo); cinfo != NULL;
|
||||
cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
|
||||
switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
|
||||
case SEC_OID_PKCS7_SIGNED_DATA:
|
||||
- if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos))
|
||||
+ if (cinfo->content.signedData == NULL) {
|
||||
+ return PR_FALSE;
|
||||
+ }
|
||||
+ if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) {
|
||||
return PR_TRUE;
|
||||
+ }
|
||||
break;
|
||||
default:
|
||||
/* callback here for generic wrappers? */
|
||||
@@ -278,8 +326,9 @@ NSS_CMSMessage_IsContentEmpty(NSSCMSMessage *cmsg, unsigned int minLen)
|
||||
{
|
||||
SECItem *item = NULL;
|
||||
|
||||
- if (cmsg == NULL)
|
||||
+ if (cmsg == NULL) {
|
||||
return PR_TRUE;
|
||||
+ }
|
||||
|
||||
item = NSS_CMSContentInfo_GetContent(NSS_CMSMessage_GetContentInfo(cmsg));
|
||||
|
||||
From fa26771e9515cc82c941fcef689dd797a3e308c3 Mon Sep 17 00:00:00 2001
|
||||
From: "J.C. Jones" <jjones@mozilla.com>
|
||||
Date: Fri, 11 Jan 2019 22:33:16 -0700
|
||||
Subject: [PATCH] Bug 1507174 - Add additional null checks to other CMS
|
||||
functions r=mt
|
||||
|
||||
Differential review: https://phabricator.services.mozilla.com//D16383
|
||||
|
||||
--HG--
|
||||
branch : NSS_3_36_BRANCH
|
||||
extra : transplant_source : %B5%A8su%96%5B%BE%F9%CD%93%E0%EE%93a4c%1BYp%09
|
||||
---
|
||||
lib/smime/cmscinfo.c | 92 ++++++++++++++++++++++++++++++++++++------
|
||||
lib/smime/cmsdigdata.c | 4 +-
|
||||
lib/smime/cmsencdata.c | 4 +-
|
||||
lib/smime/cmsenvdata.c | 5 +++
|
||||
lib/smime/cmsmessage.c | 3 ++
|
||||
lib/smime/cmsudf.c | 2 +-
|
||||
6 files changed, 95 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/lib/smime/cmscinfo.c b/lib/smime/cmscinfo.c
|
||||
index 08db662f8..453ccaada 100644
|
||||
--- a/lib/smime/cmscinfo.c
|
||||
+++ b/lib/smime/cmscinfo.c
|
||||
@@ -51,6 +51,10 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
SECOidTag kind;
|
||||
|
||||
+ if (cinfo == NULL) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
kind = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
|
||||
switch (kind) {
|
||||
case SEC_OID_PKCS7_ENVELOPED_DATA:
|
||||
@@ -86,6 +90,11 @@ NSSCMSContentInfo *
|
||||
NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
NSSCMSContentInfo *ccinfo = NULL;
|
||||
+
|
||||
+ if (cinfo == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
|
||||
switch (tag) {
|
||||
case SEC_OID_PKCS7_SIGNED_DATA:
|
||||
@@ -127,6 +136,9 @@ SECStatus
|
||||
NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream)
|
||||
{
|
||||
SECStatus rv;
|
||||
+ if (cinfo == NULL) {
|
||||
+ return SECFailure;
|
||||
+ }
|
||||
|
||||
rv = NSS_CMSContentInfo_Private_Init(cinfo);
|
||||
if (rv != SECSuccess) {
|
||||
@@ -145,15 +157,20 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo,
|
||||
SECOidTag type, void *ptr)
|
||||
{
|
||||
SECStatus rv;
|
||||
+ if (cinfo == NULL || cmsg == NULL) {
|
||||
+ return SECFailure;
|
||||
+ }
|
||||
|
||||
cinfo->contentTypeTag = SECOID_FindOIDByTag(type);
|
||||
- if (cinfo->contentTypeTag == NULL)
|
||||
+ if (cinfo->contentTypeTag == NULL) {
|
||||
return SECFailure;
|
||||
+ }
|
||||
|
||||
/* do not copy the oid, just create a reference */
|
||||
rv = SECITEM_CopyItem(cmsg->poolp, &(cinfo->contentType), &(cinfo->contentTypeTag->oid));
|
||||
- if (rv != SECSuccess)
|
||||
+ if (rv != SECSuccess) {
|
||||
return SECFailure;
|
||||
+ }
|
||||
|
||||
cinfo->content.pointer = ptr;
|
||||
|
||||
@@ -185,8 +202,9 @@ SECStatus
|
||||
NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo,
|
||||
SECItem *data, PRBool detached)
|
||||
{
|
||||
- if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess)
|
||||
+ if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) {
|
||||
return SECFailure;
|
||||
+ }
|
||||
if (detached) {
|
||||
cinfo->rawContent = NULL;
|
||||
}
|
||||
@@ -230,6 +248,10 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn
|
||||
void *
|
||||
NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
+ if (cinfo == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
SECOidTag tag = cinfo->contentTypeTag
|
||||
? cinfo->contentTypeTag->offset
|
||||
: SEC_OID_UNKNOWN;
|
||||
@@ -260,6 +282,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
|
||||
SECOidTag tag;
|
||||
SECItem *pItem = NULL;
|
||||
|
||||
+ if (cinfo == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
|
||||
if (NSS_CMSType_IsData(tag)) {
|
||||
pItem = cinfo->content.data;
|
||||
@@ -282,6 +308,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
|
||||
SECOidTag
|
||||
NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
+ if (cinfo == NULL) {
|
||||
+ return SEC_OID_UNKNOWN;
|
||||
+ }
|
||||
+
|
||||
if (cinfo->contentTypeTag == NULL)
|
||||
cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
|
||||
|
||||
@@ -294,11 +324,17 @@ NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo)
|
||||
SECItem *
|
||||
NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
- if (cinfo->contentTypeTag == NULL)
|
||||
+ if (cinfo == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (cinfo->contentTypeTag == NULL) {
|
||||
cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
|
||||
+ }
|
||||
|
||||
- if (cinfo->contentTypeTag == NULL)
|
||||
+ if (cinfo->contentTypeTag == NULL) {
|
||||
return NULL;
|
||||
+ }
|
||||
|
||||
return &(cinfo->contentTypeTag->oid);
|
||||
}
|
||||
@@ -310,8 +346,13 @@ NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo)
|
||||
SECOidTag
|
||||
NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
- if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN)
|
||||
+ if (cinfo == NULL) {
|
||||
+ return SEC_OID_UNKNOWN;
|
||||
+ }
|
||||
+
|
||||
+ if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) {
|
||||
cinfo->contentEncAlgTag = SECOID_GetAlgorithmTag(&(cinfo->contentEncAlg));
|
||||
+ }
|
||||
|
||||
return cinfo->contentEncAlgTag;
|
||||
}
|
||||
@@ -322,6 +363,10 @@ NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo)
|
||||
SECAlgorithmID *
|
||||
NSS_CMSContentInfo_GetContentEncAlg(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
+ if (cinfo == NULL) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
return &(cinfo->contentEncAlg);
|
||||
}
|
||||
|
||||
@@ -330,10 +375,14 @@ NSS_CMSContentInfo_SetContentEncAlg(PLArenaPool *poolp, NSSCMSContentInfo *cinfo
|
||||
SECOidTag bulkalgtag, SECItem *parameters, int keysize)
|
||||
{
|
||||
SECStatus rv;
|
||||
+ if (cinfo == NULL) {
|
||||
+ return SECFailure;
|
||||
+ }
|
||||
|
||||
rv = SECOID_SetAlgorithmID(poolp, &(cinfo->contentEncAlg), bulkalgtag, parameters);
|
||||
- if (rv != SECSuccess)
|
||||
+ if (rv != SECSuccess) {
|
||||
return SECFailure;
|
||||
+ }
|
||||
cinfo->keysize = keysize;
|
||||
return SECSuccess;
|
||||
}
|
||||
@@ -343,27 +392,42 @@ NSS_CMSContentInfo_SetContentEncAlgID(PLArenaPool *poolp, NSSCMSContentInfo *cin
|
||||
SECAlgorithmID *algid, int keysize)
|
||||
{
|
||||
SECStatus rv;
|
||||
+ if (cinfo == NULL) {
|
||||
+ return SECFailure;
|
||||
+ }
|
||||
|
||||
rv = SECOID_CopyAlgorithmID(poolp, &(cinfo->contentEncAlg), algid);
|
||||
- if (rv != SECSuccess)
|
||||
+ if (rv != SECSuccess) {
|
||||
return SECFailure;
|
||||
- if (keysize >= 0)
|
||||
+ }
|
||||
+ if (keysize >= 0) {
|
||||
cinfo->keysize = keysize;
|
||||
+ }
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
void
|
||||
NSS_CMSContentInfo_SetBulkKey(NSSCMSContentInfo *cinfo, PK11SymKey *bulkkey)
|
||||
{
|
||||
- cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey);
|
||||
- cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg));
|
||||
+ if (cinfo == NULL) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (bulkkey == NULL) {
|
||||
+ cinfo->bulkkey = NULL;
|
||||
+ cinfo->keysize = 0;
|
||||
+ } else {
|
||||
+ cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey);
|
||||
+ cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg));
|
||||
+ }
|
||||
}
|
||||
|
||||
PK11SymKey *
|
||||
NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
- if (cinfo->bulkkey == NULL)
|
||||
+ if (cinfo == NULL || cinfo->bulkkey == NULL) {
|
||||
return NULL;
|
||||
+ }
|
||||
|
||||
return PK11_ReferenceSymKey(cinfo->bulkkey);
|
||||
}
|
||||
@@ -371,5 +435,9 @@ NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo)
|
||||
int
|
||||
NSS_CMSContentInfo_GetBulkKeySize(NSSCMSContentInfo *cinfo)
|
||||
{
|
||||
+ if (cinfo == NULL) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
return cinfo->keysize;
|
||||
}
|
||||
diff --git a/lib/smime/cmsdigdata.c b/lib/smime/cmsdigdata.c
|
||||
index 9ea22702e..a249686bb 100644
|
||||
--- a/lib/smime/cmsdigdata.c
|
||||
+++ b/lib/smime/cmsdigdata.c
|
||||
@@ -56,7 +56,9 @@ void
|
||||
NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd)
|
||||
{
|
||||
/* everything's in a pool, so don't worry about the storage */
|
||||
- NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
|
||||
+ if (digd != NULL) {
|
||||
+ NSS_CMSContentInfo_Destroy(&(digd->contentInfo));
|
||||
+ }
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/lib/smime/cmsencdata.c b/lib/smime/cmsencdata.c
|
||||
index c3a4549ad..8b520b439 100644
|
||||
--- a/lib/smime/cmsencdata.c
|
||||
+++ b/lib/smime/cmsencdata.c
|
||||
@@ -87,7 +87,9 @@ void
|
||||
NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd)
|
||||
{
|
||||
/* everything's in a pool, so don't worry about the storage */
|
||||
- NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
|
||||
+ if (encd != NULL) {
|
||||
+ NSS_CMSContentInfo_Destroy(&(encd->contentInfo));
|
||||
+ }
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/lib/smime/cmsenvdata.c b/lib/smime/cmsenvdata.c
|
||||
index f2c8e171d..9bc77be8b 100644
|
||||
--- a/lib/smime/cmsenvdata.c
|
||||
+++ b/lib/smime/cmsenvdata.c
|
||||
@@ -144,6 +144,11 @@ NSS_CMSEnvelopedData_Encode_BeforeStart(NSSCMSEnvelopedData *envd)
|
||||
poolp = envd->cmsg->poolp;
|
||||
cinfo = &(envd->contentInfo);
|
||||
|
||||
+ if (cinfo == NULL) {
|
||||
+ PORT_SetError(SEC_ERROR_BAD_DATA);
|
||||
+ goto loser;
|
||||
+ }
|
||||
+
|
||||
recipientinfos = envd->recipientInfos;
|
||||
if (recipientinfos == NULL) {
|
||||
PORT_SetError(SEC_ERROR_BAD_DATA);
|
||||
diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c
|
||||
index f41a432b1..366b71aba 100644
|
||||
--- a/lib/smime/cmsmessage.c
|
||||
+++ b/lib/smime/cmsmessage.c
|
||||
@@ -96,6 +96,9 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg,
|
||||
void
|
||||
NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg)
|
||||
{
|
||||
+ if (cmsg == NULL)
|
||||
+ return;
|
||||
+
|
||||
PORT_Assert(cmsg->refCount > 0);
|
||||
if (cmsg->refCount <= 0) { /* oops */
|
||||
return;
|
||||
diff --git a/lib/smime/cmsudf.c b/lib/smime/cmsudf.c
|
||||
index 3ef4268d4..5c8a81e6d 100644
|
||||
--- a/lib/smime/cmsudf.c
|
||||
+++ b/lib/smime/cmsudf.c
|
||||
@@ -239,7 +239,7 @@ NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd)
|
||||
{
|
||||
const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
|
||||
|
||||
- if (typeInfo && typeInfo->destroy) {
|
||||
+ if (typeInfo && (typeInfo->destroy) && (gd != NULL)) {
|
||||
(*typeInfo->destroy)(gd);
|
||||
}
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
|
||||
DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib
|
||||
|
||||
DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
|
||||
HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
|
||||
SRC_URI="https://forge.imag.fr/frs/download.php/814/${P}.tar.gz"
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-lang/ruby
|
||||
dev-ruby/rubygems"
|
||||
RDEPEND="app-eselect/eselect-opencl"
|
||||
|
||||
src_prepare() {
|
||||
echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /etc/OpenCL/vendors/
|
||||
doins ocl-icd.icd
|
||||
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
|
||||
mkdir -p ${OCL_DIR} || die "mkdir failed"
|
||||
|
||||
mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
|
||||
DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
|
||||
DESCRIPTION="Qt API for storing passwords securely"
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
else
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="${HOMEPAGE}.git"
|
||||
fi
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/1"
|
||||
IUSE="gnome-keyring"
|
||||
|
||||
BDEPEND="
|
||||
dev-qt/linguist-tools:5
|
||||
"
|
||||
RDEPEND="
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtdbus:5
|
||||
gnome-keyring? ( dev-libs/glib:2 )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
gnome-keyring? ( gnome-base/libgnome-keyring )
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog ReadMe.txt )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_WITH_QT4=OFF
|
||||
-DQTKEYCHAIN_STATIC=OFF
|
||||
-DBUILD_TEST_APPLICATION=OFF
|
||||
-DBUILD_TRANSLATIONS=ON
|
||||
-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
@ -1,6 +1 @@
|
||||
DIST rocm-comgr-2.10.0.tar.gz 87111 BLAKE2B efc9d395f6c0445e3f0af847edb66094905b38a8134d05b938a5bc48f1d71d37db664afc8e6125f82a6618cd4657d4316105f6587937010cd120f68c01172cac SHA512 ce7e698c042291910a27bf261e52ac420dd5f9f676bb86e72b903e8a751753b9b0d2d15fb3dfabafdaef75a94844541b37df81e70db28496545348e93cd4018c
|
||||
DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
|
||||
DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
|
||||
DIST rocm-comgr-2.8.0.tar.gz 85502 BLAKE2B 14e18191a475c3d05e324f15e3b2d0829eed56bfa625b48e217e6540836e005675a4ffdd0813664c7f61177431d0987499eb9a75ec83acfa0e554e954770fbc9 SHA512 516832f2a1be5e66d93dddfd1275861605afcb6e3410cb518e6d8647a25c18da058e37cbce8434d5b7133a2147c8c84dc48a485f7b855b74a3b49c9f7dae4a0e
|
||||
DIST rocm-comgr-2.9.0.tar.gz 85505 BLAKE2B 5e69bcd2fb6769cd315a18eb626d00161acb4a2f9922eb67dba6cee081c236ec25798011d4112c37d5e6fba06531e5e7b4f42659080a8dd23d9a8579b71bf2c0 SHA512 8e66c01eee71154d261a8f2a8651f90dc7e60b6d74625aab3f3a0b51226c69059cde66d7a1eab8aacee7d0653cc881ec442849483f21616ee4cd27d4ddad7345
|
||||
DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55d1f4f2a9a978f5c189f4a0597a9cb3f9806a1f2f43f14e262bc19964e06f41df3c7f45ac3c1579511fe235cc940 SHA512 ffa250c44388b1985ec0dac68bf0dd27820933fe7579f7fc6b35d783852cd03fb02919b5e800b01d536c36eb3c5bff96d1a38f5c8ab6380d6584b2e6d19a25fc
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Andrews <candrews@integralblue.com>
|
||||
Date: Wed, 31 Jul 2019 10:04:11 -0400
|
||||
Subject: [PATCH] Install to standard locations using GNUInstallDirs
|
||||
|
||||
Some distributions require 64 bit libraries to be installed to lib64, for example.
|
||||
Using GNUInstallDirs ensures that files are installed to the expected locations.
|
||||
---
|
||||
CMakeLists.txt | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 454b830..a89af16 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
cmake_minimum_required(VERSION 3.2.0)
|
||||
|
||||
+include (GNUInstallDirs)
|
||||
+
|
||||
# Build ROCM-Compiler-Support with ccache if the package is present.
|
||||
set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
|
||||
if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
|
||||
@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
|
||||
|
||||
install(TARGETS amd_comgr
|
||||
EXPORT amd_comgr_export
|
||||
- DESTINATION lib)
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
install(FILES
|
||||
"include/amd_comgr.h"
|
||||
- DESTINATION include)
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
||||
install(FILES
|
||||
"README.md"
|
||||
"LICENSE.txt"
|
||||
"NOTICES.txt"
|
||||
- DESTINATION share/amd_comgr)
|
||||
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
|
||||
|
||||
# Generate the install-tree package.
|
||||
set(AMD_COMGR_PREFIX_CODE "
|
||||
@ -1,38 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
|
||||
|
||||
--- comgr/CMakeLists.old 2019-07-19 17:19:26.080276421 +0200
|
||||
+++ comgr/CMakeLists.txt 2019-07-19 18:17:25.780163592 +0200
|
||||
@@ -185,7 +185,11 @@
|
||||
include_directories(./yaml-cpp/include)
|
||||
|
||||
set(CLANG_LIBS
|
||||
- clangFrontendTool)
|
||||
+ clangFrontendTool
|
||||
+ clangFrontend
|
||||
+ clangBasic
|
||||
+ clangDriver
|
||||
+ clangSerialization)
|
||||
|
||||
set(LLD_LIBS
|
||||
lldELF
|
||||
@@ -193,8 +197,19 @@
|
||||
|
||||
llvm_map_components_to_libnames(LLVM_LIBS
|
||||
${LLVM_TARGETS_TO_BUILD}
|
||||
+ Option
|
||||
DebugInfoDWARF
|
||||
- Symbolize)
|
||||
+ Symbolize
|
||||
+ Support
|
||||
+ Object
|
||||
+ BitWriter
|
||||
+ MC
|
||||
+ MCParser
|
||||
+ MCDisassembler
|
||||
+ Core
|
||||
+ IRReader
|
||||
+ CodeGen
|
||||
+ Linker)
|
||||
|
||||
target_link_libraries(amd_comgr
|
||||
PUBLIC
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
|
||||
index 454b830..70e2526 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -90,12 +90,8 @@ if (UNIX)
|
||||
-Wl,--no-undefined)
|
||||
endif()
|
||||
endif()
|
||||
- # FIXME: Remove when yaml-cpp is removed from the build.
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
else()
|
||||
list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
|
||||
- # FIXME: Make this private once yaml-cpp is removed from the build.
|
||||
- add_definitions(-D_HAS_EXCEPTIONS=0)
|
||||
endif()
|
||||
|
||||
# Windows is strict about visibility of exports in shared libraries, so we ask
|
||||
@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
|
||||
DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
|
||||
FILE "${AMD_COMGR_TARGETS_NAME}")
|
||||
|
||||
-set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
|
||||
-set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
|
||||
-add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
|
||||
-include_directories(./yaml-cpp/include)
|
||||
+find_package(yaml-cpp REQUIRED)
|
||||
+include_directories(${YAML_CPP_INCLUDE_DIR})
|
||||
|
||||
set(CLANG_LIBS
|
||||
clangFrontendTool)
|
||||
@ -1,176 +0,0 @@
|
||||
From a73e4ce7c686787840454e206a17973685b03e62 Mon Sep 17 00:00:00 2001
|
||||
From: Michael LIAO <michaelhongbin.liao@amd.com>
|
||||
Date: Thu, 15 Aug 2019 13:25:58 -0400
|
||||
Subject: [PATCH] Fix comgr build due to LLVM interface change.
|
||||
|
||||
Change-Id: I66c2203f09b683dd06807860eeb5f517cd200f0e
|
||||
---
|
||||
src/comgr-objdump.cpp | 68 +++++++++++++++++++++++----------
|
||||
1 file changed, 47 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/src/comgr-objdump.cpp b/src/comgr-objdump.cpp
|
||||
index bf490b6..59a9d05 100644
|
||||
--- a/src/comgr-objdump.cpp
|
||||
+++ b/src/comgr-objdump.cpp
|
||||
@@ -307,15 +307,18 @@ class SectionFilter {
|
||||
FilterPredicate Predicate;
|
||||
llvm::object::ObjectFile const &Object;
|
||||
};
|
||||
+
|
||||
SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O) {
|
||||
return SectionFilter(
|
||||
[](llvm::object::SectionRef const &S) {
|
||||
if (FilterSections.empty())
|
||||
return true;
|
||||
- llvm::StringRef String;
|
||||
- std::error_code error = S.getName(String);
|
||||
- if (error)
|
||||
+ Expected<StringRef> SecNameOrErr = S.getName();
|
||||
+ if (!SecNameOrErr) {
|
||||
+ consumeError(SecNameOrErr.takeError());
|
||||
return false;
|
||||
+ }
|
||||
+ StringRef String = *SecNameOrErr;
|
||||
return is_contained(FilterSections, String);
|
||||
},
|
||||
O);
|
||||
@@ -394,6 +397,18 @@ report_error(StringRef ArchiveName, const object::Archive::Child &C,
|
||||
report_error(ArchiveName, NameOrErr.get(), std::move(E), ArchitectureName);
|
||||
}
|
||||
|
||||
+static LLVM_ATTRIBUTE_NORETURN void report_error(llvm::Error E,
|
||||
+ StringRef File) {
|
||||
+ report_error(File, std::move(E));
|
||||
+}
|
||||
+
|
||||
+template <typename T, typename... Ts>
|
||||
+T unwrapOrError(Expected<T> EO, Ts &&... Args) {
|
||||
+ if (EO)
|
||||
+ return std::move(*EO);
|
||||
+ report_error(EO.takeError(), std::forward<Ts>(Args)...);
|
||||
+}
|
||||
+
|
||||
static const Target *getTarget(const ObjectFile *Obj = nullptr) {
|
||||
// Figure out the target triple.
|
||||
llvm::Triple TheTriple("unknown-unknown-unknown");
|
||||
@@ -822,13 +837,13 @@ static void printRelocationTargetName(const MachOObjectFile *O,
|
||||
for (const SectionRef &Section : ToolSectionFilter(*O)) {
|
||||
std::error_code ec;
|
||||
|
||||
- StringRef Name;
|
||||
uint64_t Addr = Section.getAddress();
|
||||
if (Addr != Val)
|
||||
continue;
|
||||
- if ((ec = Section.getName(Name)))
|
||||
- report_error(O->getFileName(), ec);
|
||||
- fmt << Name;
|
||||
+ Expected<StringRef> NameOrErr = Section.getName();
|
||||
+ if (!NameOrErr)
|
||||
+ report_error(O->getFileName(), NameOrErr.takeError());
|
||||
+ fmt << *NameOrErr;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -854,7 +869,11 @@ static void printRelocationTargetName(const MachOObjectFile *O,
|
||||
section_iterator SI = O->section_begin();
|
||||
// Adjust for the fact that sections are 1-indexed.
|
||||
advance(SI, Val - 1);
|
||||
- SI->getName(S);
|
||||
+ Expected<StringRef> SOrErr = SI->getName();
|
||||
+ if (!SOrErr)
|
||||
+ consumeError(SOrErr.takeError());
|
||||
+ else
|
||||
+ S = *SOrErr;
|
||||
}
|
||||
|
||||
fmt << S;
|
||||
@@ -1362,8 +1381,7 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj,
|
||||
DataRefImpl DR = Section.getRawDataRefImpl();
|
||||
SegmentName = MachO->getSectionFinalSegmentName(DR);
|
||||
}
|
||||
- StringRef name;
|
||||
- error(Section.getName(name));
|
||||
+ StringRef name = unwrapOrError(Section.getName(), Obj->getFileName());
|
||||
|
||||
if ((SectionAddr <= StopAddress) &&
|
||||
(SectionAddr + SectSize) >= StartAddress) {
|
||||
@@ -1675,8 +1693,7 @@ void llvm::DisassemHelper::PrintRelocations(const ObjectFile *Obj) {
|
||||
for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
|
||||
if (Section.relocation_begin() == Section.relocation_end())
|
||||
continue;
|
||||
- StringRef secname;
|
||||
- error(Section.getName(secname));
|
||||
+ StringRef secname = unwrapOrError(Section.getName(), Obj->getFileName());
|
||||
OutS << "RELOCATION RECORDS FOR [" << secname << "]:\n";
|
||||
for (const RelocationRef &Reloc : Section.relocations()) {
|
||||
bool hidden = getHidden(Reloc);
|
||||
@@ -1699,8 +1716,7 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
|
||||
"Idx Name Size Address Type\n";
|
||||
unsigned i = 0;
|
||||
for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
|
||||
- StringRef Name;
|
||||
- error(Section.getName(Name));
|
||||
+ StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
|
||||
uint64_t Address = Section.getAddress();
|
||||
uint64_t Size = Section.getSize();
|
||||
bool Text = Section.isText();
|
||||
@@ -1717,9 +1733,8 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
|
||||
void llvm::DisassemHelper::PrintSectionContents(const ObjectFile *Obj) {
|
||||
std::error_code EC;
|
||||
for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
|
||||
- StringRef Name;
|
||||
StringRef Contents;
|
||||
- error(Section.getName(Name));
|
||||
+ StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
|
||||
uint64_t BaseAddr = Section.getAddress();
|
||||
uint64_t Size = Section.getSize();
|
||||
if (!Size)
|
||||
@@ -1797,7 +1812,11 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
|
||||
section_iterator Section = *SectionOrErr;
|
||||
StringRef Name;
|
||||
if (Type == SymbolRef::ST_Debug && Section != o->section_end()) {
|
||||
- Section->getName(Name);
|
||||
+ Expected<StringRef> NameOrErr = Section->getName();
|
||||
+ if (!NameOrErr)
|
||||
+ consumeError(NameOrErr.takeError());
|
||||
+ else
|
||||
+ Name = *NameOrErr;
|
||||
} else {
|
||||
Expected<StringRef> NameOrErr = Symbol.getName();
|
||||
if (!NameOrErr)
|
||||
@@ -1846,8 +1865,7 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
|
||||
StringRef SegmentName = MachO->getSectionFinalSegmentName(DR);
|
||||
OutS << SegmentName << ",";
|
||||
}
|
||||
- StringRef SectionName;
|
||||
- error(Section->getName(SectionName));
|
||||
+ StringRef SectionName = unwrapOrError(Section->getName(), o->getFileName());
|
||||
OutS << SectionName;
|
||||
}
|
||||
|
||||
@@ -1978,7 +1996,11 @@ void llvm::DisassemHelper::printRawClangAST(const ObjectFile *Obj) {
|
||||
Optional<object::SectionRef> ClangASTSection;
|
||||
for (auto Sec : ToolSectionFilter(*Obj)) {
|
||||
StringRef Name;
|
||||
- Sec.getName(Name);
|
||||
+ auto NameOrErr = Sec.getName();
|
||||
+ if (!NameOrErr) // FIXME: Need better error handling.
|
||||
+ consumeError(NameOrErr.takeError());
|
||||
+ else
|
||||
+ Name = *NameOrErr;
|
||||
if (Name == ClangASTSectionName) {
|
||||
ClangASTSection = Sec;
|
||||
break;
|
||||
@@ -2015,7 +2037,11 @@ void llvm::DisassemHelper::printFaultMaps(const ObjectFile *Obj) {
|
||||
|
||||
for (auto Sec : ToolSectionFilter(*Obj)) {
|
||||
StringRef Name;
|
||||
- Sec.getName(Name);
|
||||
+ auto NameOrErr = Sec.getName();
|
||||
+ if (!NameOrErr) // FIXME: Need better error handling.
|
||||
+ consumeError(NameOrErr.takeError());
|
||||
+ else
|
||||
+ Name = *NameOrErr;
|
||||
if (Name == FaultMapSectionName) {
|
||||
FaultMapSection = Sec;
|
||||
break;
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/lib/comgr"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Code Object Manager"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocm-device-libs-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,46 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/lib/comgr"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-correctly-install.patch"
|
||||
"${FILESDIR}/${P}-find-clang.patch"
|
||||
"${FILESDIR}/${P}-find-lld-includes.patch"
|
||||
"${FILESDIR}/${P}-dependencies.patch"
|
||||
"${FILESDIR}/${P}-unbundle-yaml-cpp.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Code Object Manager"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="dev-libs/rocm-device-libs
|
||||
dev-cpp/yaml-cpp:=
|
||||
sys-devel/llvm-roc:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
rm -rf yaml-cpp || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/lib/comgr"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-dependencies.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-unbundle-yaml-cpp.patch"
|
||||
"${FILESDIR}/${PN}-2.7.0-llvm-interface-change.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Code Object Manager"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocm-device-libs-${PV}
|
||||
dev-cpp/yaml-cpp:=
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
rm -rf yaml-cpp || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/lib/comgr"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Code Object Manager"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocm-device-libs-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/lib/comgr"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Code Object Manager"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocm-device-libs-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,6 +1 @@
|
||||
DIST rocm-device-libs-2.10.0.tar.gz 227626 BLAKE2B a5a17f1ed4699f613523bc39bd25a566bafe53865025ccdf84cca1210d26da1f97e989d8acc35626cb21296b3c004adc6e1a985c8096c4de88c4f42b6abbb9a3 SHA512 1863f797c369b6f4097e3c966ce4f371da5f87893ffeb2d596dbb0b31aa3f6142e7359bcaf6e884754bf7a5ae246df674cd1020ca8c8e9114605ac7300715641
|
||||
DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B 6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40 SHA512 4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180
|
||||
DIST rocm-device-libs-2.7.0.tar.gz 226395 BLAKE2B 85c5b7ebfca1570d9653428d4aa7052f784443c774b224b563471638caac01f9d800d0bb5d52dace2b54a447cfc00c0f39ed87ab1612f1e382fbba10c5e30e80 SHA512 2277ff4037b25d32b473b3b046708b2ce4aeb28c1df7ed4ce51893c204e5409c931083b3ecc38c6796581c1233e0d25dd0f0c5710961be8d1d60118e9a1de88a
|
||||
DIST rocm-device-libs-2.8.0.tar.gz 227320 BLAKE2B 5263acd01cd9e1002a3991232b704bfa0675d8a825b47ae9a09e1b0acadbebaeb0a61fe3df1880027a65006d4065e6d75de093c0516d41e6fd78618b08b1d258 SHA512 8c3b16096e325c9f4bc74bbd189f73c178b93b011492a9c0c38017cd53b4afef55e8f55a36c596272b7dda91811ef83ed4e1d0cbb0a623eb5647012e72a64524
|
||||
DIST rocm-device-libs-2.9.0.tar.gz 227785 BLAKE2B 903e1139d0813aaef298911a7e3c9c63c3141355c404a282ec0c1eb2532ded0d303f0550cfd142d8fc9a6219160755e658efd0d7d69302ecb23997314e502873 SHA512 d68820a6450d9b402a427df365dbd6be32e711f24256b68b887df8c78cb774c85b0a55f6033afbb7e97c951ad9cd83637194fbf5f575c2a9c8a68ea20e0bd046
|
||||
DIST rocm-device-libs-3.0.0.tar.gz 227811 BLAKE2B 8fb866611e82126b5909b75282081371ddeea58a34d732586e43dcf23d512fb8f2ad259f2c9227e35730af0d0d2b235895aa5396a7d19c2987754162d2ed6f49 SHA512 257f8990d93bf8cb0438fa15d7ca91a7f38082c90f0bb96b0691196ec78f16e790142ecef0089bc765edf80c1f0b644210e991a7e6f7e8dfab33cedad6465fa3
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Device Libraries"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Device Libraries"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="dev-libs/rocr-runtime
|
||||
sys-devel/llvm-roc:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Device Libraries"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Device Libraries"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Device Libraries"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=sys-devel/llvm-roc-${PV}:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="sys-devel/llvm-roc:=
|
||||
dev-libs/rocr-runtime"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-install-correctly.patch"
|
||||
"${FILESDIR}/${P}-install-header.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# remove unittest, because it downloads additional file from github.com
|
||||
sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND=">=sys-devel/llvm-roc-${PV}:=
|
||||
>=dev-libs/rocr-runtime-${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-install-correctly.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-install-header.patch"
|
||||
"${FILESDIR}/${PN}-2.7.0-libraries.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# remove unittest, because it downloads additional file from github.com
|
||||
sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND=">=sys-devel/llvm-roc-${PV}:=
|
||||
>=dev-libs/rocr-runtime-${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-install-header.patch"
|
||||
"${FILESDIR}/${PN}-2.7.0-libraries.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# remove unittest, because it downloads additional file from github.com
|
||||
sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND=">=sys-devel/llvm-roc-${PV}:=
|
||||
>=dev-libs/rocr-runtime-${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-install-header.patch"
|
||||
"${FILESDIR}/${PN}-2.7.0-libraries.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# remove unittest, because it downloads additional file from github.com
|
||||
sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,7 +1,2 @@
|
||||
DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
|
||||
DIST OpenCL-ICD-Loader-bc9728edf8cace79cf33bf75560be88fc2432dc4.tar.gz 62858 BLAKE2B 931fb7ade12debda99512d8b9fbfb987f47e3b68568863e480de406f842a014d39f0321c44420fb8b68b8757d49cc02cadf82e767c9d2b71e53bdb8e9763cace SHA512 2ab9035fbc0a80a529d1b2f454b0b9a263b6eff601121750e81e2e32581f06189566cdcf201ab741ff3f1491ead825a7858000901f8042af67b1304be622e9fa
|
||||
DIST rocm-opencl-runtime-2.10.0.tar.gz 965836 BLAKE2B 2eeb3449939389d684b016a5eabfbac6491079d4a2ebb78ef3baeb47dcd0e6e2f4e32fb788ad28f704f2564b463759b8e433517eb6bb63d3c3d43d25e524f846 SHA512 c5142391bb2d0ff92c509745da63eda8ebdbf2dd7223dbd545e394b5b716b4f0c666de3ab48f0eae94f51967185930cdf1f0cc4822d24932a2473c1a2db5f76c
|
||||
DIST rocm-opencl-runtime-2.6.0.tar.gz 986155 BLAKE2B 43469ec3a368e2ee9716a38d08df48c28165a233bd80de54f286011df25782a197e252e8e41ffa8f59eecf93d6beae5434497e8d4b648676252d32a0859ba59a SHA512 bbbbd29bf23f93440135786600cca28a806714bb207b7ad0947d26471fa38470820e7801acc84380000d43d55ff2ec1d95cee9e64b500628b6a3b026744c67df
|
||||
DIST rocm-opencl-runtime-2.8.0.tar.gz 976851 BLAKE2B 4191c2f027f615a8ba7a38d30364549df509e6bd432e5bfe3d30d40fb6bade15b58fe824b5aa9704e5d93421f28e1067d283738fa85e7ec59a444f5be25c963c SHA512 6c070d3e2f455d96f028f614f0562c0b8983b457c6295c398d6d4574133d4a7384573caa1f32e39550887861aa09aa19c9e34fc8bbae6ddc41ae395969d33540
|
||||
DIST rocm-opencl-runtime-2.9.0.tar.gz 980980 BLAKE2B b72c9659ca8ac6b12d0c5c8c204a2a481c9e057e1b6aa80e24b57e141538c345025bfe74143ee2450bb013ff1b45a314538965fdc071a6e925967368baabfb94 SHA512 9d9742da94d4dd7326e6f64042418726f8fcaa05b3a02b6a7760b2f17067747a2a5f37183a4245697211ceb21e4fa0870dfeca9970b4fd3794985311d6ff7d0f
|
||||
DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,146 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 83575a3..a0526d1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,12 +28,26 @@ endif()
|
||||
|
||||
project(OpenCL-ROCm)
|
||||
|
||||
+include (GNUInstallDirs)
|
||||
+
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
|
||||
set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2" CACHE PATH "")
|
||||
|
||||
find_package(ROCT REQUIRED)
|
||||
find_package(ROCR REQUIRED)
|
||||
|
||||
+find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
|
||||
+set(USE_COMGR_LIBRARY "yes")
|
||||
+find_package(amd_comgr REQUIRED CONFIG)
|
||||
+add_definitions(-DUSE_COMGR_LIBRARY)
|
||||
+FOREACH(DIR ${LLVM_INCLUDE_DIRS})
|
||||
+ include_directories("${DIR}")
|
||||
+ include_directories("${DIR}/clang")
|
||||
+ include_directories("${DIR}/lld")
|
||||
+ # TODO: move AMDGPU.h header to include folder
|
||||
+ include_directories("${DIR}/llvm/Target/AMDGPU")
|
||||
+ENDFOREACH()
|
||||
+
|
||||
# FIXME: Remove following if block after enabling COMGR by default
|
||||
if (${USE_COMGR_LIBRARY} STREQUAL "no")
|
||||
set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
|
||||
@@ -46,29 +60,19 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
|
||||
# override default option value in library and driver
|
||||
set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
|
||||
|
||||
- add_subdirectory(compiler/llvm EXCLUDE_FROM_ALL)
|
||||
-
|
||||
- find_package(LLVM REQUIRED CONFIG PATHS ${CMAKE_BINARY_DIR}/compiler/llvm NO_DEFAULT_PATH)
|
||||
+ find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
|
||||
include(AddLLVM)
|
||||
|
||||
add_definitions(${LLVM_DEFINITIONS})
|
||||
- # TODO: add find_package for Clang and lld, and also use LLVM/Clang variables got from their config
|
||||
- include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/include)
|
||||
- include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/tools/clang/include)
|
||||
- include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/lld/include)
|
||||
-
|
||||
- # TODO: move AMDGPU.h header to include folder
|
||||
- include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/lib/Target/AMDGPU)
|
||||
- include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
|
||||
|
||||
set(BUILD_HC_LIB OFF CACHE BOOL "")
|
||||
set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
|
||||
set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
|
||||
set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
|
||||
set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa")
|
||||
- add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
|
||||
+
|
||||
add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
|
||||
|
||||
install(PROGRAMS $<TARGET_FILE:clang> $<TARGET_FILE:lld>
|
||||
@@ -84,51 +88,51 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
|
||||
endforeach()
|
||||
endif() # if (${USE_COMGR_LIBRARY} STREQUAL "no")
|
||||
|
||||
-if(${USE_COMGR_LIBRARY} MATCHES "yes")
|
||||
- set(COMGR_DYN_DLL "yes")
|
||||
- add_definitions(-DCOMGR_DYN_DLL)
|
||||
- add_definitions(-DUSE_COMGR_LIBRARY)
|
||||
- if( ${BUILD_HIP} MATCHES "yes")
|
||||
- add_subdirectory(api/hip)
|
||||
- endif()
|
||||
-endif()
|
||||
+#if(${USE_COMGR_LIBRARY} MATCHES "yes")
|
||||
+# set(COMGR_DYN_DLL "yes")
|
||||
+# add_definitions(-DCOMGR_DYN_DLL)
|
||||
+# add_definitions(-DUSE_COMGR_LIBRARY)
|
||||
+# if( ${BUILD_HIP} MATCHES "yes")
|
||||
+# add_subdirectory(api/hip)
|
||||
+# endif()
|
||||
+#endif()
|
||||
|
||||
add_subdirectory(api/opencl/amdocl)
|
||||
add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
|
||||
add_subdirectory(runtime)
|
||||
-add_subdirectory(tools/clinfo)
|
||||
+#add_subdirectory(tools/clinfo)
|
||||
|
||||
set(BUILD_SHARED_LIBS "Build shared libs" ON)
|
||||
-add_subdirectory(api/opencl/khronos/icd)
|
||||
+#add_subdirectory(api/opencl/khronos/icd)
|
||||
|
||||
###--- Packaging ------------------------------------------------------------###
|
||||
|
||||
# MAIN package
|
||||
-install(PROGRAMS $<TARGET_FILE:clinfo>
|
||||
- DESTINATION bin/x86_64
|
||||
- COMPONENT MAIN)
|
||||
+#install(PROGRAMS $<TARGET_FILE:clinfo>
|
||||
+# DESTINATION bin/x86_64
|
||||
+# COMPONENT MAIN)
|
||||
install(PROGRAMS $<TARGET_FILE:amdocl64>
|
||||
- DESTINATION lib/x86_64
|
||||
- COMPONENT MAIN)
|
||||
-install(PROGRAMS $<TARGET_FILE:OpenCL>
|
||||
- DESTINATION lib/x86_64
|
||||
- COMPONENT MAIN)
|
||||
-install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
|
||||
- DESTINATION lib/x86_64
|
||||
+ DESTINATION lib64
|
||||
COMPONENT MAIN)
|
||||
+#install(PROGRAMS $<TARGET_FILE:OpenCL>
|
||||
+# DESTINATION lib/x86_64
|
||||
+# COMPONENT MAIN)
|
||||
+#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
|
||||
+# DESTINATION lib/x86_64
|
||||
+# COMPONENT MAIN)
|
||||
|
||||
# DEV package
|
||||
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
|
||||
- DESTINATION include
|
||||
- COMPONENT DEV
|
||||
- USE_SOURCE_PERMISSIONS
|
||||
- PATTERN cl_d3d10.h EXCLUDE
|
||||
- PATTERN cl_d3d11.h EXCLUDE
|
||||
- PATTERN cl_dx9_media_sharing.h EXCLUDE
|
||||
- PATTERN cl_egl.h EXCLUDE)
|
||||
-install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
|
||||
- DESTINATION lib/x86_64
|
||||
- COMPONENT DEV)
|
||||
+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
|
||||
+# DESTINATION include
|
||||
+# COMPONENT DEV
|
||||
+# USE_SOURCE_PERMISSIONS
|
||||
+# PATTERN cl_d3d10.h EXCLUDE
|
||||
+# PATTERN cl_d3d11.h EXCLUDE
|
||||
+# PATTERN cl_dx9_media_sharing.h EXCLUDE
|
||||
+# PATTERN cl_egl.h EXCLUDE)
|
||||
+#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
|
||||
+# DESTINATION lib/x86_64
|
||||
+# COMPONENT DEV)
|
||||
|
||||
# Generic CPACK variables
|
||||
set(CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators")
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
|
||||
SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
|
||||
|
||||
LICENSE="Apache-2.0 MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=dev-libs/rocm-comgr-${PV}
|
||||
>=dev-libs/rocm-device-libs-${PV}
|
||||
>=dev-libs/rocm-opencl-driver-${PV}
|
||||
dev-libs/ocl-icd[khronos-headers]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/ocaml
|
||||
dev-ml/findlib"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.8.0-change-install-location.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-update-README.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
mkdir -p "${S}"/api/opencl/khronos/ || die
|
||||
mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
|
||||
[ -d tools/clinfo ] && rm -rf tools/clinfo || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_COMGR_LIBRARY=yes
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
OPENCL_ICD_COMMIT="bc9728edf8cace79cf33bf75560be88fc2432dc4"
|
||||
SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
|
||||
|
||||
LICENSE="Apache-2.0 MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="dev-libs/rocr-runtime
|
||||
dev-libs/rocm-comgr
|
||||
dev-libs/rocm-device-libs
|
||||
dev-libs/rocm-opencl-driver
|
||||
dev-libs/ocl-icd[khronos-headers]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/ocaml
|
||||
dev-ml/findlib"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-unbundle-dependencies.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
mkdir -p "${S}"/api/opencl/khronos/ || die
|
||||
mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
|
||||
SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
|
||||
|
||||
LICENSE="Apache-2.0 MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=dev-libs/rocm-comgr-${PV}
|
||||
>=dev-libs/rocm-device-libs-${PV}
|
||||
>=dev-libs/rocm-opencl-driver-${PV}
|
||||
dev-libs/ocl-icd[khronos-headers]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/ocaml
|
||||
dev-ml/findlib"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-change-install-location.patch"
|
||||
"${FILESDIR}/${P}-change-AMDCompilerh.patch"
|
||||
"${FILESDIR}/${P}-change-opencl.patch"
|
||||
"${FILESDIR}/${P}-update-README.patch"
|
||||
"${FILESDIR}/${P}-amdocl64icd.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
mkdir -p "${S}"/api/opencl/khronos/ || die
|
||||
mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
|
||||
[ -d tools/clinfo ] && rm -rf tools/clinfo || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_COMGR_LIBRARY=yes
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
|
||||
SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
|
||||
|
||||
LICENSE="Apache-2.0 MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=dev-libs/rocm-comgr-${PV}
|
||||
>=dev-libs/rocm-device-libs-${PV}
|
||||
>=dev-libs/rocm-opencl-driver-${PV}
|
||||
dev-libs/ocl-icd[khronos-headers]
|
||||
media-libs/mesa"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/ocaml
|
||||
dev-ml/findlib"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.8.0-change-install-location.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-update-README.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
mkdir -p "${S}"/api/opencl/khronos/ || die
|
||||
mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
|
||||
[ -d tools/clinfo ] && rm -rf tools/clinfo || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_COMGR_LIBRARY=yes
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
|
||||
SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
|
||||
|
||||
LICENSE="Apache-2.0 MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND=">=dev-libs/rocr-runtime-${PV}
|
||||
>=dev-libs/rocm-comgr-${PV}
|
||||
>=dev-libs/rocm-device-libs-${PV}
|
||||
>=dev-libs/rocm-opencl-driver-${PV}
|
||||
dev-libs/ocl-icd[khronos-headers]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/ocaml
|
||||
dev-ml/findlib"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.8.0-change-install-location.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-update-README.patch"
|
||||
"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
mkdir -p "${S}"/api/opencl/khronos/ || die
|
||||
mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
|
||||
[ -d tools/clinfo ] && rm -rf tools/clinfo || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_COMGR_LIBRARY=yes
|
||||
-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
|
||||
-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,7 +1 @@
|
||||
DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705 SHA512 662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
|
||||
DIST rocr-runtime-2.10.0.tar.gz 325165 BLAKE2B 482fde76d909e40478237ade1dcf9c0d28e1d6b9f541876d91f513d68c1882ae823d08b852a7c1b112ebace68f7860305cb962aeb79d7a4e8ef9a0ad249c69b5 SHA512 92ae7ff016bec7f8c5e781633d95a01e6b3e3aee5ad702d9e5b329d8b4141722328a17a67327f4aace747cce3e22a53d1e21d304dfcd2d83dd71f2da113adfd2
|
||||
DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384 SHA512 3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8
|
||||
DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B 99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624 SHA512 46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d
|
||||
DIST rocr-runtime-2.8.0.tar.gz 324868 BLAKE2B 5c46ffec7482e09032c67270a352543465f9f8a0a7c45e9884c37104e9e12a7e4dccb60bf3904d1398ffc00d9e934fc055190ba9ba4c1104bdb83be6c758eded SHA512 428b7d1d17a82c841a4d9a2c163670464416afa3ca3c579cc63ee712880940c0150e365922ffdafa44ee81fb76295cc19b66a1a4cb0a7e9a366f56782d826061
|
||||
DIST rocr-runtime-2.9.0.tar.gz 323220 BLAKE2B 7e6338185f23011ed4105c6797431677e657c6fc198f83399daab4d3b2d3333ebd6e86c0d669bf794f984ea0346b8e528449eb5d81aff2ecf3f1871663458df6 SHA512 fa68fde0f79651956096ee506ff8b6760a9623e7d9cb099229b3951b7434bed5b501a3c6785c5767902c7dbf6c478ada5d2c2a5c5984063f0d0d0db8bca2bda2
|
||||
DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/
|
||||
|
||||
commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6)
|
||||
Author: Craig Andrews <candrews@integralblue.com>
|
||||
Date: Mon Jan 7 21:06:14 2019 -0500
|
||||
|
||||
Correctly install the library into the system
|
||||
|
||||
Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
|
||||
Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 37a9b09..545f183 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} )
|
||||
|
||||
list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
|
||||
include ( utils )
|
||||
+include ( GNUInstallDirs )
|
||||
include ( hsa_common )
|
||||
|
||||
## Find LibElf
|
||||
@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
|
||||
add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
|
||||
endif ()
|
||||
|
||||
-## Create symlinks for packaging and install
|
||||
-add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link )
|
||||
-add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link )
|
||||
-
|
||||
## Set install information
|
||||
-install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
|
||||
-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
|
||||
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
|
||||
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
|
||||
+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
|
||||
+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
|
||||
|
||||
## Packaging directives
|
||||
set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" )
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71
|
||||
|
||||
From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001
|
||||
From: Sean Keely <Sean.Keely@amd.com>
|
||||
Date: Thu, 5 Sep 2019 20:58:57 -0500
|
||||
Subject: [PATCH] Correct doorbell_queue_map allocation.
|
||||
|
||||
doorbell_queue_map should be allocated unconditionally.
|
||||
---
|
||||
core/runtime/amd_gpu_agent.cpp | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp
|
||||
index 9b79a6b..76df913 100644
|
||||
--- a/core/runtime/amd_gpu_agent.cpp
|
||||
+++ b/core/runtime/amd_gpu_agent.cpp
|
||||
@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() {
|
||||
}
|
||||
|
||||
void GpuAgent::BindTrapHandler() {
|
||||
+ // Make an empty map from doorbell index to queue.
|
||||
+ // The trap handler uses this to retrieve a wave's amd_queue_t*.
|
||||
+ auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
|
||||
+
|
||||
+ doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
|
||||
+ doorbell_queue_map_size, 0x1000, 0);
|
||||
+ assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
|
||||
+
|
||||
+ memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
|
||||
+
|
||||
if (isa_->GetMajorVersion() == 7) {
|
||||
// No trap handler support on Gfx7, soft error.
|
||||
return;
|
||||
}
|
||||
|
||||
- // Disable trap handler on Carrizo until KFD is fixed.
|
||||
+ // Disable trap handler on APUs until KFD is fixed.
|
||||
if (profile_ == HSA_PROFILE_FULL) {
|
||||
return;
|
||||
}
|
||||
@@ -1195,16 +1205,6 @@ void GpuAgent::BindTrapHandler() {
|
||||
// Assemble the trap handler source code.
|
||||
AssembleShader("TrapHandler", AssembleTarget::ISA, trap_code_buf_, trap_code_buf_size_);
|
||||
|
||||
- // Make an empty map from doorbell index to queue.
|
||||
- // The trap handler uses this to retrieve a wave's amd_queue_t*.
|
||||
- auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
|
||||
-
|
||||
- doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
|
||||
- doorbell_queue_map_size, 0x1000, 0);
|
||||
- assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
|
||||
-
|
||||
- memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
|
||||
-
|
||||
// Bind the trap handler to this node.
|
||||
HSAKMT_STATUS err = hsaKmtSetTrapHandler(node_id(), trap_code_buf_, trap_code_buf_size_,
|
||||
doorbell_queue_map_, doorbell_queue_map_size);
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-cmake-install-paths.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/roct-thunk-interface"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="nonfree"
|
||||
|
||||
COMMON_DEPEND="sys-process/numactl"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
nonfree? ( dev-libs/hsa-ext-rocr )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/roct-thunk-interface-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/roct-thunk-interface"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="nonfree"
|
||||
|
||||
COMMON_DEPEND="sys-process/numactl"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
nonfree? ( dev-libs/hsa-ext-rocr )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/roct-thunk-interface-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
|
||||
"${FILESDIR}/${P}-fix_doorbell_map.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="nonfree"
|
||||
|
||||
COMMON_DEPEND="sys-process/numactl"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
nonfree? ( dev-libs/hsa-ext-rocr )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/roct-thunk-interface-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="nonfree"
|
||||
|
||||
COMMON_DEPEND="sys-process/numactl"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
nonfree? ( dev-libs/hsa-ext-rocr )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/roct-thunk-interface-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
|
||||
inherit git-r3
|
||||
S="${WORKDIR}/${P}/src"
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Runtime"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
|
||||
)
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
IUSE="nonfree"
|
||||
|
||||
COMMON_DEPEND="sys-process/numactl"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
nonfree? ( dev-libs/hsa-ext-rocr )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/roct-thunk-interface-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,7 +1 @@
|
||||
DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
|
||||
DIST roct-thunk-interface-2.10.0.tar.gz 2683289 BLAKE2B 54e4eb6e5d6b0e6e99021b8ce441401cf5a8e1847cbb81d7a3bbf73ecc42d3296b067b0dc5fb1e90b406bf4f909e94bdd57a4c64e730f9f579a85d6d0c70df69 SHA512 95ca5ce1136ef576d86a642cb413f66ee3d407cf564f44ad0f9ee9cf6ee8aa411977beba33bebec2dfa6c650f7bf50be85de45e7debc058a3a3de662f4327c7f
|
||||
DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f
|
||||
DIST roct-thunk-interface-2.7.0.tar.gz 2677696 BLAKE2B 44e15d772f3e86994739ca28300cac0dde56a173daa3789a332d58ed7ac4f5e8705b778e1096d022225a8b89fa5ceb4e3e40b456d470e7ab325721328e04292e SHA512 325444d6b457dae03779730324bf683712acb07ed9379675b025456a8dfcc4f6ebf1d2e10bcf03b6474ad8353c20c8fa1d380a671578e47f9a7e27caf946ecab
|
||||
DIST roct-thunk-interface-2.8.0.tar.gz 2679724 BLAKE2B d7e1cbb0a21800016926caf6d644d10d0643e46ed888cb23414f92a55fa994c7f1de1982b025f9d116b3e596ff0224397180d6c974940f1b5038b331f1527c8b SHA512 c1c64192f5687744a069bcc1067d3edbd833b6e784e114e8772abc89940d24b7a0dbc0479f41d1252a4b69ca6a339b00bf849682ae235cb6d5fa76a6c84f3193
|
||||
DIST roct-thunk-interface-2.9.0.tar.gz 2683269 BLAKE2B 0dd5d4f6b4046711e2fc535012fb164b463000f19a3043398ca8e1382d373cfa4a5ba00c8861a3b0fdc8a34843fbcec644ef2c1598fdd08b4bf2fdf18ef3988b SHA512 ac6bd1550b56996edc7e5cc49200c8cb0dd8da42d6fca5eac27e48c45ce74583c6510847fe747bd528089d054faecefcfe630284b8cd1f9d692838d47643c0c0
|
||||
DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d4b40e38f2bd1bd5ac2c77c189490df9bcc7864f8357c262ad62d6cbf0f62f41edd9e09f5b75ce1e66f3a589d143a3883942a12d SHA512 18756a626d57255cfdd03b38dbc56769e4e28dbe1b00cc1e3d99a39dcd943bafebedc1774c76a191cdaf83b2bce4ac464dc97cbd088894447afddcca50447e9f
|
||||
|
||||
@ -1,288 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/25
|
||||
From c60501d7e69db24f5d880aace73662384ea90b27 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Sep 2018 10:30:05 +0200
|
||||
Subject: [PATCH 1/7] cmake: Do not mess with CMAKE_C_FLAGS
|
||||
|
||||
---
|
||||
CMakeLists.txt | 11 +++--------
|
||||
1 file changed, 3 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cb2605b..8a0f362 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -59,15 +59,9 @@ set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUIL
|
||||
#set ( CMAKE_VERBOSE_MAKEFILE on )
|
||||
|
||||
## Compiler flags
|
||||
-set ( CMAKE_C_FLAGS "-fPIC -W -Wall -Wextra -Wno-unused-parameter -Wformat-security -Wswitch-default -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wlogical-op -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wunreachable-code -std=gnu99 -fvisibility=hidden" )
|
||||
+set (HSAKMT_C_FLAGS -fPIC -W -Wall -Wextra -Wno-unused-parameter -Wformat-security -Wswitch-default -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wlogical-op -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wunreachable-code -std=gnu99 -fvisibility=hidden)
|
||||
if ( "${CMAKE_C_COMPILER_VERSION}" STRGREATER "4.8.0")
|
||||
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror" )
|
||||
-endif ()
|
||||
-
|
||||
-if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
|
||||
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2" )
|
||||
-else ()
|
||||
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g" )
|
||||
+ set (HSAKMT_C_FLAGS ${HSAKMT_C_FLAGS} -Werror)
|
||||
endif ()
|
||||
|
||||
set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" )
|
||||
@@ -96,6 +90,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
|
||||
|
||||
## Add the library
|
||||
add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} )
|
||||
+target_compile_options(${HSAKMT_TARGET} PRIVATE ${HSAKMT_C_FLAGS})
|
||||
|
||||
## Set the VERSION and SOVERSION values
|
||||
set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION "${LIB_VERSION_STRING}" )
|
||||
|
||||
From d37b3e2e634a40192c113d9a8256f3d2aa24acfa Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Sep 2018 10:31:59 +0200
|
||||
Subject: [PATCH 2/7] cmake: Do not mess with CMAKE_SHARED_LINKER_FLAGS
|
||||
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8a0f362..a2a36cd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -67,7 +67,7 @@ endif ()
|
||||
set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" )
|
||||
|
||||
## Linker Flags
|
||||
-set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT} -Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete -Wl,-no-undefined" )
|
||||
+set (HSAKMT_LINK_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT} -Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete -Wl,-no-undefined" )
|
||||
|
||||
## Source files
|
||||
set ( HSAKMT_SRC "src/debug.c"
|
||||
@@ -91,6 +91,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
|
||||
## Add the library
|
||||
add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} )
|
||||
target_compile_options(${HSAKMT_TARGET} PRIVATE ${HSAKMT_C_FLAGS})
|
||||
+set_property(TARGET ${HSAKMT_TARGET} PROPERTY LINK_FLAGS ${HSAKMT_LINK_FLAGS})
|
||||
|
||||
## Set the VERSION and SOVERSION values
|
||||
set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION "${LIB_VERSION_STRING}" )
|
||||
|
||||
From 7f9ad94a9932319930f96d49a78fa9e741cd7292 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Sep 2018 10:41:04 +0200
|
||||
Subject: [PATCH 3/7] cmake: Use GNUInstallDirs for installtion
|
||||
|
||||
This will allow distributions to install it correctly.
|
||||
---
|
||||
CMakeLists.txt | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a2a36cd..58076fa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -111,8 +111,9 @@ endif ()
|
||||
|
||||
## Define default variable and variables for the optional build target hsakmt-dev
|
||||
set ( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location of hsakmt source code." )
|
||||
-set ( CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory." )
|
||||
-set ( CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default packaging prefix." )
|
||||
+set ( HSAKMT_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory." )
|
||||
+set ( HSAKMT_INSTALL_LIBDIR "hsakmt/lib" CACHE STRING "Default installation directory." )
|
||||
+set ( HSAKMT_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default packaging prefix." )
|
||||
set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators." )
|
||||
|
||||
## Specify build, install and package targets hsakmt-dev
|
||||
@@ -121,9 +122,12 @@ configure_file ( hsakmt-dev.txt ${DEV_BUILD_DIR}/CMakeLists.txt @ONLY )
|
||||
add_custom_target ( build-dev
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-DSOURCE_DIR="${SOURCE_DIR}"
|
||||
- -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
|
||||
+ -DCMAKE_INSTALL_PREFIX="${HSAKMT_INSTALL_PREFIX}"
|
||||
+ -DCMAKE_INSTALL_LIBDIR="${HSAKMT_INSTALL_LIBDIR}"
|
||||
-DCPACK_RPM_PACKAGE_REQUIRES="hsakmt-roct"
|
||||
- -DCPACK_PACKAGING_INSTALL_PREFIX="${CPACK_PACKAGING_INSTALL_PREFIX}"
|
||||
+ -DCPACK_PACKAGING_INSTALL_PREFIX="${HSAKMT_PACKAGING_INSTALL_PREFIX}"
|
||||
+ COMMAND rm -rf *.deb *.rpm *.tar.gz
|
||||
+ COMMAND make package
|
||||
WORKING_DIRECTORY ${DEV_BUILD_DIR} )
|
||||
|
||||
## Custom targets for the devel package
|
||||
@@ -135,7 +139,6 @@ add_custom_target ( package-dev DEPENDS build-dev
|
||||
|
||||
## Add the install directives for the runtime library.
|
||||
install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
|
||||
-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
|
||||
|
||||
## Add the packaging directives for the runtime library.
|
||||
set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
|
||||
|
||||
From d3f841cf2c504c7af9735d27d4f4b9784754708d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Sep 2018 11:10:52 +0200
|
||||
Subject: [PATCH 4/7] cmake: Install header files
|
||||
|
||||
---
|
||||
CMakeLists.txt | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 58076fa..81ec134 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -140,6 +140,14 @@ add_custom_target ( package-dev DEPENDS build-dev
|
||||
## Add the install directives for the runtime library.
|
||||
install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
|
||||
|
||||
+install(FILES
|
||||
+ include/hsakmt.h
|
||||
+ include/hsakmttypes.h
|
||||
+ DESTINATION
|
||||
+ ${CMAKE_INSTALL_INCLUDEDIR}/libhsakmt
|
||||
+ COMPONENT
|
||||
+ ${HSAKMT_COMPONENT}-header)
|
||||
+
|
||||
## Add the packaging directives for the runtime library.
|
||||
set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
|
||||
set ( CPACK_PACKAGE_VENDOR "AMD" )
|
||||
|
||||
From 66e43bab21ee2a8ba1eed59e6a5052eb2f0fc1b8 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Sep 2018 10:43:26 +0200
|
||||
Subject: [PATCH 5/7] cmake: Install the pkgconfig file
|
||||
|
||||
---
|
||||
CMakeLists.txt | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 81ec134..5482e02 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -169,5 +169,11 @@ set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/RPM/rpm_
|
||||
|
||||
# CPACK_PACKAGING_INSTALL_PREFIX is needed in libhsakmt.pc.in
|
||||
configure_file ( libhsakmt.pc.in ${DEV_BUILD_DIR}/libhsakmt.pc @ONLY )
|
||||
+install(FILES
|
||||
+ ${DEV_BUILD_DIR}/libhsakmt.pc
|
||||
+ DESTINATION
|
||||
+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||
+ COMPONENT
|
||||
+ ${HSAKMT_COMPONENT}-pkgconfig)
|
||||
|
||||
include ( CPack )
|
||||
|
||||
From 5f1ed605a484e30c51954817b6d8712ab4c6046e Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Tue, 25 Sep 2018 18:47:57 +0200
|
||||
Subject: [PATCH 6/7] cmake: Do not strip targets in the release build
|
||||
|
||||
Distributions want to generate debuginfo packages, do not strip them! If
|
||||
you want to do it during installation use 'make install/strip'!
|
||||
---
|
||||
CMakeLists.txt | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5482e02..f8f58cd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -104,11 +104,6 @@ target_link_libraries ( ${HSAKMT_TARGET}
|
||||
pthread rt numa ${PC_LIBPCI_LIBRARIES}
|
||||
)
|
||||
|
||||
-## If the library is a release, strip the target library
|
||||
-if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
|
||||
- add_custom_command ( TARGET ${HSAKMT_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} ${HSAKMT_COMPONENT}.so )
|
||||
-endif ()
|
||||
-
|
||||
## Define default variable and variables for the optional build target hsakmt-dev
|
||||
set ( SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location of hsakmt source code." )
|
||||
set ( HSAKMT_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory." )
|
||||
|
||||
From 86b29b265c1a91d2bc931453e4edac66a6d9da0d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Tue, 25 Sep 2018 19:16:43 +0200
|
||||
Subject: [PATCH 7/7] cmake: Create cmake config file
|
||||
|
||||
Another cmake project like hsa-runtime could just use:
|
||||
|
||||
find_package(hsakmt REQUIRED 1.9.0)
|
||||
---
|
||||
CMakeLists.txt | 31 ++++++++++++++++++++++++++++++-
|
||||
hsakmt-config.cmake.in | 9 +++++++++
|
||||
2 files changed, 39 insertions(+), 1 deletion(-)
|
||||
create mode 100644 hsakmt-config.cmake.in
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f8f58cd..6e5a0fe 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ set ( HSAKMT_PACKAGE "hsakmt-roct" )
|
||||
set ( HSAKMT_COMPONENT "lib${HSAKMT}" )
|
||||
set ( HSAKMT_TARGET "${HSAKMT}" )
|
||||
|
||||
-project ( ${HSAKMT_TARGET} )
|
||||
+project ( ${HSAKMT_TARGET} VERSION 1.9.0)
|
||||
|
||||
## Set default module path if not already set
|
||||
if ( NOT DEFINED CMAKE_MODULE_PATH )
|
||||
@@ -44,6 +44,8 @@ include ( GNUInstallDirs )
|
||||
## Setup the package version.
|
||||
get_version ( "1.0.0" )
|
||||
|
||||
+# FIXME: The library version should not be tied to the project version!
|
||||
+# There are rules how to bump version numbers for libraries.
|
||||
set ( BUILD_VERSION_MAJOR ${VERSION_MAJOR} )
|
||||
set ( BUILD_VERSION_MINOR ${VERSION_MINOR} )
|
||||
set ( BUILD_VERSION_PATCH ${VERSION_PATCH} )
|
||||
@@ -171,4 +173,31 @@ install(FILES
|
||||
COMPONENT
|
||||
${HSAKMT_COMPONENT}-pkgconfig)
|
||||
|
||||
+# Create cmake configuration files
|
||||
+include(CMakePackageConfigHelpers)
|
||||
+
|
||||
+set(HSAKMT_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
+
|
||||
+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} CACHE INTERNAL "")
|
||||
+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE INTERNAL "")
|
||||
+
|
||||
+configure_package_config_file(${PROJECT_NAME}-config.cmake.in
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
|
||||
+ PATH_VARS
|
||||
+ INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
|
||||
+ INSTALL_DESTINATION
|
||||
+ ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
||||
+
|
||||
+write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake
|
||||
+ COMPATIBILITY
|
||||
+ AnyNewerVersion)
|
||||
+
|
||||
+install(FILES
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
|
||||
+ DESTINATION
|
||||
+ ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
|
||||
+ COMPONENT
|
||||
+ devel)
|
||||
+
|
||||
include ( CPack )
|
||||
diff --git a/hsakmt-config.cmake.in b/hsakmt-config.cmake.in
|
||||
new file mode 100644
|
||||
index 0000000..e6bad17
|
||||
--- /dev/null
|
||||
+++ b/hsakmt-config.cmake.in
|
||||
@@ -0,0 +1,9 @@
|
||||
+@PACKAGE_INIT@
|
||||
+
|
||||
+set_and_check(HSAKMT_INCLUDE_DIR @PACKAGE_LIB_INSTALL_DIR@)
|
||||
+set_and_check(HSAKMT_LIB_DIR @PACKAGE_LIB_INSTALL_DIR@)
|
||||
+
|
||||
+set(HSAKMT_LIBRARY @PACKAGE_LIB_INSTALL_DIR@/@HSAKMT_LIBRARY_NAME@)
|
||||
+set(HSAKMT_LIBRARIES @PACKAGE_LIB_INSTALL_DIR@/@HSAKMT_LIBRARY_NAME@)
|
||||
+
|
||||
+mark_as_advanced(HSAKMT_LIBRARY HSAKMT_INCLUDE_DIR)
|
||||
@ -1,25 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39
|
||||
|
||||
From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001
|
||||
From: Craig Andrews <candrews@integralblue.com>
|
||||
Date: Mon, 22 Jul 2019 17:06:16 -0400
|
||||
Subject: [PATCH] Install libhsakmt.pc to the standard location
|
||||
|
||||
pkgconfig files should be installed to /usr/share/pkgconfig/, not /usr/libhsakmt/
|
||||
---
|
||||
hsakmt-dev.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
|
||||
index eb0d3e2..195cc6c 100644
|
||||
--- a/hsakmt-dev.txt
|
||||
+++ b/hsakmt-dev.txt
|
||||
@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ )
|
||||
set ( CMAKE_VERBOSE_MAKEFILE on )
|
||||
|
||||
## Set the install targets
|
||||
-install ( FILES libhsakmt.pc DESTINATION libhsakmt )
|
||||
+install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
|
||||
install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38
|
||||
|
||||
From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Andrews <candrews@integralblue.com>
|
||||
Date: Mon, 22 Jul 2019 16:18:08 -0400
|
||||
Subject: [PATCH] Install LICENSE.md to DOCDIR
|
||||
|
||||
LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e020132..398da3e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev
|
||||
|
||||
## Add the install directives for the runtime library.
|
||||
install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
|
||||
-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
|
||||
+install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} )
|
||||
|
||||
## Add the packaging directives for the runtime library.
|
||||
set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )
|
||||
@ -1,25 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/42
|
||||
|
||||
From 9090559aad755bf2b5041fb617c3ddf790c7cdf6 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Andrews <candrews@integralblue.com>
|
||||
Date: Thu, 8 Aug 2019 14:01:04 -0400
|
||||
Subject: [PATCH] hsakmt-dev should not install linux kernel headers
|
||||
|
||||
hsakmt-dev should not install include/linux/* (currently just kfd_ioctl.h) as those are linux kernel headers provided by the linux kernel header packages (`linux-headers-*` on Debian/Ubuntu or `kernel-headers-*` on Red Hat / Fedora)
|
||||
---
|
||||
hsakmt-dev.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
|
||||
index eb0d3e2..6af364c 100644
|
||||
--- a/hsakmt-dev.txt
|
||||
+++ b/hsakmt-dev.txt
|
||||
@@ -44,7 +44,7 @@ set ( CMAKE_VERBOSE_MAKEFILE on )
|
||||
|
||||
## Set the install targets
|
||||
install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
|
||||
-install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
|
||||
+install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} PATTERN "linux" EXCLUDE )
|
||||
|
||||
|
||||
## Set the default generator types for the devel package.
|
||||
@ -1,22 +0,0 @@
|
||||
https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40
|
||||
|
||||
From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Andrews <candrews@integralblue.com>
|
||||
Date: Mon, 22 Jul 2019 17:17:09 -0400
|
||||
Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig
|
||||
|
||||
The location where files are installed is the value to use; the CPACK packaging directory isn't important as the pkgconfig file is used on the system after the package is installed.
|
||||
---
|
||||
libhsakmt.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libhsakmt.pc.in b/libhsakmt.pc.in
|
||||
index 3093afc..1abb66d 100644
|
||||
--- a/libhsakmt.pc.in
|
||||
+++ b/libhsakmt.pc.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-prefix=@CPACK_PACKAGING_INSTALL_PREFIX@
|
||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=${prefix}
|
||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils linux-info
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-correctly-install.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Thunk Interface"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
|
||||
CONFIG_CHECK="~HSA_AMD"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl
|
||||
sys-apps/pciutils"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils linux-info
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Thunk Interface"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
|
||||
CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl
|
||||
sys-apps/pciutils"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
src_compile() {
|
||||
cmake-utils_src_compile build-dev
|
||||
}
|
||||
src_install() {
|
||||
cmake-utils_src_install install-dev
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils linux-info
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-correctly-install.patch"
|
||||
"${FILESDIR}/${P}-correctly-install-pc.patch"
|
||||
"${FILESDIR}/${P}-pc-prefix.patch"
|
||||
"${FILESDIR}/${P}-do-not-install-kfd_ioctl.h.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Thunk Interface"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
|
||||
CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl
|
||||
sys-apps/pciutils"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
src_compile() {
|
||||
cmake-utils_src_compile build-dev
|
||||
}
|
||||
src_install() {
|
||||
cmake-utils_src_install install-dev
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils linux-info
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-correctly-install-pc.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-pc-prefix.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-do-not-install-kfd_ioctl.h.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Thunk Interface"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
|
||||
CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl
|
||||
sys-apps/pciutils"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
src_compile() {
|
||||
cmake-utils_src_compile build-dev
|
||||
}
|
||||
src_install() {
|
||||
cmake-utils_src_install install-dev
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils linux-info
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-correctly-install-pc.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-pc-prefix.patch"
|
||||
"${FILESDIR}/${PN}-2.6.0-do-not-install-kfd_ioctl.h.patch"
|
||||
)
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Thunk Interface"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
|
||||
CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl
|
||||
sys-apps/pciutils"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
src_compile() {
|
||||
cmake-utils_src_compile build-dev
|
||||
}
|
||||
src_install() {
|
||||
cmake-utils_src_install install-dev
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake-utils linux-info
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Radeon Open Compute Thunk Interface"
|
||||
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
|
||||
CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
|
||||
LICENSE="MIT"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
|
||||
RDEPEND="sys-process/numactl
|
||||
sys-apps/pciutils"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
|
||||
-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
src_compile() {
|
||||
cmake-utils_src_compile build-dev
|
||||
}
|
||||
src_install() {
|
||||
cmake-utils_src_install install-dev
|
||||
}
|
||||
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue