X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=gcc%2FPkgfile;h=8bddd4719008049f07d94906b874024da53de55e;hb=a07eae877ba6ad2572912730950a7778a5517f67;hp=a5bf931c84189e80573dab91c38df5f6204d4ee9;hpb=ecd7d154bca2ba8fd6474c2282f19b36070d544f;p=crossrootfs.git diff --git a/gcc/Pkgfile b/gcc/Pkgfile index a5bf931..8bddd47 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -5,18 +5,16 @@ # Depends on: zlib libmpc name=gcc -version=5.2.0 -release=2 +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) build() { + patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.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 + 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 @@ -37,16 +35,22 @@ 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 + # 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,9 +60,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.21-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} }