autu: Update to 4.5.4-3 Improved include fix

2 files changed, 7 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4950594cb9ae..f0e940e931a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Jan 18 05:23:46 UTC 2019
+# Fri Jan 18 06:15:22 UTC 2019
 pkgbase = gcc45
 	pkgdesc = The GNU Compiler Collection (4.5.x)
 	pkgver = 4.5.4
diff --git a/PKGBUILD b/PKGBUILD
index 4cab9f5d671f..1ba2fcf61b6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -101,6 +101,7 @@ build() {
       --enable-clocale='gnu' \
       --enable-languages='c,c++,fortran,objc,obj-c++' \
       --enable-shared \
+      --enable-version-specific-runtime-libs \
       --infodir='/usr/share/info' \
       --libdir='/usr/lib' \
       --libexecdir='/usr/lib' \
@@ -129,16 +130,13 @@ package() {
   make -j1 DESTDIR="${pkgdir}" install
 
   ## Lazy way of dealing with conflicting man and info pages and locales...
-  rm -r "${pkgdir}/usr/share/" # include is needed for g++ compiles
-  #find "${pkgdir}/" -name '*iberty*' -exec rm '{}' '+'
+  rm -rf "${pkgdir}/usr/share/man/man7"
+  rm -rf "${pkgdir}/usr/share/locale"
+  rmdir "${pkgdir}/usr/include" "${pkgdir}/usr/share/info"
 
-  # Move potentially conflicting stuff to version specific subdirectory
-  #case "${CARCH}" in
-  #'x86_64') mv "${pkgdir}/usr/lib/gcc/${CHOST}"/lib*/ "${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/" ;;
-  #esac
-  mv "${pkgdir}/usr/lib"/lib* "${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/"
+  mv "${pkgdir}/usr/lib/gcc/${CHOST}"/lib* "${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/"
 
-  # Create links for gcc- build environment (useful for CUDA)
+  # Create links for gcc build environment (useful for CUDA)
   mkdir -p "${pkgdir}/opt/gcc-${_pkgver}"
   ln -s "/usr/bin/gcc-${_pkgver}" "${pkgdir}/opt/gcc-${_pkgver}/gcc"
   ln -s "/usr/bin/g++-${_pkgver}" "${pkgdir}/opt/gcc-${_pkgver}/g++"