diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-10 12:24:35 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-10 12:24:35 +0000 |
| commit | 9086a09cb88df5b8c529c72b3a7b744eb9b57780 (patch) | |
| tree | e17096ac4c6c0b10b6d1d9dbfb7a702c8d6fd147 | |
| parent | Marked Stable on amd64. (diff) | |
| download | gentoo-2-9086a09cb88df5b8c529c72b3a7b744eb9b57780.tar.gz gentoo-2-9086a09cb88df5b8c529c72b3a7b744eb9b57780.tar.bz2 gentoo-2-9086a09cb88df5b8c529c72b3a7b744eb9b57780.zip | |
Added patch to respect the $(MAKE) variable. Use the right compiler for current arch to build with newer compiler-config.
(Portage version: 2.0.53_rc5)
| -rw-r--r-- | media-libs/jbigkit/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch | 30 | ||||
| -rw-r--r-- | media-libs/jbigkit/jbigkit-1.6-r1.ebuild | 9 |
3 files changed, 43 insertions, 3 deletions
diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog index 9464c0ce430a..d29848e6cc13 100644 --- a/media-libs/jbigkit/ChangeLog +++ b/media-libs/jbigkit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/jbigkit # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.21 2005/10/04 00:51:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.22 2005/10/10 12:24:35 flameeyes Exp $ + + 10 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/jbigkit-1.6-respect-make.patch, jbigkit-1.6-r1.ebuild: + Added patch to respect the $(MAKE) variable. Use the right compiler for + current arch to build with newer compiler-config. *jbigkit-1.6-r1 (30 Sep 2005) diff --git a/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch new file mode 100644 index 000000000000..46d4107a5690 --- /dev/null +++ b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch @@ -0,0 +1,30 @@ +Index: jbigkit/Makefile +=================================================================== +--- jbigkit.orig/Makefile ++++ jbigkit/Makefile +@@ -16,19 +16,19 @@ all: lib pbm + @echo "Enter 'make test' in order to start some automatic tests." + + lib: +- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") ++ (cd libjbig; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)") + + pbm: lib +- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") ++ (cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)") + + test: lib pbm +- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) +- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) ++ (cd libjbig; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) ++ (cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) + + clean: + rm -f *~ core +- (cd libjbig; make clean) +- (cd pbmtools; make clean) ++ (cd libjbig; $(MAKE) clean) ++ (cd pbmtools; $(MAKE) clean) + + distribution: clean + rm -f libjbig/libjbig.a diff --git a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild index 4c96dd67968f..8ade6e92c695 100644 --- a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild +++ b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.4 2005/10/04 00:51:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.5 2005/10/10 12:24:35 flameeyes Exp $ -inherit eutils multilib +inherit eutils multilib toolchain-funcs DESCRIPTION="highly effective data compression algorithm for bi-level high-resolution images such as fax pages or scanned documents" HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/" @@ -23,6 +23,11 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-build.patch epatch "${FILESDIR}"/${P}-shared-lib.patch + epatch "${FILESDIR}"/${P}-respect-make.patch +} + +src_compile() { + emake CC=$(tc-getCC) || die "emake failed" } src_test() { |