[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in x11-libs/qt: ChangeLog qt-4.3.2.ebuild

[Donnie Berkholz]

On 14:58 Wed 03 Oct     , Caleb Tennis (caleb) wrote:
> 1.1                  x11-libs/qt/qt-4.3.2.ebuild
>
> file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?rev=1.1&view=markup
> plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?rev=1.1&content-type=text/plain

> 	case ${CHOST} in
> 		*-freebsd*|*-dragonfly*)
> 			spec="freebsd" ;;
> 		*-openbsd*)
> 			spec="openbsd" ;;
> 		*-netbsd*)
> 			spec="netbsd" ;;
> 		*-darwin*)
> 			spec="darwin" ;;
> 		*-linux-*|*-linux)
> 			spec="linux" ;;
> 		*)
> 			die "Unknown CHOST, no platform choosed."
> 	esac
>
> 	CXX=$(tc-getCXX)
> 	if [[ ${CXX/g++/} != ${CXX} ]]; then
> 		spec="${spec}-g++"
> 	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
> 		spec="${spec}-icc"
> 	else
> 		die "Unknown compiler ${CXX}."
> 	fi

Try being a little smarter with both CHOST and CXX -- only add an 
exception if the spec name isn't equal to the variable value.

spec=$(echo ${CHOST} | cut -d- -f3)
spec=${spec%%[0-9]*}
spec=${spec}-$(tc-getCXX)

For icc, you should just be able to use 'icc'; it's installed that for 
quite a while. That way you don't require any special cases here.

> 	cd ${S}
> 	epatch ${FILESDIR}/qt-4.2.3-hppa-ldcw-fix.patch
> 	cd ${S}/mkspecs/$(qt_mkspecs_dir)
> 	cd ${S}/mkspecs/common
> 	cd ${S}/qmake
> 	cd ${S}
> 	make INSTALL_ROOT=${D} install_subtargets || die
> 	make INSTALL_ROOT=${D} install_qmake || die
> 	make INSTALL_ROOT=${D} install_mkspecs || die
> 		make INSTALL_ROOT=${D} install_htmldocs || die
> 	make INSTALL_ROOT=${D} install_translations || die
> 	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
> 	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
> 	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
> 	sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
> 	mv ${D}/${QTLIBDIR}/pkgconfig/*.pc ${D}/${QTPCDIR}
> 	doins ${FILESDIR}/qt4/*.desktop

Quote variables that can have spaces in them: D, S, T, WORKDIR,
FILESDIR, DESTDIR, ROOT.

If emake doesn't work, please add a comment to that effect.

Thanks,
Donnie
-- 
gentoo-dev@g.o mailing list