[arch-commits] Commit in gcc6/trunk (PKGBUILD)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Oct 4 16:44:45 UTC 2017
Date: Wednesday, October 4, 2017 @ 16:44:44
Author: svenstaro
Revision: 261548
upgpkg: gcc6 6.4.1-2
Remove gcc6-gcj and clean up package
Modified:
gcc6/trunk/PKGBUILD
----------+
PKGBUILD | 165 ++++++++++++++++++++-----------------------------------------
1 file changed, 56 insertions(+), 109 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-10-04 16:37:24 UTC (rev 261547)
+++ PKGBUILD 2017-10-04 16:44:44 UTC (rev 261548)
@@ -8,23 +8,23 @@
pkgbase=gcc6
_ver=6
-pkgname=('gcc6' 'gcc6-libs' 'gcc6-fortran' 'gcc6-objc' 'gcc6-ada' 'gcc6-go' 'gcc6-gcj')
+pkgname=('gcc6' 'gcc6-libs' 'gcc6-fortran' 'gcc6-objc' 'gcc6-ada' 'gcc6-go')
pkgver=6.4.1
-pkgrel=1
+pkgrel=2
_islver=0.17
_cloogver=0.18.4
-_snapshot=6-20170927
pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
+arch=(i686 x86_64)
+license=(GPL LGPL FDL custom)
url="http://gcc.gnu.org"
-makedepends=('binutils>=2.28' 'libmpc' 'doxygen' 'gcc-ada' 'java-environment-common' 'zip' 'jdk8-openjdk' 'gtk2' 'libart-lgpl' 'libxtst')
+makedepends=(binutils libmpc doxygen gcc-ada git)
checkdepends=('dejagnu' 'inetutils')
options=(!emptydirs)
-source=("http://gcc.skazkaforyou.com/snapshots/LATEST-6/gcc-${_snapshot}.tar.xz"
+_commit=878763634f0a75699559b3c0b90d466954a6510f
+source=(git+https://gcc.gnu.org/git/gcc.git#commit=${_commit}
http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz)
-sha1sums=('cda991c759c02c9f714099036e9338a788bd61f5'
+sha1sums=('SKIP'
'6243384d1b1d4b3043037698485a468a485b111a'
'8f7568ca1873f8d55bb694c8b9b83f7f4c6c1aa5')
@@ -31,7 +31,7 @@
_libdir="/usr/lib/gcc/$CHOST/$pkgver"
prepare() {
- cd "$srcdir"/gcc-${_snapshot}/
+ cd gcc
# Link isl/cloog for in-tree builds
ln -sf ../isl-${_islver} isl
@@ -46,52 +46,46 @@
# hack! - some configure tests for header files using "$CPP $CPPFLAGS"
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
- # Arch uses python version 3 as default python (for gcc6-gcj).
- sed -i '1s+python+python2+' libjava/contrib/aot-compile.in
+ mkdir -p "${srcdir}/gcc-build"
- mkdir -p ${srcdir}/gcc-${_snapshot}/gcc-build
-
}
build() {
+ cd gcc-build
- # Configure and build gcc.
- cd ${srcdir}/gcc-${_snapshot}/gcc-build
-
# using -pipe causes spurious test-suite failures
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
CFLAGS=${CFLAGS/-pipe/}
CXXFLAGS=${CXXFLAGS/-pipe/}
- ../configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++,java \
- --enable-shared \
- --enable-threads=posix \
- --enable-libmpx \
- --with-system-zlib \
- --with-isl \
- --enable-__cxa_atexit \
- --disable-libunwind-exceptions \
- --enable-clocale=gnu \
- --disable-libstdcxx-pch \
- --disable-libssp \
- --enable-gnu-unique-object \
- --enable-linker-build-id \
- --enable-lto \
- --enable-plugin \
- --with-linker-hash-style=gnu \
- --enable-gnu-indirect-function \
- --disable-multilib \
- --disable-werror \
- --enable-checking=release \
- --enable-java-awt=gtk \
- --with-java-home="$JAVA_HOME" \
- --enable-libgcj-multifile \
+ "${srcdir}/gcc/configure" --prefix=/usr \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --with-bugurl=https://bugs.archlinux.org/ \
+ --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+ --enable-shared \
+ --enable-threads=posix \
+ --enable-libmpx \
+ --with-system-zlib \
+ --with-isl \
+ --enable-__cxa_atexit \
+ --disable-libunwind-exceptions \
+ --enable-clocale=gnu \
+ --disable-libstdcxx-pch \
+ --disable-libssp \
+ --enable-gnu-unique-object \
+ --enable-linker-build-id \
+ --enable-lto \
+ --enable-plugin \
+ --with-linker-hash-style=gnu \
+ --enable-gnu-indirect-function \
+ --disable-multilib \
+ --disable-werror \
+ --enable-checking=release \
+ --enable-default-pie \
+ --enable-default-ssp \
--enable-version-specific-runtime-libs \
--program-suffix=-${_ver} \
--build="${CHOST}"
@@ -102,19 +96,19 @@
make -C ${CHOST}/libstdc++-v3/doc doc-man-doxygen
}
-#check() {
-# cd ${srcdir}/gcc-${_snapshot}/gcc-build
-#
-# # increase stack size to prevent test failures
-# # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-# ulimit -s 32768
+check() {
+ cd gcc-build
-# # do not abort on error as some are "expected"
-# make -k check || true
-# ${srcdir}/gcc/contrib/test_summary
-#}
+ # increase stack size to prevent test failures
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+ ulimit -s 32768
+ # do not abort on error as some are "expected"
+ make -k check || true
+ ${srcdir}/gcc/contrib/test_summary
+}
+
package_gcc6-libs() {
pkgdesc="Runtime libraries shipped by GCC"
@@ -121,7 +115,7 @@
depends=('glibc>=2.25')
options=('!emptydirs' '!strip')
- cd ${srcdir}/gcc-${_snapshot}/gcc-build
+ cd gcc-build
make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
rm ${pkgdir}/${_libdir}/libgcc_eh.a
@@ -128,7 +122,6 @@
for lib in libatomic \
libcilkrts \
- libjava \
libgfortran \
libgo \
libgomp \
@@ -163,7 +156,7 @@
rm -rf ${pkgdir}/${_libdir}/libgo*
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/gcc-${_snapshot}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/gcc/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
}
@@ -173,7 +166,7 @@
depends=("gcc6-libs=${pkgver}-${pkgrel}" 'binutils>=2.28' 'libmpc')
options=('staticlibs')
- cd ${srcdir}/gcc-${_snapshot}/gcc-build
+ cd gcc-build
make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \
c++.install-common install-headers install-plugin install-lto-wrapper
@@ -280,7 +273,7 @@
depends=("gcc6=$pkgver-$pkgrel")
options=('!emptydirs')
- cd ${srcdir}/gcc-${_snapshot}/gcc-build
+ cd gcc-build
make -C $CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
install-{toolexeclibDATA,nodist_fincludeHEADERS}
make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
@@ -299,7 +292,7 @@
pkgdesc="Objective-C front-end for GCC"
depends=("gcc6=$pkgver-$pkgrel")
- cd ${srcdir}/gcc-${_snapshot}/gcc-build
+ cd gcc-build
make DESTDIR=$pkgdir -C $CHOST/libobjc install-headers
install -dm755 $pkgdir/${_libdir}
install -m755 gcc/cc1obj $pkgdir/${_libdir}/cc1obj-${_ver}
@@ -316,7 +309,7 @@
depends=("gcc6=$pkgver-$pkgrel")
options=('staticlibs' '!emptydirs')
- cd ${srcdir}/gcc-${_snapshot}/gcc-build/gcc
+ cd gcc-build/gcc
make DESTDIR=$pkgdir ada.install-common
install -m755 gnat1 $pkgdir/${_libdir}/gnat1-${_ver}
@@ -340,7 +333,7 @@
conflicts=('go')
options=('!emptydirs')
- cd ${srcdir}/gcc-${_snapshot}/gcc-build/
+ cd gcc-build/
make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am
rm ${pkgdir}/${_libdir}/libgo.so*
@@ -353,49 +346,3 @@
install -d ${pkgdir}/usr/share/licenses/$pkgname/
ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname/
}
-
-package_gcc6-gcj() {
- pkgdesc="Java front-end for GCC"
- depends=("gcc6=$pkgver-$pkgrel")
- replaces=('gcc-gcj')
- options=('!emptydirs')
-
- # Install libjava.
- cd ${srcdir}/gcc-${_snapshot}/gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libjava
-
- # Install java-common.
- cd gcc
- make -j1 DESTDIR=${pkgdir} java.install-common java.install-man
-
- install -m755 jc1 ${pkgdir}/${_libdir}/
- install -m755 jvgenmain ${pkgdir}/${_libdir}/
-
- # Remove conflicting files.
- rm -f ${pkgdir}/usr/lib/gcc/${CHOST}/lib/libgcc_s.so*
- rm ${pkgdir}/${_libdir}/libg{cj,ij}*.so*
-
- # Rename two files to not conflict to classpath
- mv ${pkgdir}/usr/share/info/cp-tools.info ${pkgdir}/usr/share/info/cp-tools-gcj.info
-
- linkdir=`basename $pkgdir/usr/lib/gcj-${pkgver}*`
- ln -sf $linkdir ${pkgdir}/usr/lib/gcj-${pkgver%.?}
- ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-${pkgver%.?}.jar
- ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj.jar
- ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools-${pkgver%.?}.jar
- ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools.jar
-
- rm ${pkgdir}/${_libdir}/libgcc_eh.a
- rm ${pkgdir}/${_libdir}/crtbegin.o
- rm ${pkgdir}/${_libdir}/crtbeginS.o
- rm ${pkgdir}/${_libdir}/crtbeginT.o
- rm ${pkgdir}/${_libdir}/crtend.o
- rm ${pkgdir}/${_libdir}/crtendS.o
- rm ${pkgdir}/${_libdir}/crtfastmath.o
- rm ${pkgdir}/${_libdir}/crtprec32.o
- rm ${pkgdir}/${_libdir}/crtprec64.o
- rm ${pkgdir}/${_libdir}/crtprec80.o
- rm ${pkgdir}/${_libdir}/include/unwind.h
- rm ${pkgdir}/${_libdir}/libgcc.a
- rm ${pkgdir}/${_libdir}/libgcov.a
-}
More information about the arch-commits
mailing list