Date: Wed, 23 May 2007 00:41:19 -0500 From: "Scot Hetzel" <swhetzel@gmail.com> To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org Subject: Re: ports/112203: Mk/bsd.port.mk - Fix detection of 32bit libraries on FreeBSD/amd64, ia64 Message-ID: <790a9fff0705222241u41d4cfdbvb2ee6872e7e9bda2@mail.gmail.com> In-Reply-To: <200704280810.l3S8A61l008944@freefall.freebsd.org> References: <200704280759.l3S7x4dL014303@www.freebsd.org> <200704280810.l3S8A61l008944@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_122313_18068741.1179898879833 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline The current lib-depends target has two problems with detection of 32 bit libraries on 64 bit systems: 1. If a 32 bit library is installed, it fails to detect that the 32 bit library is installed. 2. If a 32 bit library is not installed, it installs the dependancy, but fails to detect that the dependancy was installed. The first patch fixed the first case, but failed to fix the second case. The attached patch fixes both cases. Scot -- DISCLAIMER: No electrons were mamed while sending this message. Only slightly bruised. ------=_Part_122313_18068741.1179898879833 Content-Type: application/octet-stream; name=patch-bsd.port.mk-2 Content-Transfer-Encoding: base64 X-Attachment-Id: f_f21d9qss Content-Disposition: attachment; filename="patch-bsd.port.mk-2" SW5kZXg6IGJzZC5wb3J0Lm1rCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMv TWsvYnNkLnBvcnQubWssdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNTY3CmRpZmYgLXUgLXIxLjU2 NyBic2QucG9ydC5tawotLS0gYnNkLnBvcnQubWsJMjEgTWF5IDIwMDcgMTA6MjE6MzkgLTAwMDAJ MS41NjcKKysrIGJzZC5wb3J0Lm1rCTIzIE1heSAyMDA3IDA0OjQ5OjI1IC0wMDAwCkBAIC0xMjE0 LDI5ICsxMjE0LDYgQEAKIE1BU1RFUl9QT1JUPz0KIC5lbmRpZgogCi0jIENoZWNrIHRoZSBjb21w YXRpYmlsaXR5IGxheWVyIGZvciBhbWQ2NC9pYTY0Ci0KLS5pZiAke0FSQ0h9ID09ICJhbWQ2NCIg fHwgJHtBUkNIfSA9PSJpYTY0IgotLmlmIGV4aXN0cygvdXNyL2xpYjMyKQotSEFWRV9DT01QQVRf SUEzMl9MSUJTPz0gIFlFUwotLmVuZGlmCi0uaWYgIWRlZmluZWQoSEFWRV9DT01QQVRfSUEzMl9L RVJOKQotSEFWRV9DT01QQVRfSUEzMl9LRVJOIT0gaWYgJHtTWVNDVEx9IC1hIGNvbXBhdC5pYTMy Lm1heHZtZW0gPi9kZXYvbnVsbCAyPiYxOyB0aGVuIGVjaG8gWUVTOyBmaQotLmVuZGlmCi0uZW5k aWYKLQotLmlmIGRlZmluZWQoSUEzMl9CSU5BUllfUE9SVCkgJiYgJHtBUkNIfSAhPSAiaTM4NiIK LS5pZiAke0FSQ0h9ID09ICJhbWQ2NCIgfHwgJHtBUkNIfSA9PSAiaWE2NCIKLS5pZiAhZGVmaW5l ZChIQVZFX0NPTVBBVF9JQTMyX0tFUk4pCi1JR05PUkU9IHlvdSBuZWVkIGEga2VybmVsIHdpdGgg Y29tcGlsZWQtaW4gSUEzMiBjb21wYXRpYmlsaXR5IHRvIHVzZSB0aGlzIHBvcnQuCi0uZWxpZiAh ZGVmaW5lZChIQVZFX0NPTVBBVF9JQTMyX0xJQlMpCi1JR05PUkU9IHlvdSBuZWVkIHRoZSAzMi1i aXQgbGlicmFyaWVzIGluc3RhbGxlZCB1bmRlciAvdXNyL2xpYjMyIHRvIHVzZSB0aGlzIHBvcnQu Ci0uZW5kaWYKLS5lbHNlCi1JR05PUkU9IHlvdSBoYXZlIHRvIHVzZSBpMzg2IChvciBjb21wYXRp YmxlKSBwbGF0Zm9ybSB0byB1c2UgdGhpcyBwb3J0LgotLmVuZGlmCi0uZW5kaWYKLQogIyBJZiB0 aGV5IGV4aXN0LCBpbmNsdWRlIE1ha2VmaWxlLmluYywgdGhlbiBhcmNoaXRlY3R1cmUvb3BlcmF0 aW5nCiAjIHN5c3RlbSBzcGVjaWZpYyBNYWtlZmlsZXMsIHRoZW4gbG9jYWwgTWFrZWZpbGUubG9j YWwuCiAKQEAgLTE2OTksNiArMTY3NiwzNCBAQAogLmVuZGlmCiAuZW5kaWYKIAorIyBDaGVjayB0 aGUgY29tcGF0aWJpbGl0eSBsYXllciBmb3IgYW1kNjQvaWE2NAorCisuaWYgJHtBUkNIfSA9PSAi YW1kNjQiIHx8ICR7QVJDSH0gPT0iaWE2NCIKKy5pZiBleGlzdHMoL3Vzci9saWIzMikKK0hBVkVf Q09NUEFUX0lBMzJfTElCUz89ICBZRVMKKy5lbmRpZgorLmlmICFkZWZpbmVkKEhBVkVfQ09NUEFU X0lBMzJfS0VSTikKK0hBVkVfQ09NUEFUX0lBMzJfS0VSTiE9IGlmICR7U1lTQ1RMfSAtYSBjb21w YXQuaWEzMi5tYXh2bWVtID4vZGV2L251bGwgMj4mMTsgdGhlbiBlY2hvIFlFUzsgZmkKKy5lbmRp ZgorLmVuZGlmCisKKy5pZiBkZWZpbmVkKElBMzJfQklOQVJZX1BPUlQpICYmICR7QVJDSH0gIT0g ImkzODYiCisuaWYgJHtBUkNIfSA9PSAiYW1kNjQiIHx8ICR7QVJDSH0gPT0gImlhNjQiCisuaWYg IWRlZmluZWQoSEFWRV9DT01QQVRfSUEzMl9LRVJOKQorSUdOT1JFPSB5b3UgbmVlZCBhIGtlcm5l bCB3aXRoIGNvbXBpbGVkLWluIElBMzIgY29tcGF0aWJpbGl0eSB0byB1c2UgdGhpcyBwb3J0Lgor LmVsaWYgIWRlZmluZWQoSEFWRV9DT01QQVRfSUEzMl9MSUJTKQorSUdOT1JFPSB5b3UgbmVlZCB0 aGUgMzItYml0IGxpYnJhcmllcyBpbnN0YWxsZWQgdW5kZXIgL3Vzci9saWIzMiB0byB1c2UgdGhp cyBwb3J0LgorLmVuZGlmCitfTERDT05GSUdfRkxBR1M9LTMyCitMSUIzMkRJUj0JbGliMzIKKy5l bHNlCitJR05PUkU9IHlvdSBoYXZlIHRvIHVzZSBpMzg2IChvciBjb21wYXRpYmxlKSBwbGF0Zm9y bSB0byB1c2UgdGhpcyBwb3J0LgorLmVuZGlmCisuZWxzZQorTElCMzJESVI9CWxpYgorLmVuZGlm CitQTElTVF9TVUIrPQlMSUIzMkRJUj0ke0xJQjMyRElSfQorCiAuaWYgZGVmaW5lZChVU0VfWklQ KQogRVhUUkFDVF9ERVBFTkRTKz0JdW56aXA6JHtQT1JUU0RJUn0vYXJjaGl2ZXJzL3VuemlwCiAu ZW5kaWYKQEAgLTM5NzksNiArMzk4NCwxMiBAQAogLmVuZGlmCiAjIFRoaXMgY2FuIGJlIHJlbW92 ZWQgb25jZSBhbGwgcG9ydHMgaGF2ZSBiZWVuIGNvbnZlcnRlZCB0byBVU0VfTERDT05GSUcuCiAu aWYgZGVmaW5lZChJTlNUQUxMU19TSExJQikKKy5pZiBkZWZpbmVkKFVTRV9MRENPTkZJRykKKwlA JHtFQ0hPX01TR30gIj09PT4gICBJTlNUQUxMU19TSExJQiBhbmQgVVNFX0xEQ09ORklHIGJvdGgg ZGVmaW5lZC4iCisuZW5kaWYKKy5pZiBkZWZpbmVkKFVTRV9MRENPTkZJRzMyKQorCUAke0VDSE9f TVNHfSAiPT09PiAgIElOU1RBTExTX1NITElCIGFuZCBVU0VfTERDT05GSUczMiBib3RoIGRlZmlu ZWQuIgorLmVuZGlmCiAuaWYgIWRlZmluZWQoSU5TVEFMTF9BU19VU0VSKQogLmlmICFkZWZpbmVk KERFU1RESVIpCiAJQCR7RUNIT19NU0d9ICI9PT0+ICAgUnVubmluZyBsZGNvbmZpZyIKQEAgLTQ5 NzIsNyArNDk4Myw3IEBACiAJCWZpOyBcCiAJCWlmIFsgLXogIiR7REVTVERJUn0iIF0gOyB0aGVu IFwKIAkJCSR7RUNIT19NU0d9IC1uICI9PT0+ICAgJHtQS0dOQU1FfSBkZXBlbmRzIG9uIHNoYXJl ZCBsaWJyYXJ5OiAkJGxpYiI7IFwKLQkJCWlmICR7TERDT05GSUd9IC1yIHwgJHtHUkVQfSAtdndG IC1lICIke1BLR0NPTVBBVERJUn0iIHwgJHtHUkVQfSAtcXdFIC1lICItbCQkcGF0dGVybiI7IHRo ZW4gXAorCQkJaWYgJHtMRENPTkZJR30gJHtfTERDT05GSUdfRkxBR1N9IC1yIHwgJHtHUkVQfSAt dndGIC1lICIke1BLR0NPTVBBVERJUn0iIHwgJHtHUkVQfSAtcXdFIC1lICItbCQkcGF0dGVybiI7 IHRoZW4gXAogCQkJCSR7RUNIT19NU0d9ICIgLSBmb3VuZCI7IFwKIAkJCQlpZiBbICR7X0RFUEVO RF9BTFdBWVN9ID0gMSBdOyB0aGVuIFwKIAkJCQkJJHtFQ0hPX01TR30gIiAgICAgICAoYnV0IGJ1 aWxkaW5nIGl0IGFueXdheSkiOyBcCkBAIC00OTg2LDcgKzQ5OTcsNyBAQAogCQkJZmk7IFwKIAkJ ZWxzZSBcCiAJCQkke0VDSE9fTVNHfSAtbiAiPT09PiAgICR7UEtHTkFNRX0gZGVwZW5kcyBvbiBz aGFyZWQgbGlicmFyeSBpbiAke0RFU1RESVJ9OiAkJGxpYiI7IFwKLQkJCWlmICR7Q0hST09UfSAk e0RFU1RESVJ9ICR7TERDT05GSUd9IC1yIHwgJHtHUkVQfSAtdndGIC1lICIke1BLR0NPTVBBVERJ Un0iIHwgJHtHUkVQfSAtcXdFIC1lICItbCQkcGF0dGVybiI7IHRoZW4gXAorCQkJaWYgJHtDSFJP T1R9ICR7REVTVERJUn0gJHtMRENPTkZJR30gJHtfTERDT05GSUdfRkxBR1N9IC1yIHwgJHtHUkVQ fSAtdndGIC1lICIke1BLR0NPTVBBVERJUn0iIHwgJHtHUkVQfSAtcXdFIC1lICItbCQkcGF0dGVy biI7IHRoZW4gXAogCQkJCSR7RUNIT19NU0d9ICIgLSBmb3VuZCI7IFwKIAkJCQlpZiBbICR7X0RF UEVORF9BTFdBWVN9ID0gMSBdOyB0aGVuIFwKIAkJCQkJJHtFQ0hPX01TR30gIiAgICAgICAoYnV0 IGJ1aWxkaW5nIGl0IGFueXdheSkiOyBcCkBAIC01MDA1LDcgKzUwMTYsNyBAQAogCQkJCSR7RUNI T19NU0d9ICIgICAgID0+IE5vIGRpcmVjdG9yeSBmb3IgJCRsaWIuICBTa2lwcGluZy4uIjsgXAog CQkJZWxzZSBcCiAJCQkJJHtfSU5TVEFMTF9ERVBFTkRTfSBcCi0JCQkJaWYgISAke0xEQ09ORklH fSAtciB8ICR7R1JFUH0gLXZ3RiAtZSAiJHtQS0dDT01QQVRESVJ9IiB8ICR7R1JFUH0gLXF3RSAt ZSAiLWwkJHBhdHRlcm4iOyB0aGVuIFwKKwkJCQlpZiAhICR7TERDT05GSUd9ICR7X0xEQ09ORklH X0ZMQUdTfSAtciB8ICR7R1JFUH0gLXZ3RiAtZSAiJHtQS0dDT01QQVRESVJ9IiB8ICR7R1JFUH0g LXF3RSAtZSAiLWwkJHBhdHRlcm4iOyB0aGVuIFwKIAkJCQkJJHtFQ0hPX01TR30gIkVycm9yOiBz aGFyZWQgbGlicmFyeSBcIiQkbGliXCIgZG9lcyBub3QgZXhpc3QiOyBcCiAJCQkJCSR7RkFMU0V9 OyBcCiAJCQkJZmk7IFwK ------=_Part_122313_18068741.1179898879833--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?790a9fff0705222241u41d4cfdbvb2ee6872e7e9bda2>