Permalink
Browse files

Merge branch 'master' of git.funtoo.org:funtoo-overlay

  • Loading branch information...
Ryan Harris
Ryan Harris committed Jul 17, 2013
2 parents 0aa8df7 + d6df770 commit fd2d3749e58fe7bfa4c985b3dcb31c4f16b76fd7
@@ -116,7 +116,7 @@ src_configure() {
if use objc; then
GCC_LANG+=",objc"
confgcc+=" --enable-objc-gc"
- use objcxx && GCC_LANG+=",obj-c++"
+ use objc++ && GCC_LANG+=",obj-c++"
fi
use fortran && GCC_LANG+=",fortran" || confgcc+=" --disable-libquadmath"
use f77 && GCC_LANG+=",f77"
@@ -141,8 +141,8 @@ src_compile() {
src_install() {
# copy sources into place:
dodir /usr/src
- cp -a ${S} ${D}/usr/src/linux-${PVR} || die
- cd ${D}/usr/src/linux-${PVR}
+ cp -a ${S} ${D}/usr/src/linux-${PF} || die
+ cd ${D}/usr/src/linux-${PF}
# prepare for real-world use and 3rd-party module building:
make mrproper || die
cp $defconfig_src .config || die
@@ -164,12 +164,12 @@ src_install() {
find -iname *.ko -exec strip --strip-debug {} \;
# back to the symlink fixup:
local moddir="$(ls -d 2*)"
- ln -s /usr/src/linux-${PVR} ${D}/lib/modules/${moddir}/source || die
- ln -s /usr/src/linux-${PVR} ${D}/lib/modules/${moddir}/build || die
+ ln -s /usr/src/linux-${PF} ${D}/lib/modules/${moddir}/source || die
+ ln -s /usr/src/linux-${PF} ${D}/lib/modules/${moddir}/build || die
# Fixes FL-14
- cp "${WORKDIR}/build/System.map" "${D}/usr/src/linux-${PVR}/" || die
- cp "${WORKDIR}/build/Module.symvers" "${D}/usr/src/linux-${PVR}/" || die
+ cp "${WORKDIR}/build/System.map" "${D}/usr/src/linux-${PF}/" || die
+ cp "${WORKDIR}/build/Module.symvers" "${D}/usr/src/linux-${PF}/" || die
}
pkg_postinst() {
@@ -180,6 +180,6 @@ pkg_postinst() {
fi
if [ ! -e ${ROOT}usr/src/linux ]
then
- ln -s linux-${PVR} ${ROOT}usr/src/linux
+ ln -s linux-${PF} ${ROOT}usr/src/linux
fi
}

0 comments on commit fd2d374

Please sign in to comment.