summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-15 02:43:14 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-15 02:43:14 +0000
commitde7d5bf489e85e7c3feeb526fd944a9518328b1e (patch)
tree38f5fb2f5f86f3be922dddd8cb5fa6919a43e699 /dev-lang/wml/files
parentadd a die message to src_compile (diff)
downloadgentoo-2-de7d5bf489e85e7c3feeb526fd944a9518328b1e.tar.gz
gentoo-2-de7d5bf489e85e7c3feeb526fd944a9518328b1e.tar.bz2
gentoo-2-de7d5bf489e85e7c3feeb526fd944a9518328b1e.zip
Patch to build on GCC 4.1, reported by Patrizio Bassi in bug #125121. Use eautoreconf to rebuild autotools support. Partially fix for multilib-strict support.
(Portage version: 2.1_pre6-r2)
Diffstat (limited to 'dev-lang/wml/files')
-rw-r--r--dev-lang/wml/files/wml-2.0.9-autotools-update.patch43
-rw-r--r--dev-lang/wml/files/wml-2.0.9-gcc41.patch13
2 files changed, 47 insertions, 9 deletions
diff --git a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
index bbb0956dfbef..aa56579dc637 100644
--- a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
+++ b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
@@ -1,6 +1,8 @@
Use system libpcre and make iselect not blow up
---- wml_backend/p2_mp4h/Makefile.am
+Index: wml_backend/p2_mp4h/Makefile.am
+===================================================================
+--- wml_backend/p2_mp4h/Makefile.am.orig
+++ wml_backend/p2_mp4h/Makefile.am
@@ -1,15 +1,15 @@
@@ -22,7 +24,9 @@ Use system libpcre and make iselect not blow up
deb:
if test -f ../mp4h_$(VERSION).orig.tar.gz; then \
---- wml_backend/p2_mp4h/configure.ac
+Index: wml_backend/p2_mp4h/configure.ac
+===================================================================
+--- wml_backend/p2_mp4h/configure.ac.orig
+++ wml_backend/p2_mp4h/configure.ac
@@ -179,7 +179,6 @@ AC_SUBST(CFLAGS)
AC_CONFIG_FILES([
@@ -32,7 +36,9 @@ Use system libpcre and make iselect not blow up
lib/Makefile
src/Makefile
po/Makefile.in
---- wml_backend/p2_mp4h/src/Makefile.am
+Index: wml_backend/p2_mp4h/src/Makefile.am
+===================================================================
+--- wml_backend/p2_mp4h/src/Makefile.am.orig
+++ wml_backend/p2_mp4h/src/Makefile.am
@@ -1,5 +1,5 @@
@@ -50,17 +56,19 @@ Use system libpcre and make iselect not blow up
include_HEADERS = mp4h.h
noinst_HEADERS = builtin.h ltdl.h
---- wml_aux/iselect/configure.in
+Index: wml_aux/iselect/configure.in
+===================================================================
+--- wml_aux/iselect/configure.in.orig
+++ wml_aux/iselect/configure.in
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ dnl ## configure.in -- GNU autoconf con
dnl ## Copyright (c) Ralf S. Engelschall, <rse@engelschall.com>
dnl ##
+AC_INIT(README)
AC_PREREQ(2.10)dnl
- AC_REVISION($Revision: 1.1 $)
+ AC_REVISION($Revision: 1.2 $)
SHTOOL="./etc/shtool"
-@@ -11,7 +12,6 @@
+@@ -11,7 +12,6 @@ T_ME=`$SHTOOL echo -e %b 2>/dev/null`
echo "${T_MD}Configuring for iSelect `./etc/shtool version -l c -d long iselect_version.c`${T_ME}"
echo "Copyright (c) 1996-1999 Ralf S. Engelschall, All Rights Reserved."
@@ -68,9 +76,11 @@ Use system libpcre and make iselect not blow up
AC_CONFIG_HEADER(config_ac.h)dnl
AC_PREFIX_DEFAULT(/usr/local)
---- wml_aux/iselect/aclocal.m4
+Index: wml_aux/iselect/aclocal.m4
+===================================================================
+--- wml_aux/iselect/aclocal.m4.orig
+++ wml_aux/iselect/aclocal.m4
-@@ -186,24 +186,6 @@
+@@ -186,24 +186,6 @@ dnl ## taken from shar-4.0's aclocal.m4
dnl ##
dnl ##########################################################
dnl
@@ -95,3 +105,18 @@ Use system libpcre and make iselect not blow up
dnl
dnl
dnl ##########################################################
+Index: wml_backend/p3_eperl/configure.in
+===================================================================
+--- wml_backend/p3_eperl/configure.in.orig
++++ wml_backend/p3_eperl/configure.in
+@@ -9,9 +9,8 @@ dnl #
+ dnl # standard autoconf prolog
+ dnl #
+
+-AC_PREREQ(2.10)dnl
+ AC_REVISION($Revision: 1.2 $)
+-AC_INIT(README)
++AC_INIT
+ AC_CONFIG_HEADER(config_ac.h)dnl
+ AC_PREFIX_DEFAULT(/usr/local)
+
diff --git a/dev-lang/wml/files/wml-2.0.9-gcc41.patch b/dev-lang/wml/files/wml-2.0.9-gcc41.patch
new file mode 100644
index 000000000000..2c86268af7e1
--- /dev/null
+++ b/dev-lang/wml/files/wml-2.0.9-gcc41.patch
@@ -0,0 +1,13 @@
+Index: wml-2.0.9/wml_backend/p3_eperl/eperl_proto.h
+===================================================================
+--- wml-2.0.9.orig/wml_backend/p3_eperl/eperl_proto.h
++++ wml-2.0.9/wml_backend/p3_eperl/eperl_proto.h
+@@ -35,6 +35,8 @@
+ #ifndef EPERL_PROTO_H
+ #define EPERL_PROTO_H 1
+
++#include "eperl_getopt.h"
++
+ /*_BEGIN_PROTO_*/
+
+ /* eperl_main.c */