From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2F812138247 for ; Wed, 13 Nov 2013 09:14:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09135E0AC0; Wed, 13 Nov 2013 09:14:44 +0000 (UTC) Received: from smtp.salomon.at (smtp.salomon.at [193.186.16.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8725E0A6B for ; Wed, 13 Nov 2013 09:14:42 +0000 (UTC) Received: from samail03.wamas.com ([172.28.2.2] helo=mailhost.salomon.at) by smtp.salomon.at with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77) (envelope-from ) id 1VgWX2-0006KS-JT; Wed, 13 Nov 2013 10:14:41 +0100 Received: from [172.28.8.170] by mailhost.salomon.at with esmtp (Exim 4.77) (envelope-from ) id 1VgWX2-0005xo-DK; Wed, 13 Nov 2013 10:14:40 +0100 Message-ID: <52834300.9090703@gentoo.org> Date: Wed, 13 Nov 2013 10:14:40 +0100 From: Michael Haubenwallner User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130923 Thunderbird/17.0.8 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] libtool.eclass: Have elibtoolize explicitly apply configure patches Content-Type: multipart/mixed; boundary="------------030904050907080105020601" X-Archives-Salt: f49141ca-989d-4cbc-bfb0-53076643efd6 X-Archives-Hash: ebf391a85c57bdbd2095d88aeaa1aaca This is a multi-part message in MIME format. --------------030904050907080105020601 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi all, as you might or might not be aware of, elibtoolize() originally was for applying patches to ltmain.sh, but now also applies patches to configure scripts. The problem is that finding configure scripts to be patched is based on where ltmain.sh is found in ${S}, wild guessing that ltmain.sh may reside in subdirectories, trying ./configure, ../configure and ../../configure inconsistently. But especially with gettext, this wild guess does not identify each configure script. Attached patch drops that wild guesses, explicitly applying configure-patches to configure scripts, while still explicitly applying ltconf.sh-patches to ltconf.sh. WDYT? Thank you! /haubi/ --------------030904050907080105020601 Content-Type: text/plain; charset=UTF-8; name="elibtoolize-conf.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="elibtoolize-conf.diff" SW5kZXg6IGxpYnRvb2wuZWNsYXNzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC92YXIvY3Zz cm9vdC9nZW50b28teDg2L2VjbGFzcy9saWJ0b29sLmVjbGFzcyx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4xMDYKZGlmZiAtdSAtcjEuMTA2IGxpYnRvb2wuZWNsYXNzCi0tLSBsaWJ0b29s LmVjbGFzcwkxMSBNYXkgMjAxMyAxMToxNzo1OCAtMDAwMAkxLjEwNgorKysgbGlidG9vbC5l Y2xhc3MJMTIgTm92IDIwMTMgMTA6MTA6NDYgLTAwMDAKQEAgLTIwNCw5ICsyMDQsOSBAQAog CSMgUmV1c2UgIiRAIiBmb3IgZGlycyB0byBwYXRjaAogCXNldCAtLQogCWlmIFtbICR7ZG9f c2hhbGxvd30gPT0gInllcyIgXV0gOyB0aGVuCi0JCVtbIC1mICR7U30vbHRtYWluLnNoIF1d ICYmIHNldCAtLSAiJHtTfSIKKwkJW1sgLWYgJHtTfS9sdG1haW4uc2ggfHwgLWYgJHtTfS9j b25maWd1cmUgXV0gJiYgc2V0IC0tICIke1N9IgogCWVsc2UKLQkJc2V0IC0tICQoZmluZCAi JHtTfSIgLW5hbWUgbHRtYWluLnNoIC1wcmludGYgJyVoICcpCisJCXNldCAtLSAkKGZpbmQg IiR7U30iICcoJyAtbmFtZSBsdG1haW4uc2ggLW8gLW5hbWUgY29uZmlndXJlICcpJyAtcHJp bnRmICclaCAnKQogCWZpCiAKIAlsb2NhbCBkIHAKQEAgLTIyNSw4ICsyMjUsMTIgQEAKIAkJ CWV3YXJuICIgIGF2b2lkIHRoaXMgaWYgcG9zc2libGUgKHBlcmhhcHMgYnkgZmlsaW5nIGEg YnVnKSIKIAkJZmkKIAorCQlsb2NhbCByZXQKKworCQkjIHBhdGNoaW5nIGx0bWFpbi5zaAor CQlbWyAtZiAke2R9L2x0bWFpbi5zaCBdXSAmJgogCQlmb3IgcCBpbiAke2VsdF9wYXRjaGVz fSA7IGRvCi0JCQlsb2NhbCByZXQ9MAorCQkJcmV0PTAKIAogCQkJY2FzZSAke3B9IGluCiAJ CQkJcG9ydGFnZSkKQEAgLTI1OCwxNyArMjYyLDYgQEAKIAkJCQkJRUxUX3dhbGtfcGF0Y2hl cyAiJHtkfS9sdG1haW4uc2giICIke3B9IgogCQkJCQlyZXQ9JD8KIAkJCQkJOzsKLQkJCQl1 Y2xpYmMtY29uZikKLQkJCQkJaWYgZ3JlcCAtcXMgJ1RyYW5zZm9ybSBsaW51eCcgIiR7ZH0v Y29uZmlndXJlIiA7IHRoZW4KLQkJCQkJCUVMVF93YWxrX3BhdGNoZXMgIiR7ZH0vY29uZmln dXJlIiAiJHtwfSIKLQkJCQkJCXJldD0kPwotCQkJCQkjIGx0bWFpbi5zaCBhbmQgY28gbWln aHQgYmUgaW4gYSBzdWJkaXJlY3RvcnkgLi4uCi0JCQkJCWVsaWYgW1sgISAtZSAke2R9L2Nv bmZpZ3VyZSBdXSAmJiBcCi0JCQkJCQkgZ3JlcCAtcXMgJ1RyYW5zZm9ybSBsaW51eCcgIiR7 ZH0vLi4vY29uZmlndXJlIiA7IHRoZW4KLQkJCQkJCUVMVF93YWxrX3BhdGNoZXMgIiR7ZH0v Li4vY29uZmlndXJlIiAiJHtwfSIKLQkJCQkJCXJldD0kPwotCQkJCQlmaQotCQkJCQk7Owog CQkJCXVjbGliYy1sdGNvbmYpCiAJCQkJCSMgTmV3ZXIgbGlidG9vbGl6ZSBjbGVhcnMgbHRj b25maWcsIGFzIG5vdCB1c2VkIGFueW1vcmUKIAkJCQkJaWYgW1sgLXMgJHtkfS9sdGNvbmZp ZyBdXSA7IHRoZW4KQEAgLTI3NiwzNCArMjY5LDEyIEBACiAJCQkJCQlyZXQ9JD8KIAkJCQkJ ZmkKIAkJCQkJOzsKLQkJCQlmYnNkLWNvbmYpCi0JCQkJCWlmIGdyZXAgLXFzICd2ZXJzaW9u X3R5cGU9ZnJlZWJzZC0nICIke2R9L2NvbmZpZ3VyZSIgOyB0aGVuCi0JCQkJCQlFTFRfd2Fs a19wYXRjaGVzICIke2R9L2NvbmZpZ3VyZSIgIiR7cH0iCi0JCQkJCQlyZXQ9JD8KLQkJCQkJ IyBsdG1haW4uc2ggYW5kIGNvIG1pZ2h0IGJlIGluIGEgc3ViZGlyZWN0b3J5IC4uLgotCQkJ CQllbGlmIFtbICEgLWUgJHtkfS9jb25maWd1cmUgXV0gJiYgXAotCQkJCQkJIGdyZXAgLXFz ICd2ZXJzaW9uX3R5cGU9ZnJlZWJzZC0nICIke2R9Ly4uL2NvbmZpZ3VyZSIgOyB0aGVuCi0J CQkJCQlFTFRfd2Fsa19wYXRjaGVzICIke2R9Ly4uL2NvbmZpZ3VyZSIgIiR7cH0iCi0JCQkJ CQlyZXQ9JD8KLQkJCQkJZmkKLQkJCQkJOzsKIAkJCQlmYnNkLWx0Y29uZikKIAkJCQkJaWYg W1sgLXMgJHtkfS9sdGNvbmZpZyBdXSA7IHRoZW4KIAkJCQkJCUVMVF93YWxrX3BhdGNoZXMg IiR7ZH0vbHRjb25maWciICIke3B9IgogCQkJCQkJcmV0PSQ/CiAJCQkJCWZpCiAJCQkJCTs7 Ci0JCQkJZGFyd2luLWNvbmYpCi0JCQkJCWlmIGdyZXAgLXFzICcmJiBlY2hvIFwuc28gfHwn ICIke2R9L2NvbmZpZ3VyZSIgOyB0aGVuCi0JCQkJCQlFTFRfd2Fsa19wYXRjaGVzICIke2R9 L2NvbmZpZ3VyZSIgIiR7cH0iCi0JCQkJCQlyZXQ9JD8KLQkJCQkJIyBsdG1haW4uc2ggYW5k IGNvIG1pZ2h0IGJlIGluIGEgc3ViZGlyZWN0b3J5IC4uLgotCQkJCQllbGlmIFtbICEgLWUg JHtkfS9jb25maWd1cmUgXV0gJiYgXAotCQkJCQkJIGdyZXAgLXFzICcmJiBlY2hvIFwuc28g fHwnICIke2R9Ly4uL2NvbmZpZ3VyZSIgOyB0aGVuCi0JCQkJCQlFTFRfd2Fsa19wYXRjaGVz ICIke2R9Ly4uL2NvbmZpZ3VyZSIgIiR7cH0iCi0JCQkJCQlyZXQ9JD8KLQkJCQkJZmkKLQkJ CQkJOzsKIAkJCQlkYXJ3aW4tbHRjb25mKQogCQkJCQkjIE5ld2VyIGxpYnRvb2xpemUgY2xl YXJzIGx0Y29uZmlnLCBhcyBub3QgdXNlZCBhbnltb3JlCiAJCQkJCWlmIFtbIC1zICR7ZH0v bHRjb25maWcgXV0gOyB0aGVuCkBAIC0zMjEsNDkgKzI5Miw2IEBACiAJCQkJCQlyZXQ9JD8K IAkJCQkJZmkKIAkJCQkJOzsKLQkJCQlhaXhydGx8aHB1eC1jb25mKQotCQkJCQlyZXQ9MQot CQkJCQlsb2NhbCBzdWJyZXQ9MAotCQkJCQkjIGFwcGx5IG11bHRpcGxlIHBhdGNoZXMgYXMg b2Z0ZW4gYXMgdGhleSBtYXRjaAotCQkJCQl3aGlsZSBbWyAkc3VicmV0IC1lcSAwIF1dOyBk bwotCQkJCQkJc3VicmV0PTEKLQkJCQkJCWlmIFtbIC1lICR7ZH0vY29uZmlndXJlIF1dOyB0 aGVuCi0JCQkJCQkJRUxUX3dhbGtfcGF0Y2hlcyAiJHtkfS9jb25maWd1cmUiICIke3B9Igot CQkJCQkJCXN1YnJldD0kPwotCQkJCQkJIyBsdG1haW4uc2ggYW5kIGNvIG1pZ2h0IGJlIGlu IGEgc3ViZGlyZWN0b3J5IC4uLgotCQkJCQkJZWxpZiBbWyAhIC1lICR7ZH0vY29uZmlndXJl ICYmIC1lICR7ZH0vLi4vY29uZmlndXJlIF1dIDsgdGhlbgotCQkJCQkJCUVMVF93YWxrX3Bh dGNoZXMgIiR7ZH0vLi4vY29uZmlndXJlIiAiJHtwfSIKLQkJCQkJCQlzdWJyZXQ9JD8KLQkJ CQkJCWZpCi0JCQkJCQlpZiBbWyAkc3VicmV0IC1lcSAwIF1dOyB0aGVuCi0JCQkJCQkJIyBo YXZlIGF0IGxlYXN0IG9uZSBwYXRjaCBzdWNjZWVkZWQuCi0JCQkJCQkJcmV0PTAKLQkJCQkJ CWZpCi0JCQkJCWRvbmUKLQkJCQkJOzsKLQkJCQltaW50LWNvbmZ8Z29sZC1jb25mfHNvbDIt Y29uZikKLQkJCQkJcmV0PTEKLQkJCQkJbG9jYWwgc3VicmV0PTEKLQkJCQkJaWYgW1sgLWUg JHtkfS9jb25maWd1cmUgXV07IHRoZW4KLQkJCQkJCUVMVF93YWxrX3BhdGNoZXMgIiR7ZH0v Y29uZmlndXJlIiAiJHtwfSIKLQkJCQkJCXN1YnJldD0kPwotCQkJCQkjIGx0bWFpbi5zaCBh bmQgY28gbWlnaHQgYmUgaW4gYSBzdWJkaXJlY3RvcnkgLi4uCi0JCQkJCWVsaWYgW1sgLWUg JHtkfS8uLi9jb25maWd1cmUgXV0gOyB0aGVuCi0JCQkJCQlFTFRfd2Fsa19wYXRjaGVzICIk e2R9Ly4uL2NvbmZpZ3VyZSIgIiR7cH0iCi0JCQkJCQlzdWJyZXQ9JD8KLQkJCQkJZWxpZiBb WyAtZSAke2R9Ly4uLy4uL2NvbmZpZ3VyZSBdXSA7IHRoZW4KLQkJCQkJCUVMVF93YWxrX3Bh dGNoZXMgIiR7ZH0vLi4vLi4vY29uZmlndXJlIiAiJHtwfSIKLQkJCQkJCXN1YnJldD0kPwot CQkJCQlmaQotCQkJCQlpZiBbWyAkc3VicmV0IC1lcSAwIF1dOyB0aGVuCi0JCQkJCQkjIGhh dmUgYXQgbGVhc3Qgb25lIHBhdGNoIHN1Y2NlZWRlZC4KLQkJCQkJCXJldD0wCi0JCQkJCWZp Ci0JCQkJCTs7Ci0JCQkJdGFyZ2V0LW5tKQotCQkJCQlFTFRfd2Fsa19wYXRjaGVzICIke2R9 L2NvbmZpZ3VyZSIgIiR7cH0iCi0JCQkJCXJldD0kPwotCQkJCQk7OwogCQkJCWluc3RhbGwt c2gpCiAJCQkJCUVMVF93YWxrX3BhdGNoZXMgIiR7ZH0vaW5zdGFsbC1zaCIgIiR7cH0iCiAJ CQkJCXJldD0kPwpAQCAtNDIxLDE1ICszNDksNiBAQAogCQkJCQl1Y2xpYmMtKikKIAkJCQkJ CVtbICR7Q0hPU1R9ID09ICotdWNsaWJjIF1dICYmIGV3YXJuICIgIHVDbGliYyBwYXRjaCBz ZXQgJyR7cH0nIGZhaWxlZCB0byBhcHBseSEiCiAJCQkJCQk7OwotCQkJCQlmYnNkLSopCi0J CQkJCQlpZiBbWyAke0NIT1NUfSA9PSAqLWZyZWVic2QqIF1dIDsgdGhlbgotCQkJCQkJCWlm IFtbIC16ICQoZ3JlcCAnSGFuZGxlIEdlbnRvby9GcmVlQlNEIGFzIGl0IHdhcyBMaW51eCcg XAotCQkJCQkJCQkiJHtkfS9jb25maWd1cmUiICIke2R9Ly4uL2NvbmZpZ3VyZSIgMj4vZGV2 L251bGwpIF1dOyB0aGVuCi0JCQkJCQkJCWVlcnJvciAiICBGcmVlQlNEIHBhdGNoIHNldCAn JHtwfScgZmFpbGVkIHRvIGFwcGx5ISIKLQkJCQkJCQkJZGllICJGcmVlQlNEIHBhdGNoIHNl dCAnJHtwfScgZmFpbGVkIHRvIGFwcGx5ISIKLQkJCQkJCQlmaQotCQkJCQkJZmkKLQkJCQkJ CTs7CiAJCQkJCWRhcndpbi0qKQogCQkJCQkJW1sgJHtDSE9TVH0gPT0gKiItZGFyd2luIiog XV0gJiYgZXdhcm4gIiAgRGFyd2luIHBhdGNoIHNldCAnJHtwfScgZmFpbGVkIHRvIGFwcGx5 ISIKIAkJCQkJCTs7CkBAIC00MzcsNiArMzU2LDggQEAKIAkJCWZpCiAJCWRvbmUKIAorCQkj IG1ha2VzIHNlbnNlIGZvciBsdG1haW4uc2ggcGF0Y2hlcyBvbmx5CisJCVtbIC1mICR7ZH0v bHRtYWluLnNoIF1dICYmCiAJCWlmIFtbIC16ICR7RUxUX0FQUExJRURfUEFUQ0hFU30gXV0g OyB0aGVuCiAJCQlpZiBbWyAke2RvX3BvcnRhZ2V9ID09ICJubyIgJiYgXAogCQkJCSAgJHtk b19yZXZlcnNlZGVwc30gPT0gIm5vIiAmJiBcCkBAIC00NDgsNiArMzY5LDgwIEBACiAJCQlm aQogCQlmaQogCisJCSMgcGF0Y2hpbmcgY29uZmlndXJlCisJCVtbIC1mICR7ZH0vY29uZmln dXJlIF1dICYmCisJCWZvciBwIGluICR7ZWx0X3BhdGNoZXN9IDsgZG8KKwkJCXJldD0wCisK KwkJCWNhc2UgJHtwfSBpbgorCQkJCXVjbGliYy1jb25mKQorCQkJCQlpZiBncmVwIC1xcyAn VHJhbnNmb3JtIGxpbnV4JyAiJHtkfS9jb25maWd1cmUiIDsgdGhlbgorCQkJCQkJRUxUX3dh bGtfcGF0Y2hlcyAiJHtkfS9jb25maWd1cmUiICIke3B9IgorCQkJCQkJcmV0PSQ/CisJCQkJ CWZpCisJCQkJCTs7CisJCQkJZmJzZC1jb25mKQorCQkJCQlpZiBncmVwIC1xcyAndmVyc2lv bl90eXBlPWZyZWVic2QtJyAiJHtkfS9jb25maWd1cmUiIDsgdGhlbgorCQkJCQkJRUxUX3dh bGtfcGF0Y2hlcyAiJHtkfS9jb25maWd1cmUiICIke3B9IgorCQkJCQkJcmV0PSQ/CisJCQkJ CWZpCisJCQkJCTs7CisJCQkJZGFyd2luLWNvbmYpCisJCQkJCWlmIGdyZXAgLXFzICcmJiBl Y2hvIFwuc28gfHwnICIke2R9L2NvbmZpZ3VyZSIgOyB0aGVuCisJCQkJCQlFTFRfd2Fsa19w YXRjaGVzICIke2R9L2NvbmZpZ3VyZSIgIiR7cH0iCisJCQkJCQlyZXQ9JD8KKwkJCQkJZmkK KwkJCQkJOzsKKwkJCQlhaXhydGx8aHB1eC1jb25mKQorCQkJCQlyZXQ9MQorCQkJCQlsb2Nh bCBzdWJyZXQ9MAorCQkJCQkjIGFwcGx5IG11bHRpcGxlIHBhdGNoZXMgYXMgb2Z0ZW4gYXMg dGhleSBtYXRjaAorCQkJCQl3aGlsZSBbWyAkc3VicmV0IC1lcSAwIF1dOyBkbworCQkJCQkJ c3VicmV0PTEKKwkJCQkJCWlmIFtbIC1lICR7ZH0vY29uZmlndXJlIF1dOyB0aGVuCisJCQkJ CQkJRUxUX3dhbGtfcGF0Y2hlcyAiJHtkfS9jb25maWd1cmUiICIke3B9IgorCQkJCQkJCXN1 YnJldD0kPworCQkJCQkJZmkKKwkJCQkJCWlmIFtbICRzdWJyZXQgLWVxIDAgXV07IHRoZW4K KwkJCQkJCQkjIGhhdmUgYXQgbGVhc3Qgb25lIHBhdGNoIHN1Y2NlZWRlZC4KKwkJCQkJCQly ZXQ9MAorCQkJCQkJZmkKKwkJCQkJZG9uZQorCQkJCQk7OworCQkJCW1pbnQtY29uZnxnb2xk LWNvbmZ8c29sMi1jb25mKQorCQkJCQlFTFRfd2Fsa19wYXRjaGVzICIke2R9L2NvbmZpZ3Vy ZSIgIiR7cH0iCisJCQkJCXJldD0kPworCQkJCQk7OworCQkJCXRhcmdldC1ubSkKKwkJCQkJ RUxUX3dhbGtfcGF0Y2hlcyAiJHtkfS9jb25maWd1cmUiICIke3B9IgorCQkJCQlyZXQ9JD8K KwkJCQkJOzsKKwkJCQkqKQorCQkJCQkjIGx0bWFpbi5zaCBwYXRjaGVzIGFyZSBhcHBsaWVk IGFib3ZlCisJCQkJCTs7CisJCQllc2FjCisKKwkJCWlmIFtbICR7cmV0fSAtbmUgMCBdXSA7 IHRoZW4KKwkJCQljYXNlICR7cH0gaW4KKwkJCQkJdWNsaWJjLSopCisJCQkJCQlbWyAke0NI T1NUfSA9PSAqLXVjbGliYyBdXSAmJiBld2FybiAiICB1Q2xpYmMgcGF0Y2ggc2V0ICcke3B9 JyBmYWlsZWQgdG8gYXBwbHkhIgorCQkJCQkJOzsKKwkJCQkJZmJzZC0qKQorCQkJCQkJaWYg W1sgJHtDSE9TVH0gPT0gKi1mcmVlYnNkKiBdXSA7IHRoZW4KKwkJCQkJCQlpZiBbWyAteiAk KGdyZXAgJ0hhbmRsZSBHZW50b28vRnJlZUJTRCBhcyBpdCB3YXMgTGludXgnIFwKKwkJCQkJ CQkJIiR7ZH0vY29uZmlndXJlIiAyPi9kZXYvbnVsbCkgXV07IHRoZW4KKwkJCQkJCQkJZWVy cm9yICIgIEZyZWVCU0QgcGF0Y2ggc2V0ICcke3B9JyBmYWlsZWQgdG8gYXBwbHkhIgorCQkJ CQkJCQlkaWUgIkZyZWVCU0QgcGF0Y2ggc2V0ICcke3B9JyBmYWlsZWQgdG8gYXBwbHkhIgor CQkJCQkJCWZpCisJCQkJCQlmaQorCQkJCQkJOzsKKwkJCQkJZGFyd2luLSopCisJCQkJCQlb WyAke0NIT1NUfSA9PSAqIi1kYXJ3aW4iKiBdXSAmJiBld2FybiAiICBEYXJ3aW4gcGF0Y2gg c2V0ICcke3B9JyBmYWlsZWQgdG8gYXBwbHkhIgorCQkJCQkJOzsKKwkJCQllc2FjCisJCQlm aQorCQlkb25lCisKIAkJcm0gLWYgIiR7ZH0vbGlidG9vbCIKIAogCQk+ICIke2R9Ly5lbGli dG9vbGl6ZWQiCgo= --------------030904050907080105020601--