diff options
| author |   Sébastien Fabbro <bicatali@gentoo.org> | 2011-06-20 02:07:09 +0100 |
|---|---|---|
| committer | Sébastien Fabbro <bicatali@gentoo.org> | 2011-06-20 02:07:09 +0100 |
| commit | aa0ca12b16eb1e90101367d1b77a0e643f8bdd06 (patch) | |
| tree | a83f746a09cc9098e96462609523b2de1f2fdad1 /eclass | |
| parent | update virtuals with newer atlas (diff) | |
| download | bicatali-aa0ca12b16eb1e90101367d1b77a0e643f8bdd06.tar.gz bicatali-aa0ca12b16eb1e90101367d1b77a0e643f8bdd06.tar.bz2 bicatali-aa0ca12b16eb1e90101367d1b77a0e643f8bdd06.zip | |
more multilib and prefix fixes
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/intel-sdp.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 0234520..6759185 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -52,7 +52,7 @@ RDEPEND="" DEPEND=">=app-arch/rpm2targz-9.0.0.3g" INTEL_SDP_YEAR=${INTEL_DPV%_update*} INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${INTEL_SDP_YEAR:-${INTEL_PV1}}.${INTEL_PV3}.${INTEL_PV4}" -INTEL_SDP_EDIR="${EROOT#/}/${INTEL_SDP_DIR}" +INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}" S="${WORKDIR}" @@ -64,7 +64,7 @@ intel-sdp_pkg_setup() { elif use amd64; then arch=x86_64 INTEL_ARCH="intel64" - if use multilib; then + if has_multilib_profile; then arch="x86_64 ${INTEL_X86:-i486}" INTEL_ARCH="intel64 ia32" fi @@ -132,15 +132,16 @@ intel-sdp_src_install() { find opt -name \*sh -type f -exec sed -i \ -e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \ '{}' \; + mkdir -p "${ED:-${D}}"/ || die mv opt "${ED:-${D}}"/ || die "moving files failed" } intel-sdp_pkg_postinst() { # add product registry to intel "database" local l r - INTEL_SDP_DB="${EROOT#/}"/opt/intel/intel-sdp-products.db + INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db for r in ${INTEL_RPMS}; do - l="$(ls -1 ${EROOT#/}/opt/intel/.${r}_*.log | head -n 1)" + l="$(ls -1 ${EROOT%/}/opt/intel/.${r}_*.log | head -n 1)" echo >> ${INTEL_SDP_DB} \ "<:${r%-${INTEL_PV4}*}-${INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>" done |