From 0397b888ae21f675495b94ad76776ce5c03f3cd9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 15 Mar 2006 02:43:14 +0000 Subject: [PATCH] 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. Package-Manager: portage-2.1_pre6-r2 --- dev-lang/wml/ChangeLog | 11 ++++- dev-lang/wml/Manifest | 39 ++++++++++++----- .../files/wml-2.0.9-autotools-update.patch | 43 +++++++++++++++---- dev-lang/wml/files/wml-2.0.9-gcc41.patch | 13 ++++++ dev-lang/wml/wml-2.0.9-r1.ebuild | 26 +++++------ 5 files changed, 99 insertions(+), 33 deletions(-) create mode 100644 dev-lang/wml/files/wml-2.0.9-gcc41.patch diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog index bd694c126eb4..2665bc2958a6 100644 --- a/dev-lang/wml/ChangeLog +++ b/dev-lang/wml/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/wml -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.21 2005/09/12 04:09:56 weeve Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.22 2006/03/15 02:43:14 flameeyes Exp $ + + 15 Mar 2006; Diego Pettenò + files/wml-2.0.9-autotools-update.patch, +files/wml-2.0.9-gcc41.patch, + wml-2.0.9-r1.ebuild: + 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. 12 Sep 2005; Jason Wever wml-2.0.9-r1.ebuild: Stable on SPARC wrt security bug #105138. diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest index 52608f7d2e3a..a85e55a52795 100644 --- a/dev-lang/wml/Manifest +++ b/dev-lang/wml/Manifest @@ -1,18 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310 -MD5 f1c20eb9484d1d245122691d9d790ad7 wml-2.0.9-r1.ebuild 1115 -MD5 68d3173aab21e04ddc33145dbf24de70 wml-2.0.9.ebuild 1189 -MD5 d8ecef5564126370235f0a109c012881 ChangeLog 2323 +MD5 00be029177d86642594fdfd1bc6fff79 ChangeLog 2641 +RMD160 2b3d3c964131454889cd0fe86e98c201ee075427 ChangeLog 2641 +SHA256 3427fa7fd750b06dcbbfbb31a66c229327dd8e58c12adf865ae541d46ed338d2 ChangeLog 2641 +MD5 aefa456b69c01c50eca3fe8b497c1f59 files/2.0.9-fix-configure.in.patch 1411 +RMD160 54aa0b173fd0dc1fdc5f7f652682cec078f78a25 files/2.0.9-fix-configure.in.patch 1411 +SHA256 e59dee3fd10b2cc9603f15fbff1ccdf466d5c9fd919c09c058a0aaa3b7064286 files/2.0.9-fix-configure.in.patch 1411 MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9 62 +RMD160 1941f61a0f5ebb4dd9ad08e1f2dcf56f08f42d0d files/digest-wml-2.0.9 62 +SHA256 fd15b146e5c256edcb38458bf92c9f9ab5d93e165b4af09644ab6c2624c56db1 files/digest-wml-2.0.9 62 MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9-r1 62 -MD5 63a4be7e9b23a8dad09660e70f9e11ac files/wml-2.0.9-autotools-update.patch 2720 -MD5 aefa456b69c01c50eca3fe8b497c1f59 files/2.0.9-fix-configure.in.patch 1411 +RMD160 1941f61a0f5ebb4dd9ad08e1f2dcf56f08f42d0d files/digest-wml-2.0.9-r1 62 +SHA256 fd15b146e5c256edcb38458bf92c9f9ab5d93e165b4af09644ab6c2624c56db1 files/digest-wml-2.0.9-r1 62 +MD5 aa98943ede07c2aebbd988153c882e74 files/wml-2.0.9-autotools-update.patch 3796 +RMD160 3a6f361805783317c81646e89493df04fe6e3b22 files/wml-2.0.9-autotools-update.patch 3796 +SHA256 f8ad37c0efec2e2f3bd4b93b94dcd0b5e945d3fde3fcb8a76b2b9a1ebd52001a files/wml-2.0.9-autotools-update.patch 3796 +MD5 22515a540cc3133e7da6990a68abf261 files/wml-2.0.9-gcc41.patch 361 +RMD160 7801e31d2e2d379c148902a697c46bec15cde831 files/wml-2.0.9-gcc41.patch 361 +SHA256 7c983ec6d7f659eb1b152f03b98764df40d51b6b5d1ceb7fbee4a79b695c5e33 files/wml-2.0.9-gcc41.patch 361 +MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310 +RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310 +SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310 +MD5 f1f98a36c2d1d6ab3e914297b0081c88 wml-2.0.9-r1.ebuild 1110 +RMD160 13f47e5b54c3285a90ccb6a510816e115a1c6c95 wml-2.0.9-r1.ebuild 1110 +SHA256 815a157a814af6eca6fbea451285073995680319a640a384faba3e6854e459ce wml-2.0.9-r1.ebuild 1110 +MD5 68d3173aab21e04ddc33145dbf24de70 wml-2.0.9.ebuild 1189 +RMD160 46b03bd347f5499727b1d3adde0761e51a83a20f wml-2.0.9.ebuild 1189 +SHA256 798d843a4ef74be4ece571e32ecd3e91090363246d708f69a0b531eeceec7f0a wml-2.0.9.ebuild 1189 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFDK9MXgIKl8Uu19MoRAkydAJ9sOpyF2TcuISu4hJJYMYZ9ZaNkiwCdHqqI -5Mu7FMP3VwZ88rGbLIY9DUg= -=cpQK +iD8DBQFEF39PAiZjviIA2XgRAnwcAJ9zgq9HjwKzVY5lPc0Og5sc6ROgTQCg9D1f +rekPbhjtMRJ7sOnhXqrBKLI= +=ps7S -----END PGP SIGNATURE----- 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, 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 */ diff --git a/dev-lang/wml/wml-2.0.9-r1.ebuild b/dev-lang/wml/wml-2.0.9-r1.ebuild index 4025d9ad866f..4982d2460a30 100644 --- a/dev-lang/wml/wml-2.0.9-r1.ebuild +++ b/dev-lang/wml/wml-2.0.9-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9-r1.ebuild,v 1.5 2005/09/17 08:25:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9-r1.ebuild,v 1.6 2006/03/15 02:43:14 flameeyes Exp $ -inherit fixheadtails eutils +inherit fixheadtails eutils autotools multilib DESCRIPTION="Website META Language" HOMEPAGE="http://www.engelschall.com/sw/wml/" @@ -15,24 +15,26 @@ IUSE="" RDEPEND="dev-libs/libpcre dev-lang/perl" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.58" src_unpack() { unpack ${A} ht_fix_all cd "${S}" - epatch "${FILESDIR}"/${P}-autotools-update.patch - export WANT_AUTOCONF='2.5' - for d in $(find "${S}" -mindepth 2 -name configure -printf '%h ') ; do - cd "${d}" - autoconf || die "autoconf in ${d}" + + epatch "${FILESDIR}/${P}-gcc41.patch" + epatch "${FILESDIR}/${P}-autotools-update.patch" + + for d in $(find "${S}" \( -name configure.ac -o -name configure.in \) -exec dirname {} \;); do + pushd ${d} &>/dev/null + WANT_AUTOCONF="2.5" AT_NOELIBTOOLIZE="yes" eautoreconf + popd &>/dev/null done - (cd "${S}"/wml_backend/p2_mp4h && automake) || die "automake failed in wml_backend/p2_mp4h" + + elibtoolize } src_compile() { - econf --libdir=/usr/lib/wml || die "./configure failed" + econf --libdir=/usr/$(get_libdir)/wml || die "./configure failed" emake || die "emake failed" } -- 2.26.2