From owner-svn-src-user@FreeBSD.ORG  Sat Jul 20 15:09:28 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6AA05D4;
 Sat, 20 Jul 2013 15:09:28 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5DDF2694;
 Sat, 20 Jul 2013 15:09:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6KF9SpR020151;
 Sat, 20 Jul 2013 15:09:28 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6KF9SSg020150;
 Sat, 20 Jul 2013 15:09:28 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201307201509.r6KF9SSg020150@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 20 Jul 2013 15:09:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253501 - user/nwhitehorn/condorports
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jul 2013 15:09:28 -0000

Author: nwhitehorn
Date: Sat Jul 20 15:09:27 2013
New Revision: 253501
URL: http://svnweb.freebsd.org/changeset/base/253501

Log:
  Make multi-arch submissions actually work.

Modified:
  user/nwhitehorn/condorports/package.sub

Modified: user/nwhitehorn/condorports/package.sub
==============================================================================
--- user/nwhitehorn/condorports/package.sub	Sat Jul 20 14:54:43 2013	(r253500)
+++ user/nwhitehorn/condorports/package.sub	Sat Jul 20 15:09:27 2013	(r253501)
@@ -2,7 +2,9 @@ executable = buildport.sh
 universe = vanilla
 notification = never # failure?
 
-requirements = stringListMember($(BuildArch), SupportedABIs)
+# Require that the job run on a machine that supports our build architecture
+# The "potemkin" is to suppress Condor's implicit Arch requirement
+requirements = Arch=="potemkin" || stringListMember("$(BuildArch)", TARGET.SupportedABIs)
 
 log=/tmp/condorlog
 output=logs/$(pkg).out