Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Jan 2012 18:42:53 GMT
From:      Garrett Cooper <yanegomi@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/164488: [patch] [devel/talloc, devel/tdb] fix compile with MAKE_JOBS_UNSAFE=y
Message-ID:  <201201251842.q0PIgrI1091161@red.freebsd.org>
Resent-Message-ID: <201201251850.q0PIo1k1081121@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         164488
>Category:       ports
>Synopsis:       [patch] [devel/talloc,devel/tdb] fix compile with MAKE_JOBS_UNSAFE=y
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 25 18:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        n/a
>Organization:
n/a
>Environment:
n/a
>Description:
There's a bug in the ports Makefile for both databases/tdb and devel/talloc where if MAKE_JOBS_UNSAFE=y is specified when compiling the port it will fail when passing -j to the waf script as it's passing an empty _MAKE_JOBS value.

The check in the ports Makefile should instead check for _MAKE_JOBS being empty as this it what the code in bsd.port.mk currently does when either DISABLE_MAKE_JOBS or MAKE_JOBS_UNSAFE is specified on the command line.
>How-To-Repeat:
make -C /usr/ports/devel/talloc MAKE_JOBS_UNSAFE=y all
>Fix:


Patch attached with submission follows:

--- databases/tdb/Makefile	2012-01-25 10:37:01.794064453 -0800
+++ databases/tdb/Makefile	2012-01-25 10:37:16.549068673 -0800
@@ -57,7 +57,7 @@
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 
-.if !defined(DISABLE_MAKE_JOBS)
+.if !empty(_MAKE_JOBS)
 CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
 _MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
 .endif
--- devel/talloc/Makefile	2012-01-25 10:27:00.001064924 -0800
+++ devel/talloc/Makefile	2012-01-25 10:36:46.282447100 -0800
@@ -50,7 +50,7 @@
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 
-.if !defined(DISABLE_MAKE_JOBS)
+.if !empty(_MAKE_JOBS)
 CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
 _MAKE_JOBS=		--jobs=${MAKE_JOBS_NUMBER}
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201251842.q0PIgrI1091161>