diff options
| author |   Manuel Rüger <mrueg@gentoo.org> | 2014-03-10 17:07:29 +0000 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2014-03-10 17:07:29 +0000 |
| commit | 5cf17bebbe917bf86d21968a33f780626cc736fa (patch) | |
| tree | 089f3481e7070066b19aaf09e1eed341efc8f4db /net-print/c2esp | |
| parent | Keyword amd64-linux and x86-linux, fixed for prefix (diff) | |
| download | gentoo-2-5cf17bebbe917bf86d21968a33f780626cc736fa.tar.gz gentoo-2-5cf17bebbe917bf86d21968a33f780626cc736fa.tar.bz2 gentoo-2-5cf17bebbe917bf86d21968a33f780626cc736fa.zip | |
Version bump. Thanks to Lukasz Jankowski. Fixes bug #479430.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'net-print/c2esp')
| -rw-r--r-- | net-print/c2esp/ChangeLog | 10 | ||||
| -rw-r--r-- | net-print/c2esp/c2esp-26.ebuild (renamed from net-print/c2esp/c2esp-24.ebuild) | 8 | ||||
| -rw-r--r-- | net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch | 33 |
3 files changed, 45 insertions, 6 deletions
diff --git a/net-print/c2esp/ChangeLog b/net-print/c2esp/ChangeLog index 2cb4fcfa91cd..2f5903ce58a5 100644 --- a/net-print/c2esp/ChangeLog +++ b/net-print/c2esp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-print/c2esp -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/ChangeLog,v 1.4 2012/07/25 03:27:46 binki Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/ChangeLog,v 1.5 2014/03/10 17:07:29 mrueg Exp $ + +*c2esp-26 (10 Mar 2014) + + 10 Mar 2014; Manuel Rüger <mrueg@gentoo.org> +c2esp-26.ebuild, + +files/c2esp-26-ldflags-cppflags.patch, -c2esp-24.ebuild: + Version bump. Thanks to Lukasz Jankowski. Fixes bug #479430. *c2esp-25c (25 Jul 2012) diff --git a/net-print/c2esp/c2esp-24.ebuild b/net-print/c2esp/c2esp-26.ebuild index 6a64f5f9cee5..6f343c56eea7 100644 --- a/net-print/c2esp/c2esp-24.ebuild +++ b/net-print/c2esp/c2esp-26.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/c2esp-24.ebuild,v 1.1 2012/03/10 15:53:54 binki Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/c2esp-26.ebuild,v 1.1 2014/03/10 17:07:29 mrueg Exp $ -EAPI=4 +EAPI=5 inherit eutils toolchain-funcs @@ -41,7 +41,7 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85 + emake -j1 CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85 } src_install() { diff --git a/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch new file mode 100644 index 000000000000..1ea36482687d --- /dev/null +++ b/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch @@ -0,0 +1,33 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2012-09-06 00:18:06.000000000 +0100 ++++ b/Makefile 2013-08-01 19:56:01.884969274 +0100 +@@ -234,16 +234,16 @@ + @echo + + c2esp: c2esp.o c2espcommon.o $(LIBJBG85) +- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85) + + c2espC: c2espC.o c2espcommon.o +- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz + + command2esp: command2esp.o c2espcommon.o +- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o $(LIBCUPSDRIVER) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o $(LIBCUPSDRIVER) + + myopldecode: myopldecode.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz + + # + # Installation rules +@@ -403,3 +403,8 @@ + command2esp.o: c2espcommon.h + c2espcommon.o: c2espcommon.h + ++# Respect CPPFLAGS. ++.SUFFIXES: .c .o ++.c.o: ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<' ++ |