This commit is contained in:
parent
72c3cf355c
commit
586c52ad5e
12
guile-1.6.10-mktemp.patch
Normal file
12
guile-1.6.10-mktemp.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- libguile/guile-snarf.in
|
||||||
|
+++ libguile/guile-snarf.in
|
||||||
|
@@ -71,8 +71,7 @@
|
||||||
|
cpp_ok_p=false
|
||||||
|
|
||||||
|
if [ x"$TMPDIR" = x ]; then TMPDIR="/tmp" ; else : ; fi
|
||||||
|
-tempdir="$TMPDIR/guile-snarf.$$"
|
||||||
|
-(umask 077 && mkdir $tempdir) || exit 1
|
||||||
|
+tempdir=$(mktemp -d -q "$TMPDIR/snarf.XXXXXX") || { echo >&2 "guile-snarf: can not create temporary file"; exit 1; }
|
||||||
|
temp="$tempdir/tmp"
|
||||||
|
|
||||||
|
if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
|
@ -1,12 +0,0 @@
|
|||||||
--- libguile/guile-snarf.in
|
|
||||||
+++ libguile/guile-snarf.in
|
|
||||||
@@ -69,8 +69,7 @@
|
|
||||||
|
|
||||||
# set vars and handler -- handle CPP override
|
|
||||||
cpp_ok_p=false
|
|
||||||
-tempdir="/tmp/snarf.$$"
|
|
||||||
-(umask 077 && mkdir $tempdir) || exit 1
|
|
||||||
+tempdir=$(mktemp -d -q "/tmp/snarf.XXXXXX") || { echo >&2 "guile-snarf: can not create temporary file"; exit 1; }
|
|
||||||
temp="$tempdir/tmp"
|
|
||||||
if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:afa7dac9c51a7661e871cb4434043bc062955b6ea09c2d55b33a8ed751b776c4
|
|
||||||
size 3031678
|
|
3
guile-1.8.4.tar.bz2
Normal file
3
guile-1.8.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6dfeaeccd4e67ea30b0fd215b5b4e915444661d1a4304fcf9bb6da43d4dc2991
|
||||||
|
size 2970291
|
@ -1,13 +0,0 @@
|
|||||||
--- libguile/guile.c
|
|
||||||
+++ libguile/guile.c
|
|
||||||
@@ -37,6 +37,10 @@
|
|
||||||
#include <ltdl.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_WINSOCK2_H
|
|
||||||
+#define lt_dlhandle_struct scm_i_lt_dlhandle_struct
|
|
||||||
+#define SCM_INSERTED_DLSYMLIST_STRUCT_DECL scm_i_lt_dlsymlist_struct
|
|
||||||
+#define SCMLTXT static
|
|
||||||
+#include "raw-ltdl.h"
|
|
||||||
#include <winsock2.h>
|
|
||||||
#endif
|
|
||||||
|
|
47
guile-gnuc_inline.patch
Normal file
47
guile-gnuc_inline.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
--- libguile/inline.h
|
||||||
|
+++ libguile/inline.h
|
||||||
|
@@ -58,7 +58,7 @@
|
||||||
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
||||||
|
/* definitely inlining */
|
||||||
|
#ifdef __GNUC__
|
||||||
|
-extern
|
||||||
|
+extern __attribute__((gnu_inline))
|
||||||
|
#else
|
||||||
|
static
|
||||||
|
#endif
|
||||||
|
@@ -134,7 +134,7 @@
|
||||||
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
||||||
|
/* definitely inlining */
|
||||||
|
#ifdef __GNUC__
|
||||||
|
-extern
|
||||||
|
+extern __attribute__((gnu_inline))
|
||||||
|
#else
|
||||||
|
static
|
||||||
|
#endif
|
||||||
|
@@ -209,7 +209,7 @@
|
||||||
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
||||||
|
/* definitely inlining */
|
||||||
|
#ifdef __GNUC__
|
||||||
|
-extern
|
||||||
|
+extern __attribute__((gnu_inline))
|
||||||
|
#else
|
||||||
|
static
|
||||||
|
#endif
|
||||||
|
@@ -224,7 +224,7 @@
|
||||||
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
||||||
|
/* definitely inlining */
|
||||||
|
#ifdef __GNUC__
|
||||||
|
-extern
|
||||||
|
+extern __attribute__((gnu_inline))
|
||||||
|
#else
|
||||||
|
static
|
||||||
|
#endif
|
||||||
|
@@ -239,7 +239,7 @@
|
||||||
|
#if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
|
||||||
|
/* definitely inlining */
|
||||||
|
#ifdef __GNUC__
|
||||||
|
-extern
|
||||||
|
+extern __attribute__((gnu_inline))
|
||||||
|
#else
|
||||||
|
static
|
||||||
|
#endif
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 28 13:48:12 CET 2008 - ro@suse.de
|
||||||
|
|
||||||
|
- update to 1.8.4:
|
||||||
|
* New modules (srfi srfi-69)
|
||||||
|
* Bug fixes
|
||||||
|
- fix code for recent gcc by checking for __GNUC_GNU_INLINE__
|
||||||
|
instead of __GNUC__ for inline specifics (thanks, richi)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Feb 4 11:34:00 CET 2008 - pgajdos@suse.cz
|
Mon Feb 4 11:34:00 CET 2008 - pgajdos@suse.cz
|
||||||
|
|
||||||
|
19
guile.spec
19
guile.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package guile (Version 1.8.3)
|
# spec file for package guile (Version 1.8.4)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -10,20 +10,21 @@
|
|||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
Name: guile
|
Name: guile
|
||||||
BuildRequires: gmp-devel readline-devel
|
BuildRequires: gmp-devel readline-devel
|
||||||
License: LGPL v2.1 or later
|
License: LGPL v2.1 or later
|
||||||
Group: Development/Languages/Scheme
|
Group: Development/Languages/Scheme
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 1.8.3
|
Version: 1.8.4
|
||||||
Release: 10
|
Release: 1
|
||||||
%define GUILEVERSION 1.8
|
%define GUILEVERSION 1.8
|
||||||
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
||||||
Url: http://www.gnu.org/software/guile/
|
Url: http://www.gnu.org/software/guile/
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Patch1: %{name}-64bit.patch
|
Patch1: %{name}-64bit.patch
|
||||||
Patch2: %{name}-1.6.8-mktemp.patch
|
Patch2: %{name}-1.6.10-mktemp.patch
|
||||||
Patch3: guile-gcc4.patch
|
Patch3: guile-gnuc_inline.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
PreReq: fileutils sh-utils
|
PreReq: fileutils sh-utils
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
@ -80,7 +81,7 @@ Authors:
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
#%patch3
|
%patch3
|
||||||
# guile-1.8.1: The code is not so good for -Werror (unused results of write()).
|
# guile-1.8.1: The code is not so good for -Werror (unused results of write()).
|
||||||
sed -i s/-Werror// configure.in configure
|
sed -i s/-Werror// configure.in configure
|
||||||
|
|
||||||
@ -152,6 +153,12 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
|
|||||||
%{_libdir}/libguile*.a
|
%{_libdir}/libguile*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 28 2008 ro@suse.de
|
||||||
|
- update to 1.8.4:
|
||||||
|
* New modules (srfi srfi-69)
|
||||||
|
* Bug fixes
|
||||||
|
- fix code for recent gcc by checking for __GNUC_GNU_INLINE__
|
||||||
|
instead of __GNUC__ for inline specifics (thanks, richi)
|
||||||
* Mon Feb 04 2008 pgajdos@suse.cz
|
* Mon Feb 04 2008 pgajdos@suse.cz
|
||||||
- guile conflicts with slib < 3a5 [#354936]
|
- guile conflicts with slib < 3a5 [#354936]
|
||||||
* Wed Dec 12 2007 pgajdos@suse.cz
|
* Wed Dec 12 2007 pgajdos@suse.cz
|
||||||
|
Loading…
Reference in New Issue
Block a user