#3 Revert "Disable temporarily guile support"
Closed 2 years ago by sergiodj. Opened 2 years ago by defolos.
rpms/ defolos/gdb master  into  master

file modified
+11 -3
@@ -35,7 +35,7 @@ 

  

  # The release always contains a leading reserved number, start it at 1.

  # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.

- Release: 2%{?dist}

+ Release: 3%{?dist}

  

  License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL

  # Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -241,7 +241,7 @@ 

  BuildRequires: /usr/bin/pod2man

  %if 0%{!?rhel:1} || 0%{?rhel} > 7

  BuildRequires: libbabeltrace-devel%{buildisa}

- #BuildRequires: guile-devel%{buildisa}

+ BuildRequires: guile-devel%{buildisa}

  %endif

  %global have_libipt 0

  %if 0%{!?rhel:1} || 0%{?rhel} > 7 || (0%{?rhel} == 7 && 0%{?scl:1})
@@ -541,7 +541,6 @@ 

  	--disable-rpath						\

  	--without-stage1-ldflags				\

  	--disable-libmcheck					\

- 	--without-guile						\

  %if 0%{!?rhel:1} || 0%{?rhel} > 6

  	--with-system-readline					\

  %else
@@ -584,6 +583,7 @@ 

      --without-expat \

      --disable-tui \

      --without-python \

+     --without-guile \

      --disable-inprocess-agent \

      --without-intel-pt \

      --disable-unit-tests \
@@ -690,6 +690,11 @@ 

  %else

  	--without-python					\

  %endif

+ %if 0%{!?rhel:1} || 0%{?rhel} > 7

+ 	--with-guile						\

+ %else

+ 	--without-guile						\

+ %endif

  %if %{have_inproctrace}

  	--enable-inprocess-agent				\

  %else
@@ -1146,6 +1151,9 @@ 

  %endif

  

  %changelog

+ * Tue Jan 14 2020 Dan Čermák <dan.cermak@cgc-instruments.com> - 8.3.50.20190824-27

+ - Re-enable guile support

+ 

  * Tue Nov 19 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 9.0.50.20191119-2

  - Rebase to FSF GDB 9.0.50.20191119 (9.1pre).

  - Drop 'gdb-readline62-ask-more-rh.patch'.

This reverts commit 9404c96 and re-enables guile support in Rawhide.

@sergiodj Should I incorporate the changes from #5 into this PR as well?

@sergiodj Should I incorporate the changes from #5 into this PR as well?

Yes, please :-).

Yes, please :-).

Done!

rebased onto 23e9d2b

2 years ago

I manually applied the patch (giving proper authorship to @defolos), so I'm closing this PR.

Thanks for the patch.

Pull-Request has been closed by sergiodj

2 years ago