[gentoo-commits] gentoo-x86 commit in app-text/xdvik/files: xdvik-22.84.16-parallel_make.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/04/26 09:55:10

  Added:                xdvik-22.84.16-parallel_make.patch
  Log:
  Fix parallel make failure wrt #293541 by Ed Catmur.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch?rev=1.1&content-type=text/plain

Index: xdvik-22.84.16-parallel_make.patch
===================================================================
http://bugs.gentoo.org/show_bug.cgi?id=293541

--- Makefile.in
+++ Makefile.in
@@ -46,11 +46,13 @@ LIBKPATHSEADEP=@LIBKPATHSEADEP@
 x_link = $(LDLIBT1) $(LDLIBKPATHSEA) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
 
 TESTS=./tests/run_tests
-TESTS_DEP=$(TESTS)
+TESTS_DEP=tests
+.PHONY: $(TESTS_DEP)
 
 # various xdvik GUI elements
 LIBGUI=./gui/libgui.a
-LIBGUIDEP=$(LIBGUI)
+LIBGUIDEP=gui
+.PHONY: $(LIBGUIDEP)
 
 
 # Extra xdvi-specific compiler options.
@@ -106,18 +108,14 @@ objects = \
 perlprog = t1mapper
 manpage = xdvi
 
-default all: libguibuild @final_exec_name@ $(manpage).1
+default all: $(LIBGUIDEP) @final_exec_name@ $(manpage).1
 
-$(LIBGUI):
+$(LIBGUIDEP):
 	cd gui; $(MAKE) $(makeargs) libgui.a
 
-$(TESTS):
+$(TESTS_DEP):
 	cd tests; $(MAKE) $(makeargs)
 
-### we need this additional target so that libgui is always checked to be up-to-date ...
-libguibuild:
-	cd gui; $(MAKE) $(makeargs) libgui.a
-
 test:
 	cd tests; $(MAKE) $(makeargs) test