diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 66 | ||||
| -rw-r--r-- | aocl-aocc.install | 7 | ||||
| -rw-r--r-- | aocl-gcc.install | 7 | ||||
| -rw-r--r-- | modulefile | 22 |
5 files changed, 56 insertions, 60 deletions
@@ -1,20 +1,20 @@ pkgbase = aocl pkgdesc = AMD Optimizing CPU Libraries - pkgver = 2.2 - pkgrel = 2 + pkgver = 3.0 + pkgrel = 1 url = https://developer.amd.com/amd-aocl/ arch = x86_64 license = custom - depends = env-modules + optdepends = env-modules options = staticlibs options = !strip - source = local://aocl-linux-aocc-2.2-4.tar.gz - source = local://aocl-linux-gcc-2.2-5.tar.gz + source = local://aocl-linux-aocc-3.0-6.tar.gz + source = local://aocl-linux-gcc-3.0-6.tar.gz source = local://aocl-aocc.install source = local://aocl-gcc.install source = local://modulefile - sha256sums = 4bdc5caec0233066ded3e2bfedb1e03bdeec82725361764d8860075f64ff4031 - sha256sums = 2cdfbf9f03be7b4756316f0ecd117cf323d3a54e0d66d7fcaa4bc947e1846540 + sha256sums = c1f0dd73ad0bfb1ede823cdd681c2834f2b7c88b8e7423c4c4412d6cc624ce39 + sha256sums = 294e63fbceee8d993c4a98d51e008f81ffe4159b5b163db316ddd93fccc04b52 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -1,40 +1,33 @@ # Maintainer: Darjan Krijan (daren) <darjan_krijan@gmx.de> -# Manual download of '${pkgname}-linux-gcc-${pkgver}.tar.gz' required from upstream -# Manual download of '${pkgname}-linux-aocc-${pkgver}.tar.gz' required from upstream +# Manual download of '${pkgname}-linux-gcc-${pkgver}-${_pkgrel}.tar.gz' required from upstream +# Manual download of '${pkgname}-linux-aocc-${pkgver}-${_pkgrel}.tar.gz' required from upstream pkgbase=aocl pkgname=(aocl-aocc aocl-gcc) -pkgver=2.2 -_pkgrel_aocc=4 -_pkgrel_gcc=5 -pkgrel=2 +pkgver=3.0 +_pkgrel=6 +pkgrel=1 pkgdesc="AMD Optimizing CPU Libraries" arch=('x86_64') license=('custom') url="https://developer.amd.com/amd-aocl/" source=( - "local://${pkgbase}-linux-aocc-${pkgver}-${_pkgrel_aocc}.tar.gz" - "local://${pkgbase}-linux-gcc-${pkgver}-${_pkgrel_gcc}.tar.gz" + "local://${pkgbase}-linux-aocc-${pkgver}-${_pkgrel}.tar.gz" + "local://${pkgbase}-linux-gcc-${pkgver}-${_pkgrel}.tar.gz" "local://${pkgbase}-aocc.install" "local://${pkgbase}-gcc.install" "local://modulefile" ) options=('staticlibs' '!strip') -depends=('env-modules') +optdepends=('env-modules') sha256sums=( - "4bdc5caec0233066ded3e2bfedb1e03bdeec82725361764d8860075f64ff4031" - "2cdfbf9f03be7b4756316f0ecd117cf323d3a54e0d66d7fcaa4bc947e1846540" + "c1f0dd73ad0bfb1ede823cdd681c2834f2b7c88b8e7423c4c4412d6cc624ce39" + "294e63fbceee8d993c4a98d51e008f81ffe4159b5b163db316ddd93fccc04b52" "SKIP" "SKIP" "SKIP" ) -if [ -z ${MODULESHOME} ]; then - echo "Environment variable MODULESHOME from env-modules is unset." - echo "Restart your shell or source the env-modules scripts for your shell." - exit 1 -fi - package_aocl-aocc() { install=${pkgname}.install @@ -42,28 +35,23 @@ package_aocl-aocc() { prefix=${pkgdir}/${aocl_prefix} mkdir -p ${prefix} - cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}-${_pkgrel_aocc} + cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}-${_pkgrel} cp AOCL_User_Guide_${pkgver}.pdf ${prefix} ./install.sh -t ${prefix} # strip unneeded directories - mv ${prefix}/${pkgver}/* ${prefix} - rm -r ${prefix}/${pkgver} - - # delete libs directory with broken symlinks - #rm -rf ${prefix}/libs + mv ${prefix}/${pkgver}-${_pkgrel}/* ${prefix} + rm -r ${prefix}/${pkgver}-${_pkgrel} - # fix amdlibm_vec.h - sed -e "s/#ifdef AMD_LIBM_VEC_EXTERNAL_H/#ifndef AMD_LIBM_VEC_EXTERNAL_H/g" \ - -i ${prefix}/include/amdlibm_vec.h + # fix amd-libs.cfg containing ${pkgdir} + sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/amd-libs.cfg - # modulefile - echo -e "\nSymlinking modulefile..." + # env-modules (optional) cp ${srcdir}/modulefile ${prefix} - mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/ - ln -s ${aocl_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname} + mkdir -p ${pkgdir}/etc/modules/modulefiles + ln -s ${aocl_prefix}/modulefile ${pkgdir}/etc/modules/modulefiles/${pkgname} } package_aocl-gcc() { @@ -73,28 +61,26 @@ package_aocl-gcc() { prefix=${pkgdir}/${aocl_prefix} mkdir -p ${prefix} - cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}-${_pkgrel_gcc} + cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}-${_pkgrel} cp AOCL_User_Guide_${pkgver}.pdf ${prefix} ./install.sh -t ${prefix} # strip unneeded directories - mv ${prefix}/${pkgver}/* ${prefix} - rm -r ${prefix}/${pkgver} + mv ${prefix}/${pkgver}-${_pkgrel}/* ${prefix} + rm -r ${prefix}/${pkgver}-${_pkgrel} - # fix amdlibm_vec.h - sed -e "s/#ifdef AMD_LIBM_VEC_EXTERNAL_H/#ifndef AMD_LIBM_VEC_EXTERNAL_H/g" \ - -i ${prefix}/include/amdlibm_vec.h + # fix amd-libs.cfg containing ${pkgdir} + sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/amd-libs.cfg - # modulefile - echo -e "\nSymlinking modulefile..." + # env-modules (optional) cp ${srcdir}/modulefile ${prefix} sed -e "s/aocl-aocc/aocl-gcc/g" \ -e "s/conflict aocl-gcc/conflict aocl-aocc/g" \ -i ${prefix}/modulefile - mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/ - ln -s ${aocl_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname} + mkdir -p ${pkgdir}/etc/modules/modulefiles + ln -s ${aocl_prefix}/modulefile ${pkgdir}/etc/modules/modulefiles/${pkgname} } # vim:set ts=4 diff --git a/aocl-aocc.install b/aocl-aocc.install index 0aa6fed53990..9117229fc8d3 100644 --- a/aocl-aocc.install +++ b/aocl-aocc.install @@ -1,5 +1,10 @@ post_install() { - echo "Use 'module load aocl-aocc' to set up the environment for AMD Optimizing CPU Libraries." + if pacman -Q env-modules &> /dev/null; then + echo "env-modules seems to be installed:" + echo "If configured correctly, you can conveniently use" + echo " $ module load aocl-aocc" + echo "to set up the environment for AMD Optimizing CPU Libraries." + fi } post_upgrade() { diff --git a/aocl-gcc.install b/aocl-gcc.install index 46d79afc7785..ce5339dca828 100644 --- a/aocl-gcc.install +++ b/aocl-gcc.install @@ -1,5 +1,10 @@ post_install() { - echo "Use 'module load aocl-gcc' to set up the environment for AMD Optimizing CPU Libraries." + if pacman -Q env-modules &> /dev/null; then + echo "env-modules seems to be installed:" + echo "If configured correctly, you can conveniently use" + echo " $ module load aocl-gcc" + echo "to set up the environment for AMD Optimizing CPU Libraries." + fi } post_upgrade() { diff --git a/modulefile b/modulefile index 8801f3e601bc..19970f5bc3dc 100644 --- a/modulefile +++ b/modulefile @@ -3,23 +3,23 @@ # Created by Darjan Krijan <darjan_krijan@gmx.de> # -set MODULE "aocl-aocc" -set BASE_DIR "/opt" -set VERSION "2.2" -set AOCL_ROOT "${BASE_DIR}/${MODULE}" -set AOCL_TEXT "AMD Optimizing CPU Libraries (AOCL)" +set MODULE "aocl-aocc" +set BASE_DIR "/opt" +set VERSION "3.0-6" +set MODULE_ROOT "${BASE_DIR}/${MODULE}" +set MODULE_TEXT "AMD Optimizing CPU Libraries (AOCL)" conflict aocl-gcc -prepend-path CPATH ${AOCL_ROOT}/include -prepend-path LIBRARY_PATH ${AOCL_ROOT}/lib -prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/lib +prepend-path CPATH ${MODULE_ROOT}/include +prepend-path LIBRARY_PATH ${MODULE_ROOT}/lib +prepend-path LD_LIBRARY_PATH ${MODULE_ROOT}/lib -module-whatis "${AOCL_TEXT} version ${VERSION}" +module-whatis "${MODULE_TEXT} version ${VERSION}" proc ModulesHelp {} { - global AOCL_TEXT - puts stderr "This module sets up the environment for ${AOCL_TEXT}" + global MODULE_TEXT + puts stderr "This module sets up the environment for ${MODULE_TEXT}" puts stderr "by adapting the following environment variables:" puts stderr "CPATH" puts stderr "LIBRARY_PATH" |