diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-10-27 00:24:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-10-27 00:24:59 +0000 |
| commit | d4f0af6950742593710b3f5f70f5ae5f5d733794 (patch) | |
| tree | a0892dea53fcf0fdcfb39127c4a747636e66fc94 /media-libs | |
| parent | More general cleanups. (diff) | |
| download | gentoo-2-d4f0af6950742593710b3f5f70f5ae5f5d733794.tar.gz gentoo-2-d4f0af6950742593710b3f5f70f5ae5f5d733794.tar.bz2 gentoo-2-d4f0af6950742593710b3f5f70f5ae5f5d733794.zip | |
really fix the depend on libopt #110257
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.29-build.patch | 2 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.30-build.patch | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/media-libs/netpbm/files/netpbm-10.29-build.patch b/media-libs/netpbm/files/netpbm-10.29-build.patch index 0da80ef812ff..eab109a3c6a3 100644 --- a/media-libs/netpbm/files/netpbm-10.29-build.patch +++ b/media-libs/netpbm/files/netpbm-10.29-build.patch @@ -33,7 +33,7 @@ .PHONY: nonmerge nonmerge: $(PRODUCT_SUBDIRS:%=%/all) + -+$(PRODUCT_SUBDIRS:%=%/all): $(LIBOPT) ++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all +converter/all analyzer/all editor/all generator/all other/all: lib/all OMIT_CONFIG_RULE = 1 diff --git a/media-libs/netpbm/files/netpbm-10.30-build.patch b/media-libs/netpbm/files/netpbm-10.30-build.patch index 902f9aa5ab4b..8f42f65e80da 100644 --- a/media-libs/netpbm/files/netpbm-10.30-build.patch +++ b/media-libs/netpbm/files/netpbm-10.30-build.patch @@ -1,6 +1,7 @@ - Don't install libnetpbm.a and libnetpbm.so into a sep link dir - Try to fix parallel building - Make the libopt tool less 'helpful' +- Remove pointless echo during build --- lib/Makefile +++ lib/Makefile @@ -32,7 +33,7 @@ .PHONY: nonmerge nonmerge: $(PRODUCT_SUBDIRS:%=%/all) + -+$(PRODUCT_SUBDIRS:%=%/all): $(LIBOPT) ++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all +converter/all analyzer/all editor/all generator/all other/all: lib/all OMIT_CONFIG_RULE = 1 @@ -58,3 +59,13 @@ + if (shut_the_hell_up == FALSE) fprintf(stderr, "libopt results: '%s'\n", outputLine); retval = 0; +--- converter/other/jpeg2000/Makefile ++++ converter/other/jpeg2000/Makefile +@@ -57,7 +57,6 @@ + include $(SRCDIR)/Makefile.common + + $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT) +- echo deps: $^ + $(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \ + `$(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)` $(JASPERDEPLIBS) -lm \ + $(RPATH) $(LADD) |