summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-19 19:36:17 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-19 19:36:17 +0000
commitae57652f92b0e2a0d64c993697e18d764853be88 (patch)
tree4ea90e05afc6d76d5315d7f33e0c3f3eb30ae049 /dev-libs/zziplib
parentAdd mail-filter/amavisd-new:courier (diff)
downloadgentoo-2-ae57652f92b0e2a0d64c993697e18d764853be88.tar.gz
gentoo-2-ae57652f92b0e2a0d64c993697e18d764853be88.tar.bz2
gentoo-2-ae57652f92b0e2a0d64c993697e18d764853be88.zip
Fix `make check`.
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-libs/zziplib')
-rw-r--r--dev-libs/zziplib/ChangeLog6
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch27
-rw-r--r--dev-libs/zziplib/zziplib-0.13.49.ebuild3
3 files changed, 34 insertions, 2 deletions
diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index 2708706695c7..57fda593e35a 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/zziplib
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.36 2007/03/19 19:14:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.37 2007/03/19 19:36:17 vapier Exp $
+
+ 19 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/zziplib-0.13.49-SDL-test.patch, zziplib-0.13.49.ebuild:
+ Fix `make check`.
*zziplib-0.13.49 (19 Mar 2007)
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
new file mode 100644
index 000000000000..dc272ed25ffe
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
@@ -0,0 +1,27 @@
+zzip-config doesnt exist, so we need to use the .pc file
+
+--- SDL/Makefile.in
++++ SDL/Makefile.in
+@@ -244,8 +244,8 @@
+ sdl_DATA = SDL_rwops_zzip.c SDL_rwops_zzip.h
+ EXTRA_DIST = $(sdl_DATA)
+ zzcatsdl_SOURCES = SDL_rwops_zzcat.c
+-zzcatsdl_LDFLAGS = `sdl-config --libs` `./zzip-config --libs`
+-zzcatsdl_cflags = `sdl-config --cflags` `./zzip-config --cflags`
++zzcatsdl_LDFLAGS = `sdl-config --libs` `pkg-config ../zzip/zziplib.pc --libs`
++zzcatsdl_cflags = `sdl-config --cflags` `pkg-config ../zzip/zziplib.pc --cflags`
+
+ ### if it wouldn't be for the zzip-config then we could write it like this
+ # zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
+@@ -544,9 +544,9 @@
+ uninstall-sdlDATA
+
+
+-SDL_rwops_zzip.$(OBJEXT) : zzip-config @srcdir@/SDL_rwops_zzip.c
++SDL_rwops_zzip.$(OBJEXT) : ../zzip/zziplib.pc @srcdir@/SDL_rwops_zzip.c
+ $(COMPILE) $(zzcatsdl_cflags) -c @srcdir@/SDL_rwops_zzip.c -o $@
+-SDL_rwops_zzcat.$(OBJEXT) : zzip-config @srcdir@/SDL_rwops_zzcat.c
++SDL_rwops_zzcat.$(OBJEXT) : ../zzip/zziplib.pc @srcdir@/SDL_rwops_zzcat.c
+ $(COMPILE) $(zzcatsdl_cflags) -c @srcdir@/SDL_rwops_zzcat.c -o $@
+ zzcatsdl$(EXEEXT): SDL_rwops_zzip.$(OBJEXT) SDL_rwops_zzcat.$(OBJEXT)
+ $(LINK) SDL_rwops_zzip.$(OBJEXT) SDL_rwops_zzcat.$(OBJEXT) \
diff --git a/dev-libs/zziplib/zziplib-0.13.49.ebuild b/dev-libs/zziplib/zziplib-0.13.49.ebuild
index e19945764093..fe8b65d632b0 100644
--- a/dev-libs/zziplib/zziplib-0.13.49.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.49.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/dev-libs/zziplib/zziplib-0.13.49.ebuild,v 1.1 2007/03/19 19:14:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49.ebuild,v 1.2 2007/03/19 19:36:17 vapier Exp $
inherit libtool fixheadtails eutils
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-SDL-test.patch
ht_fix_file configure docs/Makefile.in uses/depcomp
elibtoolize
}