X-Git-Url: http://gitweb/?a=blobdiff_plain;f=gcc%2FPkgfile;h=b70a2d757fc14ce8be1661419a662176ec41dd9f;hb=7740b0818b76e1294295eeb70212b263f44cc55f;hp=27ef9d4d9d5c1b6b98064a39ac617b3d88553351;hpb=5fc7b75ed34051b43070f62307f5fc55e8a58636;p=crossrootfs.git

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 27ef9d4..b70a2d7 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -5,24 +5,24 @@
 # Depends on: zlib libmpc
 
 name=gcc
-version=4.8.3
+version=5.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 gcc-$version-multilib-dirs.patch)
 
 build() {
+  patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch
+  patch -d $name-$version -p1 -i $SRC/$name-$version-multilib-dirs.patch
   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 substitutio that will suppress the installation of libiberty.a
+  sed -i 's|REVISION|REVISION " (CRUX-ARM 64b)"|' $name/version.c
+  # apply a sed substitution that will suppress the installation of libiberty.a
   sed 's|install_to_$(INSTALL_DEST) ||' -i libiberty/Makefile.in
 
   mkdir $SRC/build
   cd $SRC/build
 
+  export CXXFLAGS="-O2 -pipe"
   LDFLAGS="-Wl,-rpath-link,$CROSSTOOLS/$CTARGET/lib" \
   ../$name-$version/configure --build=$CHOST \
                               --host=$CTARGET \
@@ -36,17 +36,23 @@ build() {
                               --enable-__cxa_atexit \
                               --enable-clocale=gnu \
                               --enable-shared \
-                              --with-float=hard \
                               --disable-nls \
                               --with-x=no \
                               --with-system-zlib \
-                              --with-pkgversion="CRUX-ARM"
+                              --with-pkgversion="CRUX-ARM 64b"
 
   # prevent GCC from looking in the wrong directories for headers and libraries
   sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile
 
   make
-  make DESTDIR=$PKG install
+  # 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
   ln -sf ../usr/bin/cpp $PKG/lib/cpp
@@ -55,9 +61,9 @@ 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.19-gdb.py
+  rm $PKG/usr/lib64/libstdc++.so.6.0.21-gdb.py
   rm -r $PKG/usr/share
   rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
 
-  sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la}
+  sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib64/{libstdc++.la,libsupc++.la}
 }