sudo: updated to 1.8.19p2

[crossrootfs.git] / gcc / Pkgfile

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index a5bf931c84189e80573dab91c38df5f6204d4ee9..f12e1e96ed094f538ff3775bea915e8540c353fb 100644 (file)
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -5,16 +5,15 @@
 # Depends on: zlib libmpc
 
 name=gcc
-version=5.2.0
-release=2
+version=6.3.0
+release=1
 source=(ftp://gcc.gnu.org/pub/gcc/releases/$name-$version/$name-$version.tar.bz2
-        $name-nocheck-fixincludes.patch $name-$version-gnueabihf.patch)
+        $name-nocheck-fixincludes.patch)
 
 
 build() {
   cd $name-$version
 
-#  patch -p1 -i $SRC/$name-$version-gnueabihf.patch
   patch -p1 -i $SRC/$name-nocheck-fixincludes.patch
   sed -i 's|REVISION|REVISION " (CRUX-ARM)"|' $name/version.c
   # apply a sed substitution that will suppress the installation of libiberty.a
@@ -47,6 +46,14 @@ build() {
   sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile
 
   make 
+
+  # prevent libtool from adding host lib paths for relink at install
+  # based on patch submitted by Vincent Cadet for libtool bug #21455
+  # see https://lists.gnu.org/archive/html/bug-libtool/2015-09/msg00012.html
+  for lt_file in $(find $SRC/build/$CTARGET -name libtool) ; do
+    sed -i 's/\(add_dir=\"\)\$add_dir \(-L\$inst_prefix_dir\$libdir\"\)/\1\2/' $lt_file
+  done
+
   make -j1 DESTDIR=$PKG install
 
   mkdir $PKG/lib
@@ -56,7 +63,7 @@ build() {
 
   mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
 
-  rm $PKG/usr/lib/libstdc++.so.6.0.21-gdb.py
+  rm $PKG/usr/lib/libstdc++.so.6.0.22-gdb.py
   rm -r $PKG/usr/share
   rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}