diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-10-15 12:06:57 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-10-15 12:06:57 +0000 |
| commit | d600d1eb82add7fd4377793185c94d5dfce95089 (patch) | |
| tree | a61c0a24ecc63e5e46e7d24e22254f39b978d208 | |
| parent | Update 040_link_gcc45.patch to 040_link-gtk2.patch (diff) | |
| download | w3m-d600d1eb82add7fd4377793185c94d5dfce95089.tar.gz w3m-d600d1eb82add7fd4377793185c94d5dfce95089.zip | |
Update 090_parallel-make.patch to fix scripts and w3mimg
| -rw-r--r-- | debian/patches/090_parallel-make.patch | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/debian/patches/090_parallel-make.patch b/debian/patches/090_parallel-make.patch index 4291e59..4912a38 100644 --- a/debian/patches/090_parallel-make.patch +++ b/debian/patches/090_parallel-make.patch @@ -1,15 +1,37 @@ -Description: Patch from Gentoo to fix parallel make issue -Origin: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.3-parallel-make.patch?revision=1.1&view=markup +Subject: Fix parallel make issue +From: Tatsuya Kinoshita <tats@debian.org> +Bug: https://sourceforge.net/p/w3m/patches/64/ -diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in ---- w3m-0.5.3.orig/w3mimg/Makefile.in 2011-01-04 18:22:28.000000000 +0900 -+++ w3m-0.5.3/w3mimg/Makefile.in 2011-02-02 11:35:47.725076601 +0900 -@@ -22,6 +22,8 @@ + Depend on funcname.tab to fix parallel make issue of scripts + + Avoid prerequisite $(IMGOBJS) to fix parallel make issue of w3mimg + +diff --git a/Makefile.in b/Makefile.in +index 52a0aae..b283f29 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -250,7 +250,7 @@ install-po: + (cd $$subdir && $(MAKE) install); \ + done + +-all-scripts: ++all-scripts: funcname.tab + for dir in $(SCRIPTSUBDIRS); \ + do \ + (cd $$dir && $(MAKE) $(MAKE_ARGS)); \ +diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in +index dfc550c..8e2ad73 100644 +--- a/w3mimg/Makefile.in ++++ b/w3mimg/Makefile.in +@@ -16,9 +16,9 @@ IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@ + IMGOBJS=@IMGOBJS@ + + .PHONY: $(SUBDIRS) +-all: @IMGTARGETS@ w3mimg.a ++all: w3mimg.a + +-w3mimg.a: $(IMGOBJS) ++w3mimg.a: w3mimg.o @IMGTARGETS@ $(AR) rv $@ $(IMGOBJS) $(RANLIB) $@ -+$(IMGOBJS): @IMGTARGETS@ -+ - w3mimg.o: w3mimg.c - $(CC) $(CFLAGS) -c $< - |