cygwin-gdb 7.9.1

3 files changed, 78 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d66b1e3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gdb-7.9.1.tar.xz
diff --git a/cygwin-gdb.spec b/cygwin-gdb.spec
index 1bbe987..9d1ba5f 100644
--- a/cygwin-gdb.spec
+++ b/cygwin-gdb.spec
@@ -1,64 +1,105 @@
-%define cygv 7.5.50-1
-
 Name:           cygwin-gdb
-Version:        7.5.50
+Version:        7.9.1
 Release:        1%{?dist}
 Summary:        Cygwin GNU debugger
 
 License:        GPLv3+
 Group:          Development/Utilities
 URL:            http://www.gnu.org/software/gdb/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:        ftp://sourceware.org/pub/cygwin/release/gdb/gdb-%{cygv}-src.tar.bz2
+Source0:        ftp://sourceware.org/pub/gdb/releases/gdb-%{version}.tar.xz
 
 BuildRequires:  expat-devel
 BuildRequires:  ncurses-devel
+%if 0%{!?rhel:1} || 0%{?rhel} > 7
+BuildRequires:  python3-devel
+%else
 BuildRequires:  python-devel
+%endif
+%if 0%{!?rhel:1} || 0%{?rhel} > 6
+BuildRequires:  xz-devel
+%endif
 BuildRequires:  zlib-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  texinfo
-BuildRequires:  cygwin-filesystem
+BuildRequires:  cygwin32-filesystem
+BuildRequires:  cygwin64-filesystem
 
+%description
+GNU debugger which understands Cygwin PE executables and DLLs,
+using a gdbserver(1) instance on a Cygwin machine to run the executable.
+
+%package -n cygwin32-gdb
+Summary:        GNU Debugger for Cygwin 32bit toolchain
 # NB: This must be left in.
-Requires:       cygwin-filesystem
+Requires:       cygwin32-filesystem
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
 
+%description -n cygwin32-gdb
+GNU debugger which understands Cygwin 32bit PE executables and DLLs,
+using a gdbserver(1) instance on a Cygwin machine to run the executable.
 
-%description
-GNU debugger which understands Cygwin PE executables and DLLs,
+%package -n cygwin64-gdb
+Summary:        GNU Debugger for Cygwin 64bit toolchain
+# NB: This must be left in.
+Requires:       cygwin64-filesystem
+
+%description -n cygwin64-gdb
+GNU debugger which understands Cygwin 64bit PE executables and DLLs,
 using a gdbserver(1) instance on a Cygwin machine to run the executable.
 
 
 %prep
-%setup -q -n gdb-%{cygv}
+%setup -q -n gdb-%{version}
 
 
 %build
-mkdir -p build
-cd build
+mkdir -p build_cyg32
+pushd build_cyg32
 CFLAGS="$RPM_OPT_FLAGS -DLINKER_SYMBOLS_HAVE_WIN32_STDCALL_ARG_SIZES=1" \
 ../configure \
   --build=%_build --host=%_host \
-  --target=%{_cygwin_target} \
+  --target=%{cygwin32_target} \
   --verbose --disable-nls \
   --without-included-gettext \
   --disable-win32-registry \
   --disable-werror \
-  --with-sysroot=%{_cygwin_sysroot} \
+  --with-sysroot=%{cygwin32_sysroot} \
   --prefix=%{_prefix} --bindir=%{_bindir} \
   --includedir=%{_includedir} --libdir=%{_libdir} \
   --mandir=%{_mandir} --infodir=%{_infodir} \
-  --with-gdb-datadir=%{_datadir}/gdb/%{_cygwin_target}
+  --with-gdb-datadir=%{_datadir}/gdb/%{cygwin32_target}
 
 make all
+popd
+
+mkdir -p build_cyg64
+pushd build_cyg64
+CFLAGS="$RPM_OPT_FLAGS" \
+../configure \
+  --build=%_build --host=%_host \
+  --target=%{cygwin64_target} \
+  --verbose --disable-nls \
+  --without-included-gettext \
+  --disable-win32-registry \
+  --disable-werror \
+  --with-sysroot=%{cygwin64_sysroot} \
+  --prefix=%{_prefix} --bindir=%{_bindir} \
+  --includedir=%{_includedir} --libdir=%{_libdir} \
+  --mandir=%{_mandir} --infodir=%{_infodir} \
+  --with-gdb-datadir=%{_datadir}/gdb/%{cygwin64_target}
 
+make %{?_smp_flags}
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-cd build
+pushd build_cyg32
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+pushd build_cyg64
 make DESTDIR=$RPM_BUILD_ROOT install
+popd
 
 # This file conflicts with ordinary binutils.
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
@@ -66,21 +107,29 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 # These files conflict with ordinary gdb.
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
+# gdbserver is not installed in this configuration
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*gdbserver*
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%files -n cygwin32-gdb
+%doc COPYING3 COPYING3.LIB COPYING COPYING.LIB README
+%{_bindir}/%{cygwin32_target}-gdb
+%{_datadir}/gdb/%{cygwin32_target}/
+%{_mandir}/man1/%{cygwin32_target}-gdb.1*
+%{_mandir}/man5/%{cygwin32_target}-gdbinit.5*
 
-%files
-%defattr(-,root,root,-)
+%files -n cygwin64-gdb
 %doc COPYING3 COPYING3.LIB COPYING COPYING.LIB README
-%{_bindir}/i686-pc-cygwin-*
-%{_datadir}/gdb/i686-pc-cygwin/
-%{_mandir}/man1/i686-pc-cygwin-*
+%{_bindir}/%{cygwin64_target}-gdb
+%{_datadir}/gdb/%{cygwin64_target}/
+%{_mandir}/man1/%{cygwin64_target}-gdb.1*
+%{_mandir}/man5/%{cygwin64_target}-gdbinit.5*
 
 
 %changelog
+* Thu Aug 20 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 7.9.1-1
+- New version with split support for Cygwin 32- and 64-bit toolchains
+
 * Tue Sep 04 2012 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 7.5.50-1
 - Version bump to match Cygwin distro.
 
diff --git a/sources b/sources
index b9b9b82..c93b64d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b74c6ddfae6ab77ba6aaee5dfb4bc5d  gdb-7.5.50-1-src.tar.bz2
+35374c77a70884eb430c97061053a36e  gdb-7.9.1.tar.xz