From owner-freebsd-hackers@FreeBSD.ORG Thu Oct 25 22:00:24 2012 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AEADAEB2; Thu, 25 Oct 2012 22:00:24 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id AF14B8FC0C; Thu, 25 Oct 2012 22:00:23 +0000 (UTC) Received: by mail-la0-f54.google.com with SMTP id e12so2606328lag.13 for ; Thu, 25 Oct 2012 15:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=5SHKNLtiAlP3vb6aQjkFBJcwAtTu7QqCwk30eZIivYI=; b=uPJ3s+XC8O32P+9NkfEJ3KfIEKY+KOl2R5lgfEsxkJg6RMKw2LbKQ21AgV3vTAoWkm PT9HByxHy3lCXDO8GeWqElp0py4Hetkgf1SAiXoQ/ooUONRxqCJGkCTEx4TfRTwo6KoZ zcqUuMz4GJbUVAKqBG4q9sbvEJ40/cNO2eBh3WLeAAlf3Yjkd/1+TRpaSg2+Xs2CXsqU XoKDWXi6Ax4v7NCGR6ulWtfFBVwc7SEY58LRylPdpLpPjJk2K5B5WnYBH/ZKliJj0fGv UJ++YShsznHaXnP1GbJu2ta7qnRgFPlUR10jR9H3XQw0vqZyGEmNlh8R+mX4ym8DVy53 oxAw== MIME-Version: 1.0 Received: by 10.112.42.201 with SMTP id q9mr8152578lbl.28.1351202422109; Thu, 25 Oct 2012 15:00:22 -0700 (PDT) Received: by 10.112.43.232 with HTTP; Thu, 25 Oct 2012 15:00:21 -0700 (PDT) Date: Thu, 25 Oct 2012 15:00:21 -0700 Message-ID: Subject: Installing make as pmake when WITH_BMAKE specified (was Re: [CFT/RFC]: refactor bsd.prog.mk to understand multiple programs instead of a singular program) From: Garrett Cooper To: Marcel Moolenaar Content-Type: multipart/mixed; boundary=90e6ba30915663b88d04cce954bf Cc: freebsd-hackers@freebsd.org, "Simon J. Gerraty" , freebsd-arch@freebsd.org X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2012 22:00:24 -0000 --90e6ba30915663b88d04cce954bf Content-Type: text/plain; charset=ISO-8859-1 On Thu, Oct 25, 2012 at 2:32 PM, Garrett Cooper wrote: ... > The real issue is that I need to take the patch Simon developed, run > with it, and in parallel he needs to -- and hopefully already is -- > engage portmgr to get it through a number of exp- runs to make sure > bmake does what it's supposed to do with his patch. Backwards > compatibility will need to be maintained for ports because ports has > to work on multiple versions of FreeBSD [where bmake isn't yet > available/present], so maybe a fork in the road for bsd.port.mk should > be devised in order to make everything work. Here's an updated version of the workaround that works properly in all cases and installs bmake as make and links make to pmake when WITH_BMAKE=yes, and installs make as make when WITHOUT_BMAKE is specified (this works better than the previous patch I sent to Simon). The point of the patch isn't to discourage bmake use; in fact this encourages bmake use more because I'm able to use bmake as my system make, but be able to fall back to pmake as needed. Thanks! -Garrett --90e6ba30915663b88d04cce954bf Content-Type: application/octet-stream; name="install-make-as-pmake-when-WITH_BMAKE-specified.patch" Content-Disposition: attachment; filename="install-make-as-pmake-when-WITH_BMAKE-specified.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h8qec0yz0 SW5kZXg6IHN5cy9jb25mL2tlcm4ucG9zdC5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMvY29uZi9rZXJu LnBvc3QubWsJKHJldmlzaW9uIDI0MTk3MykKKysrIHN5cy9jb25mL2tlcm4ucG9zdC5tawkod29y a2luZyBjb3B5KQpAQCAtNjEsMTIgKzYxLDIxIEBACiAJT1NWRVJTSU9OPSR7T1NSRUxEQVRFfSBc CiAJV1JLRElSUFJFRklYPSR7V1JLRElSUFJFRklYfQogCisuaWYgZGVmaW5lZCguUEFSU0VGSUxF KQorIyBSZW1vdmUgYm1ha2Utb25seSBzdXBwb3J0ZWQgTUFLRUZMQUdTCitQT1JUU01BS0VGTEFH Uzo9ICR7TUFLRUZMQUdTOnRXOlMvLU4gLy86Qy8gLVtKVF0gW14gXSsgLyAvZ30KK1BPUlRTTU9E VUxFU0VOVis9IE1BS0VGTEFHUz0iJHtQT1JUU01BS0VGTEFHU30iCitQTUFLRT0JcG1ha2UKKy5l bHNlCitQTUFLRT0JbWFrZQorLmVuZGlmCisKICMgVGhlIFdSS0RJUiBuZWVkcyB0byBiZSBjbGVh bmVkIGJlZm9yZSBidWlsZGluZywgYW5kIHRyeWluZyB0byBjaGFuZ2UgdGhlIHRhcmdldAogIyB3 aXRoIGEgOkMgcGF0dGVybiBiZWxvdyByZXN1bHRzIGluIGluc3RhbGwgLT4gaW5zdGNsZWFuCiBh bGw6CiAuZm9yIF9faSBpbiAke1BPUlRTX01PRFVMRVN9CiAJQCR7RUNIT30gIj09PT4gUG9ydHMg bW9kdWxlICR7X19pfSAoYWxsKSIKLQljZCAkJHtQT1JUU0RJUjotL3Vzci9wb3J0c30vJHtfX2l9 OyAke1BPUlRTTU9EVUxFU0VOVn0gJHtNQUtFfSAtQiBjbGVhbiBhbGwKKwljZCAkJHtQT1JUU0RJ UjotL3Vzci9wb3J0c30vJHtfX2l9OyAke1BPUlRTTU9EVUxFU0VOVn0gJHtQTUFLRX0gLUIgY2xl YW4gYWxsCiAuZW5kZm9yCiAKIC5mb3IgX190YXJnZXQgaW4gaW5zdGFsbCByZWluc3RhbGwgY2xl YW4KQEAgLTc0LDcgKzgzLDcgQEAKIHBvcnRzLSR7X190YXJnZXR9OgogLmZvciBfX2kgaW4gJHtQ T1JUU19NT0RVTEVTfQogCUAke0VDSE99ICI9PT0+IFBvcnRzIG1vZHVsZSAke19faX0gKCR7X190 YXJnZXR9KSIKLQljZCAkJHtQT1JUU0RJUjotL3Vzci9wb3J0c30vJHtfX2l9OyAke1BPUlRTTU9E VUxFU0VOVn0gJHtNQUtFfSAtQiAke19fdGFyZ2V0OkMvaW5zdGFsbC9kZWluc3RhbGwgcmVpbnN0 YWxsLzpDL3JlaW5zdGFsbC9kZWluc3RhbGwgcmVpbnN0YWxsL30KKwljZCAkJHtQT1JUU0RJUjot L3Vzci9wb3J0c30vJHtfX2l9OyAke1BPUlRTTU9EVUxFU0VOVn0gJHtQTUFLRX0gLUIgJHtfX3Rh cmdldDpDL2luc3RhbGwvZGVpbnN0YWxsIHJlaW5zdGFsbC86Qy9yZWluc3RhbGwvZGVpbnN0YWxs IHJlaW5zdGFsbC99CiAuZW5kZm9yCiAuZW5kZm9yCiAuZW5kaWYKSW5kZXg6IHVzci5iaW4vTWFr ZWZpbGUKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gdXNyLmJpbi9NYWtlZmlsZQkocmV2aXNpb24gMjQxOTczKQor KysgdXNyLmJpbi9NYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMjgwLDEwICsyODAsOSBAQAog LmlmICR7TUtfTUFLRX0gIT0gIm5vIgogLmlmICR7TUtfQk1BS0V9ICE9ICJubyIKIFNVQkRJUis9 CWJtYWtlCi0uZWxzZQorLmVuZGlmCiBTVUJESVIrPQltYWtlCiAuZW5kaWYKLS5lbmRpZgogCiAu aWYgJHtNS19NQU5fVVRJTFN9ICE9ICJubyIKIFNVQkRJUis9CWNhdG1hbgpJbmRleDogdXNyLmJp bi9tYWtlL01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHVzci5iaW4vbWFrZS9NYWtlZmlsZQkocmV2 aXNpb24gMjQxOTczKQorKysgdXNyLmJpbi9tYWtlL01ha2VmaWxlCSh3b3JraW5nIGNvcHkpCkBA IC00LDcgKzQsMTcgQEAKIAogLmluY2x1ZGUgPGJzZC5vd24ubWs+CiAKKy5pZiAhZGVmaW5lZChQ Uk9HKQorLmlmICR7TUtfQk1BS0V9ICE9ICJubyIKIFBST0c9CW1ha2UKK0xJTktTKz0JbWFrZSBw bWFrZQorLmVsc2UKK1BST0c9CXBtYWtlCitwbWFrZS4xOiBtYWtlLjEKKwljcCAkey5BTExTUkN9 ICR7LlRBUkdFVH0KK01BTj0JcG1ha2UuMQorLmVuZGlmCisuZW5kaWYKIENGTEFHUys9LUkkey5D VVJESVJ9CiBTUkNTPQlhcmNoLmMgYnVmLmMgY29uZC5jIGRpci5jIGZvci5jIGhhc2guYyBoYXNo X3RhYmxlcy5jIGpvYi5jCVwKIAlsc3QuYyBtYWluLmMgbWFrZS5jIHBhcnNlLmMgcHJvYy5jIHNo ZWxsLmMgc3RyLmMgc3VmZi5jIHRhcmcuYwlcCg== --90e6ba30915663b88d04cce954bf--