Archives
Archives
| From: | "Justin Lecher (jlec)" <jlec@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-print/foomatic-db-engine/files: 4.0.3-perl-module.patch 4.0.3-respect-ldflag.patch |
| Date: | Fri, 05 Feb 2010 23:21:04 |
| Message-Id: | E1NdXTy-0008HD-AO@stork.gentoo.org |
| 1 | jlec 10/02/05 23:21:02 |
| 2 | |
| 3 | Added: 4.0.3-perl-module.patch 4.0.3-respect-ldflag.patch |
| 4 | Log: |
| 5 | Version Bump per bug 269865 |
| 6 | (Portage version: 2.2_rc62/cvs/Linux x86_64, RepoMan options: --force) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 net-print/foomatic-db-engine/files/4.0.3-perl-module.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: 4.0.3-perl-module.patch |
| 15 | =================================================================== |
| 16 | diff --git a/Makefile.in b/Makefile.in |
| 17 | index 3014185..81e090d 100644 |
| 18 | --- a/Makefile.in |
| 19 | +++ b/Makefile.in |
| 20 | @@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@ |
| 21 | FOOMATIC_RIP=@FOOMATIC_RIP@ |
| 22 | |
| 23 | # foomatic-rip path for a "make inplace" installation |
| 24 | -LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@ |
| 25 | +LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@ |
| 26 | |
| 27 | # Locations for installing the components of this package |
| 28 | BINDIR=$(bindir) |
| 29 | @@ -186,10 +186,10 @@ check-config: |
| 30 | install-bin: check-config lib/Makefile |
| 31 | # This is the only way to get the Perl-generated Makefile using |
| 32 | # $(DESTDIR) properly |
| 33 | - ( cd lib && \ |
| 34 | - $(MAKE) PREFIX=$(PERLPREFIX) && \ |
| 35 | - $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \ |
| 36 | - ) |
| 37 | +# ( cd lib && \ |
| 38 | +# $(MAKE) PREFIX=$(PERLPREFIX) && \ |
| 39 | +# $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \ |
| 40 | +# ) |
| 41 | ${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR) |
| 42 | ${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR) |
| 43 | ${SRC}/mkinstalldirs $(DESTDIR)$(ETCDIR) |
| 44 | |
| 45 | |
| 46 | |
| 47 | 1.1 net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch |
| 48 | |
| 49 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch?rev=1.1&view=markup |
| 50 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch?rev=1.1&content-type=text/plain |
| 51 | |
| 52 | Index: 4.0.3-respect-ldflag.patch |
| 53 | =================================================================== |
| 54 | --- foomatic-db-engine-4.0.2/Makefile.in.orig 2009-07-23 11:45:28.487999828 +0200 |
| 55 | +++ foomatic-db-engine-4.0.2/Makefile.in 2009-07-23 11:45:53.939525006 +0200 |
| 56 | @@ -230,10 +230,10 @@ |
| 57 | ( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) ) |
| 58 | |
| 59 | foomatic-combo-xml: foomatic-combo-xml.c |
| 60 | - $(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c |
| 61 | + $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c |
| 62 | |
| 63 | foomatic-perl-data: foomatic-perl-data.c |
| 64 | - $(CC) $(CFLAGS) $(XML_CFLAGS) $(XML_LIBS) -o foomatic-perl-data foomatic-perl-data.c |
| 65 | + $(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_CFLAGS) $(XML_LIBS) |
| 66 | |
| 67 | man: lib/Foomatic/Defaults.pm |
| 68 | chmod a+rx ./makeMan |