From 84a94f743e01363ff0469a7b560aa87b6e6ba93b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 24 Oct 2018 16:20:05 -0500 Subject: rtems-gdb-8.0.1-1.cfg: Add Cygwin patch for ncurses not termcap This also updates windows.py to distinguish betweem MSYS2 and Cygwin. closes #3576. --- rtems/config/tools/rtems-gdb-8.0.1-1.cfg | 10 ++++++++++ source-builder/sb/windows.py | 1 + 2 files changed, 11 insertions(+) diff --git a/rtems/config/tools/rtems-gdb-8.0.1-1.cfg b/rtems/config/tools/rtems-gdb-8.0.1-1.cfg index 14a0725..51eafef 100644 --- a/rtems/config/tools/rtems-gdb-8.0.1-1.cfg +++ b/rtems/config/tools/rtems-gdb-8.0.1-1.cfg @@ -12,4 +12,14 @@ %patch add gdb https://devel.rtems.org/raw-attachment/ticket/3460/gdb-8.0.1-sis-leon2-leon3.diff %hash sha512 gdb-8.0.1-sis-leon2-leon3.diff a16859b5badbce8ecbc9259553b2abe7e93b4fb8ab899e18e8ddb294a1433f49df8ddee418bb6ab55dc2402e5ad6aca6274fb9e8b53278574f269a555fdeddcf + %ifos win32 + %if %{_windows_os} == cygwin +- %patch add gdb --rsb-file=PATCH_Cygwin_has_ncurses_not_termcap https://sourceware.org/cgi-bin/get-raw-msg?listname=gdb-patches&date=2018-10&msgid=1540415244-4879-1-git-send-email-joel%40rtems.org +- %sha512sum PATCH_Cygwin_has_ncurses_not_termcap 941cba591de89cac1d74cf9c5ca787d23eeef198f621d211e87329131b831fdd108b78114e75952c113872a2117b598596a51dacefa87e1a37dfa7e9c58c14d1 ++ %patch add gdb https://devel.rtems.org/raw-attachment/ticket/3576/gdb-8.0.1-sis-cygwin.diff ++ %hash sha512 gdb-8.0.1-sis-cygwin.diff a54457ad8b67cb172e3c6e6a141805b912e50e10bc8bd29babbaa530e39e0a6e0809c3749e59057ecb0fb4bb63a28b2bf6de7276d937cf6d0ecc831b3b317b69 + %endif + %endif + + %include %{_configdir}/gdb-8-1.cfg diff --git a/source-builder/sb/windows.py b/source-builder/sb/windows.py index 983ba12..0f93b6c 100644 --- a/source-builder/sb/windows.py +++ b/source-builder/sb/windows.py @@ -78,6 +78,7 @@ def load(): defines = { '_ncpus': ('none', 'none', ncpus), '_os': ('none', 'none', 'win32'), + '_windows_os': ('none', 'none', uname), '_build': ('triplet', 'required', build_triple), '_build_vendor': ('none', 'none', 'microsoft'), '_build_os': ('none', 'none', 'win32'), -- cgit v1.2.3