More speed increases for make-ing ports

Stephen Montgomery-Smith stephen at math.missouri.edu
Thu May 24 12:55:13 UTC 2007


Pav Lucistnik wrote:
> Stephen Montgomery-Smith píše v čt 24. 05. 2007 v 07:35 -0500:
>> Pav Lucistnik wrote:
>>> Stephen Montgomery-Smith píše v st 23. 05. 2007 v 20:04 -0500:
>>>
>>>> I'm getting kind of uncomfortable with the patch.  I looked some more
>>>> in 
>>>> bsd.gnome.mk and it seems to me that the suggested patch is really 
>>>> equivalent to the patch enclosed here.
>>>>
>>>> Why did the writer of bsd.gnome.mk have the rather complicated 
>>>> construction which I am proposing to replace?
>>> I don't know, we'd have to ask Joe Marcus. Here is the revision in
>>> question:
>>>
>>> http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.gnome.mk.diff?r1=1.22;r2=1.23
>>>
>>> You're basically reverting that revision. Perhaps our make(1) wasn't
>>> smart enough those four years ago, I don't know.
>> I'm not really reverting that revision.  As it was prior to that 
>> revision, I can see it not working under many circumstances.  Namely, if 
>> ${component} appears more than once in ${_USE_GNOME} - something that 
>> will happen frequently - the test will not work.
>>
>> My revision seems the obvious way to do it to me, but I can see that if 
>> someone was working with what Joe was working with, that one could be 
>> lead to think up his revision.  I know that I myself have missed the 
>> obvious in many circumstance.
> 
> Please send me the patch again, as an attachment, I'll give it some
> workout :)
> 

Here it is.
-------------- next part --------------
--- bsd.gnome.mk-orig	Mon Mar 19 23:13:36 2007
+++ bsd.gnome.mk	Wed May 23 19:25:19 2007
@@ -689,9 +689,9 @@
 
 # Then traverse through all components, check which of them
 # exist in ${_USE_GNOME} and set variables accordingly
+.ifdef _USE_GNOME
 . for component in ${_USE_GNOME_ALL}
-_COMP_TEST=	${_USE_GNOME:M${component}}
-.  if ${_COMP_TEST:S/${component}//}!=${_COMP_TEST:S/  / /g}
+.  if ${_USE_GNOME:M${component}}!=""
 PATCH_DEPENDS+=	${${component}_PATCH_DEPENDS}
 FETCH_DEPENDS+=	${${component}_FETCH_DEPENDS}
 EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS}
@@ -725,6 +725,7 @@
 
 .  endif
 . endfor
+.endif
 .endif
 
 .if defined(GNOME_PRE_PATCH)


More information about the freebsd-ports mailing list