Annotation of /trunk/netpbm/patches/netpbm-10.76.00-build.patch
Parent Directory | Revision Log
Revision 2925 -
(hide annotations)
(download)
Mon May 22 11:19:43 2017 UTC (7 years, 4 months ago) by niro
File size: 1295 byte(s)
Mon May 22 11:19:43 2017 UTC (7 years, 4 months ago) by niro
File size: 1295 byte(s)
-rediffed
1 | niro | 2925 | - Don't install libnetpbm.a and libnetpbm.so into a sep link dir |
2 | - Try to fix parallel building | ||
3 | |||
4 | --- a/lib/Makefile | ||
5 | +++ b/lib/Makefile | ||
6 | @@ -249,7 +249,7 @@ | ||
7 | .PHONY: install.staticlib | ||
8 | install.staticlib: $(PKGDIR)/link | ||
9 | $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ | ||
10 | - $(PKGDIR)/link | ||
11 | + $(PKGDIR)/lib | ||
12 | |||
13 | # Install a shared library stub -- the ".so" file used at link time to | ||
14 | # prepare a program for dynamically linking a library at run time | ||
15 | @@ -257,9 +257,9 @@ | ||
16 | install.sharedlibstub: $(PKGDIR)/link | ||
17 | ifeq ($(NETPBMLIBTYPE),unixshared) | ||
18 | # install the link-time (.so) links to the runtime libraries | ||
19 | - cd $(PKGDIR)/link ; \ | ||
20 | + cd $(PKGDIR)/lib ; \ | ||
21 | rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ | ||
22 | - $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ | ||
23 | + $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ | ||
24 | libnetpbm.$(NETPBMLIBSUFFIX) | ||
25 | endif | ||
26 | ifeq ($(NETPBMLIBTYPE),dll) | ||
27 | --- a/GNUmakefile | ||
28 | +++ b/GNUmakefile | ||
29 | @@ -87,6 +87,9 @@ | ||
30 | |||
31 | .PHONY: nonmerge | ||
32 | nonmerge: $(PRODUCT_SUBDIRS:%=%/all) | ||
33 | + | ||
34 | +$(PRODUCT_SUBDIRS:%=%/all): buildtools/all | ||
35 | +converter/all analyzer/all editor/all generator/all other/all: lib/all | ||
36 | |||
37 | # Parallel make (make --jobs) is not smart enough to coordinate builds | ||
38 | # between submakes, so a naive parallel make would cause certain |