pool/autogen
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 766045 from home:Andreas_Schwab:Factory

Browse Source 
- guile-version.patch: Allow building with guile 3.0

OBS-URL: https://build.opensuse.org/request/show/766045
OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=70
This commit is contained in:
Andreas Schwab 2020-01-21 11:13:05 +00:00 committed by Git OBS Bridge
parent 1b89611810
commit c7a9349fd9
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autogen.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 21 10:41:18 UTC 2020 - Andreas Schwab <schwab@suse.de>
- guile-version.patch: Allow building with guile 3.0
-------------------------------------------------------------------
Mon Mar 25 08:32:40 UTC 2019 - Martin Liška <mliska@suse.cz>

6
autogen.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package autogen
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -34,6 +34,8 @@ Patch3: installable-programs.patch
Patch4: sprintf-overflow.patch
# PATCH-FIX-UPSTREAM -- https://sourceforge.net/p/autogen/bugs/193/#5844
Patch5: gcc9-fix-wrestrict.patch
# PATCH-FIX-UPSTREAM Allow building with guile 3.0
Patch6: guile-version.patch
BuildRequires: fdupes
BuildRequires: guile-devel
BuildRequires: makeinfo
@ -89,6 +91,8 @@ well.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
touch aclocal.m4 configure Makefile.in config-h.in
%build
%configure \

39
guile-version.patch Normal file
View File

@ -0,0 +1,39 @@
Index: autogen-5.18.16/agen5/guile-iface.h
===================================================================
--- autogen-5.18.16.orig/agen5/guile-iface.h
+++ autogen-5.18.16/agen5/guile-iface.h
@@ -9,7 +9,7 @@
# error AutoGen does not work with this version of Guile
choke me.
-#elif GUILE_VERSION < 203000
+#elif GUILE_VERSION <= 300000
# define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
# define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
# define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
Index: autogen-5.18.16/config/guile.m4
===================================================================
--- autogen-5.18.16.orig/config/guile.m4
+++ autogen-5.18.16/config/guile.m4
@@ -61,7 +61,7 @@
#
AC_DEFUN([GUILE_PKG],
[PKG_PROG_PKG_CONFIG
- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
+ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
Index: autogen-5.18.16/configure
===================================================================
--- autogen-5.18.16.orig/configure
+++ autogen-5.18.16/configure
@@ -14799,7 +14799,7 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
- _guile_versions_to_search="2.2 2.0 1.8"
+ _guile_versions_to_search="3.0 2.2 2.0 1.8"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do