Move gdbinit from gdb to gcc (#2354)

It prints an error when GCC is not installed.

Fixes #1729
This commit is contained in:
Orgad Shaneh
2017-04-04 07:02:06 +03:00
committed by Алексей
parent 024cf764bb
commit f6628a0f2e
3 changed files with 6 additions and 7 deletions

View File

@@ -35,6 +35,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-${_realname}"
optdepends=()
options=('staticlibs' '!emptydirs') # '!strip' 'debug')
source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.bz2"
"gdbinit"
"0001-gcc-5-branch-gfortran-incorrect-reading-of-values-fr.patch"
"0002-Relocate-libintl.patch"
"0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch"
@@ -56,6 +57,7 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver}/${_realname}-${pkgve
"0100-gcc-4.8-libstdc++export.patch"
"0110-gcc-4.7-stdthreads.patch")
sha256sums=('f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f'
'SKIP'
'49a5e264e611de7f2388f01ba649ec22cf3ae1cde3ba45082a7d72294c2f4fd7'
'83e9c6f76f728ae3e2f2eabb588b0d6cea7a3eda03cd5e77aed9d613143b7348'
'6033acda690786397059536787a6577e1a9f2b39f8a66276821917066094f43c'
@@ -314,6 +316,10 @@ package_mingw-w64-gcc() {
cp share/man/man7/gfdl.7* ${pkgdir}${MINGW_PREFIX}/share/man/man1/
cp share/man/man7/gpl.7* ${pkgdir}${MINGW_PREFIX}/share/man/man1/
cp share/man/man1/g++.1* ${pkgdir}${MINGW_PREFIX}/share/man/man1/
# install "custom" system gdbinit
install -D -m644 ${srcdir}/gdbinit ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
sed -i 's|%GCC_NAME%|gcc-'${pkgver}'|g' ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
}
package_mingw-w64-gcc-libgfortran() {

View File

@@ -2,7 +2,6 @@
# Contributor: Ray Donnelly <mingw.android@gmail.com>
_realname=gdb
_gcc_ver=6.3.0
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
# Until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62279 is
@@ -24,7 +23,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-iconv"
"${MINGW_PACKAGE_PREFIX}-xz")
options=('staticlibs' '!distcc' '!ccache')
source=(https://ftp.gnu.org/gnu/gdb/${_realname}-${pkgver}.tar.xz{,.sig}
'gdbinit'
'gdb-fix-display-tabs-on-mingw.patch'
#'gdb-mingw-gcc-4.7.patch'
'gdb-7.8.1-mingw-gcc-4.7.patch'
@@ -34,7 +32,6 @@ source=(https://ftp.gnu.org/gnu/gdb/${_realname}-${pkgver}.tar.xz{,.sig}
'gdb-7.12-readline-mingw.patch'
'gdb-7.12-dynamic-libs.patch')
sha256sums=('4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186'
'SKIP'
'dea2bbad4967280910559c6a11b865aeec19cab34647fb5894cb498b24b14462'
'a3e64bf3acc8e92016d493aa1e2fbb5b55c67bfce4359b3578d7a6b5e5d5692a'
'225608a1e486ee98641611804b07209915367c6767a735ae928175ad45b93060'
@@ -100,10 +97,6 @@ package() {
# Remove unwanted files
rm -rf ${pkgdir}${MINGW_PREFIX}/share/{man,info}
# install "custom" system gdbinit
install -D -m644 ${srcdir}/gdbinit ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
sed -i 's|%GCC_NAME%|gcc-'${_gcc_ver}'|g' ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
rm -f ${pkgdir}${MINGW_PREFIX}/include/*.h
rm -f ${pkgdir}${MINGW_PREFIX}/lib/*.a
}