From 41628ae3e62dbcfaf48e1fb9b76da981c01fedbb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 9 Jul 2012 18:11:56 +0200 Subject: [PATCH] chroot-gcc: switch to /usr. --- srcpkgs/chroot-gcc/template | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template index b3a11f73d2..5f548d5983 100644 --- a/srcpkgs/chroot-gcc/template +++ b/srcpkgs/chroot-gcc/template @@ -2,10 +2,10 @@ pkgname=chroot-gcc _majorver=4.7 _gmp_ver=5.0.3 -_mpfr_ver=3.1.0 +_mpfr_ver=3.1.1 _mpc_ver=0.8.2 version=${_majorver}.1 -revision=1 +revision=2 wrksrc="gcc-${version}" homepage="http://gcc.gnu.org" short_desc="The GNU C Compiler suite -- for xbps-src use" @@ -19,7 +19,7 @@ http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz" checksum=" 16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3 -74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680 +7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7" long_desc=" The GNU C Compiler suite, with support for C and C++. @@ -84,20 +84,18 @@ do_install() { # from the same series work automagically. mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \ ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver} - ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} + cd ${DESTDIR}/usr/lib/gcc/${_triplet} && ln -sf ${_majorver} ${version} # Ditto for c++ headers. mv ${DESTDIR}/usr/include/c++/${version} \ ${DESTDIR}/usr/include/c++/${_majorver} - ln -sf /usr/include/c++/${_majorver} \ - ${DESTDIR}/usr/include/c++/${version} + cd ${DESTDIR}/usr/include/c++ && ln -sf ${_majorver} ${version} # cc symlink. - ln -sf /usr/bin/gcc ${DESTDIR}/usr/bin/cc - # rpcgen wants /lib/cpp, make a symlink. - vmkdir lib - ln -sf /usr/bin/cpp ${DESTDIR}/lib/cpp + cd ${DESTDIR}/usr/bin && ln -sf gcc cc + # rpcgen wants /lib/cpp, make a symlink + cd ${DESTDIR}/usr/bin && ln -sf cpp ../lib/cpp + rm -f ${DESTDIR}/usr/lib64 # Remove unused stuff.