diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-12-24 04:22:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-24 04:22:17 +0000 |
| commit | d4432d0d3678239fd115c591c4650f5a62c59772 (patch) | |
| tree | 873445aaf4c2a8253d2c122cb6ad7d3936c5f2a4 /media-libs/netpbm/files | |
| parent | Version bump #115082. (diff) | |
| download | gentoo-2-d4432d0d3678239fd115c591c4650f5a62c59772.tar.gz gentoo-2-d4432d0d3678239fd115c591c4650f5a62c59772.tar.bz2 gentoo-2-d4432d0d3678239fd115c591c4650f5a62c59772.zip | |
Version bump.
(Portage version: 2.0.53)
Diffstat (limited to 'media-libs/netpbm/files')
| -rw-r--r-- | media-libs/netpbm/files/digest-netpbm-10.31 (renamed from media-libs/netpbm/files/digest-netpbm-10.26.20) | 2 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.31-build.patch | 50 |
2 files changed, 51 insertions, 1 deletions
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.20 b/media-libs/netpbm/files/digest-netpbm-10.31 index 2771ada897d7..f78109f5f80c 100644 --- a/media-libs/netpbm/files/digest-netpbm-10.26.20 +++ b/media-libs/netpbm/files/digest-netpbm-10.31 @@ -1,2 +1,2 @@ -MD5 986d5d4d3172af23449559cb109dd2e3 netpbm-10.26.20.tgz 2539433 MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254 +MD5 6ba2e0ee998eb23f4620ec9c175a90b6 netpbm-10.31.tgz 2383586 diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch new file mode 100644 index 000000000000..cd744743636c --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.31-build.patch @@ -0,0 +1,50 @@ +- Don't install libnetpbm.a and libnetpbm.so into a sep link dir +- Try to fix parallel building +- Make the libopt tool less 'helpful' + +--- lib/Makefile ++++ lib/Makefile +@@ -249,7 +249,7 @@ + .PHONY: install.staticlib + install.staticlib: $(PKGDIR)/link + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ +- $(PKGDIR)/link ++ $(PKGDIR)/lib + + # Install a shared library stub -- the ".so" file used at link time to + # prepare a program for dynamically linking a library at run time +@@ -257,9 +257,9 @@ + install.sharedlibstub: $(PKGDIR)/link + ifeq ($(NETPBMLIBTYPE),unixshared) + # install the link-time (.so) links to the runtime libraries +- cd $(PKGDIR)/link ; \ ++ cd $(PKGDIR)/lib ; \ + rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ +- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ ++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + libnetpbm.$(NETPBMLIBSUFFIX) + endif + ifeq ($(NETPBMLIBTYPE),dll) +--- GNUmakefile ++++ GNUmakefile +@@ -87,6 +87,9 @@ + + .PHONY: nonmerge + nonmerge: $(PRODUCT_SUBDIRS:%=%/all) ++ ++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all ++converter/all analyzer/all editor/all generator/all other/all: lib/all + + OMIT_CONFIG_RULE = 1 + include $(SRCDIR)/Makefile.common +--- buildtools/libopt.c ++++ buildtools/libopt.c +@@ -502,7 +502,7 @@ + + strcpy(outputLine, ""); /* initial value */ + runtime = FALSE; /* initial value */ +- quiet = FALSE; /* initial value */ ++ quiet = TRUE; /* initial value */ + error = FALSE; /* no error yet */ + for (arg = 1; arg < argc && !error; arg++) { + if (strcmp(argv[arg], "-runtime") == 0) |