[Lunar-commits] <moonbase-core> Merge pull request #130 from Florin65/gcc

Auke Kok sofar+github at foo-projects.org
Sun Mar 31 19:27:50 CEST 2013


commit 3fe0b8217f7d5fe764ba45ba6aadcc2e0fa13a14
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Sun, 31 Mar 2013 10:27:50 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/3fe0b8217f7d5fe764ba45ba6aadcc2e0fa13a14

Merge pull request #130 from Florin65/gcc

gcc: remove the offending freetype broken link at install.
---
  compilers/gcc/BUILD        | +5/-2     
  compilers/gcc/BUILD.x86_64 | +4/-1     
  2 files changed, 9 insertions(+), 3 deletions(-)

--- a/compilers/gcc/BUILD
+++ b/compilers/gcc/BUILD
@@ -39,10 +39,13 @@
   cd /usr/lib/gcc/$BUILD/$VERSION  &&
   ln    -sf /usr/bin/cpp cpp       &&
   cd /lib/                         &&
-  ln    -sf /usr/bin/cpp cpp       && 
+  ln    -sf /usr/bin/cpp cpp       &&
 
   if [ ! -e /usr/bin/cc ] ; then
   ln -s gcc /usr/bin/cc
-  fi
+  fi  &&
+
+# remove the offending broken freetype link
+  rm -f $MODULE_PREFIX/lib/gcc/$BUILD/$VERSION/include-fixed/freetype
 
 ) > $C_FIFO 2>&1
--- a/compilers/gcc/BUILD.x86_64
+++ b/compilers/gcc/BUILD.x86_64
@@ -45,6 +45,9 @@
 
   if [ ! -e /usr/bin/cc ] ; then
   ln -s gcc /usr/bin/cc
-  fi
+  fi  &&
+
+# remove the offending freetype broken link
+  rm -f $MODULE_PREFIX/lib/gcc/$BUILD/$VERSION/include-fixed/freetype
 
 ) > $C_FIFO 2>&1




More information about the Lunar-commits mailing list