upgpkg: gcc6 6.5.0-4

Ran shellcheck and shfmt.

1 files changed, 142 insertions, 144 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bb1168472aea..fe259c1ea042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,11 +21,11 @@ license=(GPL LGPL FDL custom)
 url="https://gcc.gnu.org/gcc-6/"
 makedepends=(binutils libmpc doxygen subversion java-environment-common zip jdk8-openjdk gtk2 libart-lgpl libxtst)
 options=(!emptydirs)
-source=(https://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz
-        https://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2
-        http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz
-	"libsanitizer.patch"
-	)
+source=("https://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz"
+        "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2"
+        "http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz"
+        "libsanitizer.patch"
+)
 sha512sums=('ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac'
             '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94'
             'd35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23'
@@ -36,11 +36,11 @@ _libdir="/usr/lib/gcc/$CHOST/$pkgver"
 prepare() {
   cd gcc-$pkgver
 
-  patch --forward --strip=2 --input=${srcdir}/libsanitizer.patch
+  patch --forward --strip=2 --input="${srcdir}/libsanitizer.patch"
 
   # Link isl/cloog for in-tree builds
-  ln -sf ../isl-${_islver} isl
-  ln -sf ../cloog-${_cloogver} cloog
+  ln -sf "../isl-${_islver}" isl
+  ln -sf "../cloog-${_cloogver}" cloog
 
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -67,45 +67,46 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  "${srcdir}/gcc-$pkgver/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++,fortran,lto,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 \
-      --enable-default-pie \
-      --enable-default-ssp \
-      --enable-version-specific-runtime-libs \
-      --program-suffix=-${_ver} \
-      --build="${CHOST}"
+  "${srcdir}/gcc-$pkgver/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++,fortran,lto,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 \
+    --enable-default-pie \
+    --enable-default-ssp \
+    --enable-version-specific-runtime-libs \
+    --program-suffix=-${_ver} \
+    --build="${CHOST}"
 
   make
 
   # make documentation
-  make -C ${CHOST}/libstdc++-v3/doc doc-man-doxygen
+  make -C "${CHOST}/libstdc++-v3/doc" doc-man-doxygen
 }
 
 package_gcc6-libs() {
@@ -116,41 +117,39 @@ package_gcc6-libs() {
   export LD_PRELOAD=/usr/lib/libstdc++.so
 
   cd gcc-build
-  make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  rm ${pkgdir}/${_libdir}/libgcc_eh.a
-  mv ${pkgdir}/usr/lib/gcc/$CHOST/lib/libgcc_s.so* $pkgdir/$_libdir
+  make -C "$CHOST"/libgcc DESTDIR="${pkgdir}" install-shared
+  rm "${pkgdir}/${_libdir}/libgcc_eh.a"
+  mv "${pkgdir}/usr/lib/gcc/$CHOST/lib/libgcc_s.so*" "$pkgdir/$_libdir"
 
   for lib in libatomic \
-             libcilkrts \
-             libjava \
-             libgfortran \
-             libgomp \
-             libitm \
-             libquadmath \
-             libsanitizer/{a,l,ub}san \
-             libstdc++-v3/src \
-             libvtv
-  do
-    make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+    libcilkrts \
+    libjava \
+    libgfortran \
+    libgomp \
+    libitm \
+    libquadmath \
+    libsanitizer/{a,l,ub}san \
+    libstdc++-v3/src \
+    libvtv; do
+    make -C "$CHOST/$lib" DESTDIR="${pkgdir}" install-toolexeclibLTLIBRARIES
   done
 
-  make -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+  make -C "$CHOST"/libsanitizer/tsan DESTDIR="${pkgdir}" install-toolexeclibLTLIBRARIES
 
-  make -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -C $CHOST/libmpx DESTDIR=${pkgdir} install
-  rm ${pkgdir}/${_libdir}/libmpx.spec
+  make -C "$CHOST"/libstdc++-v3/po DESTDIR="${pkgdir}" install
+  make -C "$CHOST"/libmpx DESTDIR="${pkgdir}" install
+  rm "${pkgdir}/${_libdir}/libmpx.spec"
 
-  for lib in libgomp libitm libquadmath
-  do
-    make -C $CHOST/$lib DESTDIR=${pkgdir} install-info
+  for lib in libgomp libitm libquadmath; do
+    make -C "$CHOST/$lib" DESTDIR="${pkgdir}" install-info
   done
 
   # Lazy way of dealing with conflicting files...
-  rm -rf ${pkgdir}/usr/share/{info,locale,man}
+  rm -rf "${pkgdir}/usr/share/{info,locale,man}"
 
   # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/gcc-$pkgver/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
+  install -Dm644 "${srcdir}/gcc-$pkgver/COPYING.RUNTIME" \
+    "${pkgdir}/usr/share/licenses/$pkgbase/RUNTIME.LIBRARY.EXCEPTION"
 }
 
 package_gcc6() {
@@ -162,57 +161,56 @@ package_gcc6() {
 
   cd gcc-build
 
-  make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \
+  make -C gcc DESTDIR="${pkgdir}" install-driver install-cpp install-gcc-ar \
     c++.install-common install-headers install-plugin install-lto-wrapper
 
-  for _i in gcov gcov-dump gcov-tool collect2 collect-ld lto1
-  do
-    install -Dm755 gcc/$_i $pkgdir/usr/bin/${_i}-${_ver}
+  for _i in gcov gcov-dump gcov-tool collect2 collect-ld lto1; do
+    install -Dm755 "gcc/$_i" "$pkgdir/usr/bin/${_i}-${_ver}"
   done
 
-  make -C $CHOST/libgcc DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/lib/gcc/${CHOST}/lib*
+  make -C "$CHOST"/libgcc DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}/usr/lib/gcc/${CHOST}/lib*"
 
-  make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
-  make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
-  make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install
-  make -C $CHOST/libstdc++-v3/python DESTDIR=${pkgdir} install
+  make -C "$CHOST"/libstdc++-v3/src DESTDIR="${pkgdir}" install
+  make -C "$CHOST"/libstdc++-v3/include DESTDIR="${pkgdir}" install
+  make -C "$CHOST"/libstdc++-v3/libsupc++ DESTDIR="${pkgdir}" install
+  make -C "$CHOST"/libstdc++-v3/python DESTDIR="${pkgdir}" install
 
-  make DESTDIR=${pkgdir} install-libcc1
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  #mv ${pkgdir}/${_libdir}/libstdc++.so.6.*-gdb.py \
-  #  ${pkgdir}/usr/share/gdb/auto-load/{_libdir}/
-  rm ${pkgdir}/${_libdir}/libstdc++.so*
+  make DESTDIR="${pkgdir}" install-libcc1
+  install -d "$pkgdir"/usr/share/gdb/auto-load/usr/lib
+  #mv "${pkgdir}/${_libdir}/libstdc++.so.6.*-gdb.py" \
+  #  "${pkgdir}/usr/share/gdb/auto-load/{_libdir}/"
+  rm "${pkgdir}/${_libdir}/libstdc++.so*"
 
-  make DESTDIR=${pkgdir} install-fixincludes
-  make -C gcc DESTDIR=${pkgdir} install-mkheaders
+  make DESTDIR="${pkgdir}" install-fixincludes
+  make -C gcc DESTDIR="${pkgdir}" install-mkheaders
 
-  make -C lto-plugin DESTDIR=${pkgdir} install
-  install -dm755 ${pkgdir}/usr/lib/bfd-plugins/
-  ln -s ${_libdir}/liblto_plugin.so ${pkgdir}/usr/lib/bfd-plugins/
+  make -C lto-plugin DESTDIR="${pkgdir}" install
+  install -dm755 "${pkgdir}"/usr/lib/bfd-plugins/
+  ln -s "${_libdir}/liblto_plugin.so" "${pkgdir}/usr/lib/bfd-plugins/"
 
-  make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+  make -C "$CHOST"/libcilkrts DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS \
     install-nodist_cilkincludeHEADERS
-  make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+  make -C "$CHOST"/libgomp DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS \
     install-nodist_libsubincludeHEADERS
-  make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
-  make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
-  make -C $CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_{saninclude,toolexeclib}HEADERS
-  make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
-  make -C $CHOST/libmpx DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+  make -C "$CHOST"/libitm DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
+  make -C "$CHOST"/libquadmath DESTDIR="${pkgdir}" install-nodist_libsubincludeHEADERS
+  make -C "$CHOST"/libsanitizer DESTDIR="${pkgdir}" install-nodist_{saninclude,toolexeclib}HEADERS
+  make -C "$CHOST"/libsanitizer/asan DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
+  make -C "$CHOST"/libmpx DESTDIR="${pkgdir}" install-nodist_toolexeclibHEADERS
 
-  make -C gcc DESTDIR=${pkgdir} install-man install-info
-  rm ${pkgdir}/usr/share/man/man1/gfortran-${_ver}.1
-  rm ${pkgdir}/usr/share/info/gfortran.info
+  make -C gcc DESTDIR="${pkgdir}" install-man install-info
+  rm "${pkgdir}/usr/share/man/man1/gfortran-${_ver}.1"
+  rm "${pkgdir}/usr/share/info/gfortran.info"
 
-  make -C libcpp DESTDIR=${pkgdir} install
-  make -C gcc DESTDIR=${pkgdir} install-po
+  make -C libcpp DESTDIR="${pkgdir}" install
+  make -C gcc DESTDIR="${pkgdir}" install-po
 
   # many packages expect this symlink
-  ln -s gcc-${_ver} ${pkgdir}/usr/bin/cc-${_ver}
+  ln -s "gcc-${_ver}" "${pkgdir}/usr/bin/cc-${_ver}"
 
   # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89-${_ver} <<"EOF"
+  cat > "$pkgdir/usr/bin/c89-${_ver}" << "EOF"
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -225,7 +223,7 @@ done
 exec gcc-${_ver} $fl ${1+"$@"}
 EOF
 
-  cat > $pkgdir/usr/bin/c99-${_ver} <<"EOF"
+  cat > "$pkgdir/usr/bin/c99-${_ver}" << "EOF"
 #!/bin/sh
 fl="-std=c99"
 for opt; do
@@ -238,22 +236,22 @@ done
 exec gcc-${_ver} $fl ${1+"$@"}
 EOF
 
-  chmod 755 $pkgdir/usr/bin/c{8,9}9-${_ver}
+  chmod 755 "$pkgdir/usr/bin/c{8,9}9-${_ver}"
 
   # Install Runtime Library Exception
-  install -d ${pkgdir}/usr/share/licenses/$pkgname/
-  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname
+  install -d "${pkgdir}/usr/share/licenses/$pkgbase/"
+  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION "${pkgdir}/usr/share/licenses/$pkgbase"
 
   # Lazy way of dealing with conflicting files...
-  rm -rf ${pkgdir}/usr/share/{info,locale,man}
+  rm -rf "${pkgdir}/usr/share/{info,locale,man}"
 
   # Move potentially conflicting stuff to version specific subdirectory
   #[[ -d ${pkgdir}/usr/lib/gcc/${CHOST}/lib/ ]] && mv ${pkgdir}/usr/lib/gcc/${CHOST}/lib/lib* \
   #               ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/
-  mv $pkgdir/usr/lib/bfd-plugins/liblto_plugin.so ${pkgdir}/usr/lib/bfd-plugins/liblto_plugin-${_ver}.so
-  mv ${pkgdir}/usr/lib/*.so* ${pkgdir}/${_libdir}/
-  install -Dm755 gcc/cc1     ${pkgdir}/${_libdir}/cc1
-  install -Dm755 gcc/cc1plus ${pkgdir}/${_libdir}/cc1plus
+  mv "$pkgdir/usr/lib/bfd-plugins/liblto_plugin.so" "${pkgdir}/usr/lib/bfd-plugins/liblto_plugin-${_ver}.so"
+  mv "${pkgdir}/usr/lib/*.so*" "${pkgdir}/${_libdir}/"
+  install -Dm755 gcc/cc1 "${pkgdir}/${_libdir}/cc1"
+  install -Dm755 gcc/cc1plus "${pkgdir}/${_libdir}/cc1plus"
 }
 
 package_gcc6-fortran() {
@@ -264,17 +262,17 @@ package_gcc6-fortran() {
   export LD_PRELOAD=/usr/lib/libstdc++.so
 
   cd gcc-build
-  make -C $CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
+  make -C "$CHOST/libgfortran" DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
     install-{toolexeclibDATA,nodist_fincludeHEADERS}
-  make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -C gcc DESTDIR=$pkgdir fortran.install-common
-  install -Dm755 gcc/f951 $pkgdir/${_libdir}/f951
+  make -C "$CHOST/libgomp" DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
+  make -C gcc DESTDIR="$pkgdir" fortran.install-common
+  install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
 
-  ln -s gfortran-6 ${pkgdir}/usr/bin/f95-${_ver}
+  ln -s gfortran-6 "${pkgdir}/usr/bin/f95-${_ver}"
 
   # Install Runtime Library Exception
-  install -d ${pkgdir}/usr/share/licenses/$pkgname
-  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/$pkgname/
+  install -d "${pkgdir}/usr/share/licenses/$pkgbase"
+  ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION "${pkgdir}/usr/share/licenses/$pkgbase/"
 }
 
 package_gcc6-gcj() {
@@ -287,39 +285,39 @@ package_gcc6-gcj() {
 
   # Install libjava.
   cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libjava
+  make -j1 DESTDIR="${pkgdir}" install-target-libjava
 
   # Install java-common.
   cd gcc
-  make -j1 DESTDIR=${pkgdir} java.install-common java.install-man
+  make -j1 DESTDIR="${pkgdir}" java.install-common java.install-man
 
-  install -m755 jc1       ${pkgdir}/${_libdir}/
-  install -m755 jvgenmain ${pkgdir}/${_libdir}/
+  install -m755 jc1 "${pkgdir}/${_libdir}/"
+  install -m755 jvgenmain "${pkgdir}/${_libdir}/"
 
   # Remove conflicting files.
-  rm ${pkgdir}/${_libdir}/libg{cj,ij}*.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
+  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"
 }