diff options
author | 2007-08-20 18:16:40 +0000 | |
---|---|---|
committer | 2007-08-20 18:16:40 +0000 | |
commit | 87e6bcf59c80715aa05f9adf874275c124a048e0 (patch) | |
tree | 386011876e4164af1db3378387baf1a73d3571bd /media-libs/libart_lgpl | |
parent | Revert make_desktop_entry, has command line options.. not sensible here. (diff) | |
download | gentoo-2-87e6bcf59c80715aa05f9adf874275c124a048e0.tar.gz gentoo-2-87e6bcf59c80715aa05f9adf874275c124a048e0.tar.bz2 gentoo-2-87e6bcf59c80715aa05f9adf874275c124a048e0.zip |
Fix crosscompiling; bug #185684
(Portage version: 2.1.3.6)
Diffstat (limited to 'media-libs/libart_lgpl')
-rw-r--r-- | media-libs/libart_lgpl/ChangeLog | 7 | ||||
-rw-r--r-- | media-libs/libart_lgpl/files/libart_lgpl-2.3.19-crosscompile.patch | 50 | ||||
-rw-r--r-- | media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild | 4 |
3 files changed, 59 insertions, 2 deletions
diff --git a/media-libs/libart_lgpl/ChangeLog b/media-libs/libart_lgpl/ChangeLog index 0934bacc23c2..654047a4320d 100644 --- a/media-libs/libart_lgpl/ChangeLog +++ b/media-libs/libart_lgpl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libart_lgpl # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/ChangeLog,v 1.52 2007/07/27 09:59:28 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/ChangeLog,v 1.53 2007/08/20 18:16:40 dang Exp $ + + 20 Aug 2007; Daniel Gryniewicz <dang@gentoo.org> + +files/libart_lgpl-2.3.19-crosscompile.patch, + libart_lgpl-2.3.19-r1.ebuild: + Fix crosscompiling; bug #185684 27 Jul 2007; Mart Raudsepp <leio@gentoo.org> -libart_lgpl-2.3.16.ebuild, -libart_lgpl-2.3.17.ebuild: diff --git a/media-libs/libart_lgpl/files/libart_lgpl-2.3.19-crosscompile.patch b/media-libs/libart_lgpl/files/libart_lgpl-2.3.19-crosscompile.patch new file mode 100644 index 000000000000..3949354e7f28 --- /dev/null +++ b/media-libs/libart_lgpl/files/libart_lgpl-2.3.19-crosscompile.patch @@ -0,0 +1,50 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/art_config.h libart_lgpl-2.3.19/art_config.h +--- libart_lgpl-2.3.19.orig/art_config.h 2007-02-28 08:00:44.000000000 -0500 ++++ libart_lgpl-2.3.19/art_config.h 2007-08-20 14:11:22.000000000 -0400 +@@ -1,10 +1,5 @@ + /* Automatically generated by gen_art_config.c */ + +-#define ART_SIZEOF_CHAR 1 +-#define ART_SIZEOF_SHORT 2 +-#define ART_SIZEOF_INT 4 +-#define ART_SIZEOF_LONG 4 +- + typedef unsigned char art_u8; + typedef unsigned short art_u16; + typedef unsigned int art_u32; +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/Makefile.am libart_lgpl-2.3.19/Makefile.am +--- libart_lgpl-2.3.19.orig/Makefile.am 2007-01-01 18:59:22.000000000 -0500 ++++ libart_lgpl-2.3.19/Makefile.am 2007-08-20 13:59:02.000000000 -0400 +@@ -3,11 +3,6 @@ noinst_PROGRAMS = testart testuta gen_ar + bin_SCRIPTS = \ + libart2-config + +-BUILT_SOURCES = art_config.h +- +-art_config.h: gen_art_config$(EXEEXT) +- ./gen_art_config > art_config.h +- + EXTRA_DIST = \ + libart.def \ + libart-config.in \ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libart_lgpl-2.3.19.orig/Makefile.in libart_lgpl-2.3.19/Makefile.in +--- libart_lgpl-2.3.19.orig/Makefile.in 2007-02-28 08:00:24.000000000 -0500 ++++ libart_lgpl-2.3.19/Makefile.in 2007-08-20 13:59:11.000000000 -0400 +@@ -254,7 +254,6 @@ top_srcdir = @top_srcdir@ + bin_SCRIPTS = \ + libart2-config + +-BUILT_SOURCES = art_config.h + EXTRA_DIST = \ + libart.def \ + libart-config.in \ +@@ -915,9 +914,6 @@ uninstall-am: uninstall-binSCRIPTS unins + uninstall-pkgconfigDATA + + +-art_config.h: gen_art_config$(EXEEXT) +- ./gen_art_config > art_config.h +- + @OS_WIN32_TRUE@install-libtool-import-lib: + @OS_WIN32_TRUE@ $(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir) + @OS_WIN32_TRUE@uninstall-libtool-import-lib: diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild index 3f66f68cf3ab..eb37d481d96f 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild,v 1.10 2007/06/24 21:57:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/libart_lgpl-2.3.19-r1.ebuild,v 1.11 2007/08/20 18:16:40 dang Exp $ inherit gnome2 eutils @@ -21,4 +21,6 @@ src_unpack() { gnome2_src_unpack epatch "${FILESDIR}"/${P}-alloc.patch + # Fix crosscompiling; bug #185684 + epatch "${FILESDIR}"/${P}-crosscompile.patch } |