Hi,

Attached is the diff for my guile-1.8 1.8.4+1-2.1 NMU.

I tested compilation with gcc 4.3 as well as compilation of g-wrap and
gnutls26 with the resulting packages.  All seems to work fine.


Yours sincerely,
  Alexander
diff -u guile-1.8-1.8.4+1/debian/patches/series guile-1.8-1.8.4+1/debian/patches/series
--- guile-1.8-1.8.4+1/debian/patches/series
+++ guile-1.8-1.8.4+1/debian/patches/series
@@ -7,0 +8 @@
+guile-1.8-gcc43.diff
diff -u guile-1.8-1.8.4+1/debian/changelog guile-1.8-1.8.4+1/debian/changelog
--- guile-1.8-1.8.4+1/debian/changelog
+++ guile-1.8-1.8.4+1/debian/changelog
@@ -1,3 +1,14 @@
+guile-1.8 (1.8.4+1-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Added debian/patches/guile-1.8-gcc43.diff
+    to let it compile with gcc-4.3 and to solve the 'extern inline' functions
+    problem
+    (Closes: #462384, #466778)
+    Thanks Maximiliano Curia and Daniel Schepler for the patch!
+
+ -- Alexander Schmehl <[EMAIL PROTECTED]>  Mon, 07 Apr 2008 19:01:33 +0200
+
 guile-1.8 (1.8.4+1-2) unstable; urgency=low
 
   * Remove ia64 from Architectures.  Since it doesn't look like "!ia64" is
only in patch2:
unchanged:
--- guile-1.8-1.8.4+1.orig/debian/patches/gcc_4.3_support.diff
+++ guile-1.8-1.8.4+1/debian/patches/gcc_4.3_support.diff
@@ -0,0 +1,126 @@
+Index: guile-1.8-1.8.4+1/libguile/c-tokenize.c
+===================================================================
+--- guile-1.8-1.8.4+1.orig/libguile/c-tokenize.c
++++ guile-1.8-1.8.4+1/libguile/c-tokenize.c
+@@ -579,6 +579,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+   
++#define YY_NO_INPUT
++
+ int yylex(void);
+ 
+ int yyget_lineno (void);
+@@ -653,6 +655,8 @@
+ static int yy_flex_strlen (yyconst char * );
+ #endif
+ 
++#ifdef COMMENTED_OUT
++
+ #ifndef YY_NO_INPUT
+ 
+ #ifdef __cplusplus
+@@ -663,6 +667,8 @@
+ 
+ #endif
+ 
++#endif /* ifdef COMMENTED_OUT */
++
+ /* Amount of stuff to slurp up with each read. */
+ #ifndef YY_READ_BUF_SIZE
+ #define YY_READ_BUF_SIZE 8192
+@@ -1526,6 +1532,8 @@
+ 	return yy_is_jam ? 0 : yy_current_state;
+ }
+ 
++#ifdef COMMENTED_OUT
++
+ #ifndef YY_NO_INPUT
+ #ifdef __cplusplus
+     static int yyinput (void)
+@@ -1600,6 +1608,8 @@
+ }
+ #endif	/* ifndef YY_NO_INPUT */
+ 
++#endif	/* ifdef COMMENTED_OUT */
++
+ /** Immediately switch to a different input stream.
+  * @param input_file A readable stream.
+  * 
+Index: guile-1.8-1.8.4+1/libguile/c-tokenize.lex
+===================================================================
+--- guile-1.8-1.8.4+1.orig/libguile/c-tokenize.lex
++++ guile-1.8-1.8.4+1/libguile/c-tokenize.lex
+@@ -18,7 +18,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-  
++ 
++#define YY_NO_INPUT
++ 
+ int yylex(void);
+ 
+ int yyget_lineno (void);
+Index: guile-1.8-1.8.4+1/libguile/inline.h
+===================================================================
+--- guile-1.8-1.8.4+1.orig/libguile/inline.h
++++ guile-1.8-1.8.4+1/libguile/inline.h
+@@ -55,6 +55,12 @@
+ extern unsigned scm_newcell2_count;
+ extern unsigned scm_newcell_count;
+ 
++#ifdef __GNUC_STDC_INLINE__
++#define SCM_C_GNU_INLINE SCM_C_INLINE __attribute__((__gnu_inline__))
++#else
++#define SCM_C_GNU_INLINE SCM_C_INLINE
++#endif
++
+ #if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
+ /* definitely inlining */
+ #ifdef __GNUC__
+@@ -62,7 +68,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_cell (scm_t_bits car, scm_t_bits cdr)
+@@ -138,7 +144,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_double_cell (scm_t_bits car, scm_t_bits cbr,
+@@ -213,7 +219,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
+@@ -228,7 +234,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ void
+ scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
+@@ -243,7 +249,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ int
+ scm_is_pair (SCM x)
only in patch2:
unchanged:
--- guile-1.8-1.8.4+1.orig/debian/patches/guile-1.8-gcc43.diff
+++ guile-1.8-1.8.4+1/debian/patches/guile-1.8-gcc43.diff
@@ -0,0 +1,87 @@
+diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.c guile-1.8-1.8.3+1/libguile/c-tokenize.c
+--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.c	2007-06-13 22:00:56.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/c-tokenize.c	2008-02-23 01:40:11.000000000 +0000
+@@ -579,6 +579,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+   
++#define YY_NO_INPUT
++
+ int yylex(void);
+ 
+ int yyget_lineno (void);
+diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex guile-1.8-1.8.3+1/libguile/c-tokenize.lex
+--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex	2007-05-09 20:22:03.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/c-tokenize.lex	2008-02-23 01:39:42.000000000 +0000
+@@ -18,7 +18,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-  
++ 
++#define YY_NO_INPUT
++ 
+ int yylex(void);
+ 
+ int yyget_lineno (void);
+diff -urN guile-1.8-1.8.3+1.old/libguile/inline.h guile-1.8-1.8.3+1/libguile/inline.h
+--- guile-1.8-1.8.3+1.old/libguile/inline.h	2007-05-09 20:22:03.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/inline.h	2008-02-23 01:43:22.000000000 +0000
+@@ -55,6 +55,12 @@
+ extern unsigned scm_newcell2_count;
+ extern unsigned scm_newcell_count;
+ 
++#ifdef __GNUC_STDC_INLINE__
++#define SCM_C_GNU_INLINE SCM_C_INLINE __attribute__((__gnu_inline__))
++#else
++#define SCM_C_GNU_INLINE SCM_C_INLINE
++#endif
++
+ #if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
+ /* definitely inlining */
+ #ifdef __GNUC__
+@@ -62,7 +68,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_cell (scm_t_bits car, scm_t_bits cdr)
+@@ -138,7 +144,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_double_cell (scm_t_bits car, scm_t_bits cbr,
+@@ -213,7 +219,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
+@@ -228,7 +234,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ void
+ scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
+@@ -243,7 +249,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ int
+ scm_is_pair (SCM x)

Reply via email to