125805 2006-03-11 02:38 0000 gcc-config support for multiple entries in GCC_SPECS 2007-03-05 22:15:26 0000 1 1 1 Unclassified Gentoo Linux Core system unspecified All Linux RESOLVED FIXED P2 normal --- 1 kevquinn@gentoo.org toolchain@gentoo.org bug.hunter@gmx.net kevquinn@gentoo.org 2006-03-11 02:38:19 0000 We've added support for multiple entries in GCC_SPECS, separated by ":". gcc-config currently rejects multiple entries as it checks that ${GCC_SPECS} exists. To follow - a patch to gcc-config-1.3.13 so that it checks colon-separated entries. kevquinn@gentoo.org 2006-03-11 03:14:00 0000 Created an attachment (id=81904) Check colon-separated entries in GCC_SPECS Simple enough, I think. Checks that everything listed in GCC_SPECS exists either as a full path or relative to LDPATH (so that we can set things like "nopie.specs:ssp.specs:nonow.specs"). vapier@gentoo.org 2006-03-11 03:23:01 0000 looks sane enough ... i'll touchup syntax and commit it kevquinn@gentoo.org 2006-06-13 12:18:22 0000 SpanKY - if you let me know what syntax bits you don't like, I'll update the patch. vapier@gentoo.org 2006-12-08 23:37:06 0000 ive added 1.3.15 with support for multiple entries ... please give it a spin before i move it into ~arch kevquinn@gentoo.org 2006-12-09 04:02:03 0000 Created an attachment (id=103677) fail if file is missing on all paths, only check this compiler's ld paths, issue warning if one or more files are missing Thanks. A few issues though. This part: ret=0 ... for p in ${paths} ; do [[ ! -f ${p}/${f} ]] && ret=1 && break 2 done fi done fails if there's more than one path - the file only has to exist on one of the paths, not all of them. That's why I had the logic there the other way around. Multiple paths occur on multilib, but also when more than one compiler is installed. I thought MY_LDPATH would contain just the paths for the selected compiler, which looking at the code is obviously not the case. However specs files are searched for relative olny to the current compiler's libdir(s), so the files_exist check should only be looking there. One more thing, is that if any of the files don't exist GCC_SPECS is silently set to "" - which is fine, but a warning would be useful in that case (since it implies the config file is out of date/wrong). I'm not quite up to speed with the workings and effects of multilib; I notice that the LDPATH for the compiler also includes a '32' subdirectory, which is not in the compiler library search path - under what situations is this subdirectory used? kevquinn@gentoo.org 2006-12-09 04:05:05 0000 Another way to find the compiler library search paths is to do: gcc -print-search-dirs | awk '$1=="libraries:" {print $2} | sed -e 's/^=/' which is where it will actually search for specs files. Perhaps the output of this would be better than the MY_LDPATH stuff. vapier@gentoo.org 2006-12-09 19:47:54 0000 no ... you cant assume gcc is executable vapier@gentoo.org 2006-12-16 11:36:54 0000 ok, ive fixed up cvs again, see if you're good with that i didnt realize the logic you were going for because there were no comments ;P kevquinn@gentoo.org 2007-02-21 13:55:29 0000 hmm; I should have got back to you ages ago - 1.3.15 is fine. vapier@gentoo.org 2007-03-05 22:15:26 0000 ok, moved into ~arch 81904 2006-03-11 03:14 0000 Check colon-separated entries in GCC_SPECS gcc-config-multispecs.diff text/plain SW5kZXg6IGdjYy1jb25maWctMS4zLjEzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC92YXIvY3Zzcm9v dC9nZW50b28teDg2L3N5cy1kZXZlbC9nY2MtY29uZmlnL2ZpbGVzL2djYy1jb25maWctMS4zLjEz LHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjMKZGlmZiAtdSAtYiAtQiAtcjEuMyBnY2MtY29uZmln LTEuMy4xMwotLS0gZ2NjLWNvbmZpZy0xLjMuMTMJOCBKYW4gMjAwNiAwOTo1Mjo0NSAtMDAwMAkx LjMKKysrIGdjYy1jb25maWctMS4zLjEzCTExIE1hciAyMDA2IDExOjA3OjMwIC0wMDAwCkBAIC02 MSw2ICs2MSwzMCBAQAogCXJldHVybiAwCiB9CiAKKyMgZmlsZXNfZXhpc3QgPHBhdGhzPiA8Zmls ZXM+IChib3RoIDotc2VwYXJhdGVkKQorIyBSZXR1cm4gMCBpZiBhbGwgPGZpbGVzPiBhcmUgZm91 bmQgaW4gYXQgbGVhc3Qgb25lIG9mIDxwYXRocz4KKyMgUmV0dXJuIDEgaWYgb25lIG9yIG1vcmUg PGZpbGVzPiBjYW5ub3QgYmUgZm91bmQgaW4gYW55IDxwYXRocz4KK2ZpbGVzX2V4aXN0KCkgewor CWxvY2FsIHBhdGhzIGZpbGVzIHBhdGhuIGZpbGVuIG9rIG9sZF9JRlMKKwlwYXRocz0kMQorCWZp bGVzPSQyCisJb2xkX0lGUz0iJHtJRlN9IgorCWV4cG9ydCBJRlM9IjoiCisJZm9yIGZpbGVuIGlu ICR7ZmlsZXN9OyBkbworCQlpZiBbWyAke2ZpbGVuOjA6MX0gPT0gIi8iIF1dOyB0aGVuCisJCQlb WyAtZiAke2ZpbGVufSBdXSAmJiBvaz0wIHx8IG9rPTEKKwkJZWxzZQorCQkJb2s9MQorCQkJZm9y IHBhdGhuIGluICR7cGF0aHN9OyBkbworCQkJCVtbIC1mICR7cGF0aG59LyR7ZmlsZW59IF1dICYm IG9rPTAgJiYgYnJlYWsKKwkJCWRvbmUKKwkJCVtbICR7b2t9ID09IDEgXV0gJiYgYnJlYWsKKwkJ ZmkKKwlkb25lCisJZXhwb3J0IElGUz0iJHtvbGRfSUZTfSIKKwlyZXR1cm4gJHtva30KK30KKwog Y21kX3NldHVwKCkgewogCSMgU291cmNpbmcgL2V0Yy9lbnYuZC9nY2MvJHtDQ19DT01QfSBpcyBn b2luZyB0byBtZXNzIHVwCiAJIyBQQVRIIGFtb25nIHRoaW5ncy4uLgpAQCAtMjAxLDcgKzIyNSw5 IEBACiAJCSR7QVdLfSAnIS9eKFNURENYWF9JTkNESVJ8TERQQVRIfENDfENYWHxDVEFSR0VUfEdD Q0JJVFN8R0NDX1NQRUNTKT0vIHtwcmludCAkMH0nIFwKIAkJCSIke0dDQ19FTlZfRH0vJHtDQ19D T01QfSIgPiAiJHtFTlZfRH0vMDVnY2MiCiAJCWVjaG8gIkxEUEFUSD1cIiR7TVlfTERQQVRIfVwi IiA+PiAiJHtFTlZfRH0vMDVnY2MiCi0JCWlmIFtbIC1uICR7R0NDX1NQRUNTfSBdXSAmJiBbWyAt ZSAke1JPT1R9LyR7R0NDX1NQRUNTfSBdXSA7IHRoZW4KKwkJIyBWZXJpZnkgYWxsIEdDQ19TUEVD UyBmaWxlcyBleGlzdCBlaXRoZXIgYXMgZnVsbCBwYXRocyBvciByZWxhdGl2ZQorCQkjIHRvIGFu IExEUEFUSCBlbnRyeQorCQlpZiBbWyAtbiAke0dDQ19TUEVDU30gXV0gJiYgZmlsZXNfZXhpc3Qg JHtNWV9MRFBBVEh9ICR7R0NDX1NQRUNTfSA7IHRoZW4KIAkJCWVjaG8gIkdDQ19TUEVDUz1cIiR7 R0NDX1NQRUNTfVwiIiA+PiAiJHtFTlZfRH0vMDVnY2MiCiAJCWVsc2UKIAkJCSMgUGVvcGxlIG5l ZWQgdG8gcmVidWlsZCB0aGVpciBnY2Mgb3Igc2V0dGluZyBHQ0NfU1BFQ1MgdG8K 103677 2006-12-09 04:02 0000 fail if file is missing on all paths, only check this compiler's ld paths, issue warning if one or more files are missing gcc-config.diff text/plain LS0tIGdjYy1jb25maWctMS4zLjE1CTIwMDYtMTItMDkgMDg6MzM6MDkuMDAwMDAwMDAwICswMTAw CisrKyAvdXNyL2Jpbi9nY2MtY29uZmlnCTIwMDYtMTItMDkgMTI6NDk6MTQuMDAwMDAwMDAwICsw MTAwCkBAIC0xNjMsOSArMTYzLDExIEBACiAJCWlmIFtbICR7Zn0gPT0gLyogXV0gOyB0aGVuCiAJ CQlbWyAhIC1mICR7Zn0gXV0gJiYgcmV0PTEgJiYgYnJlYWsKIAkJZWxzZQorCQkJcmV0PTEKIAkJ CWZvciBwIGluICR7cGF0aHN9IDsgZG8KLQkJCQlbWyAhIC1mICR7cH0vJHtmfSBdXSAmJiByZXQ9 MSAmJiBicmVhayAyCisJCQkJW1sgLWYgJHtwfS8ke2Z9IF1dICYmIHJldD0wICYmIGJyZWFrCiAJ CQlkb25lCisJCQlbWyAke3JldH0gPT0gMSBdXSAmJiBicmVhawogCQlmaQogCWRvbmUKIApAQCAt MjA2LDYgKzIwOCw3IEBACiAKIAkJIyBFeHRyYWN0IGFsbCBMRFBBVEgncyBmb3Igb3VyIENIT1NU CiAJCU1ZX0xEUEFUSD0iIgorCQlPTkxZX01ZX0xEUEFUSD0iIgogCQlmb3IgeCBpbiAke0dDQ19Q Uk9GSUxFU30gOyBkbwogCQkJaWYgW1sgLWYgJHt4fSBdXSA7IHRoZW4KIAkJCQlzb3VyY2UgIiR7 eH0iCkBAIC0yMjMsNiArMjI2LDcgQEAKIAkJCQlkb25lCiAJCQkJZXhwb3J0IElGUz0ke29sZF9J RlN9CiAJCQlmaQorCQkJW1sgLXogJHtPTkxZX01ZX0xEUEFUSH0gXV0gJiYgT05MWV9NWV9MRFBB VEg9JHtNWV9MRFBBVEg6MX0KIAkJZG9uZQogCQlNWV9MRFBBVEg9IiR7TVlfTERQQVRIOjF9IiAj IHRyaW0gbGVhZGluZyA6CiAJZmkKQEAgLTI0NSw4ICsyNDksMTUgQEAKIAkJJHtBV0t9ICchL14o U1REQ1hYX0lOQ0RJUnxMRFBBVEh8Q0N8Q1hYfENUQVJHRVR8R0NDQklUU3xHQ0NfU1BFQ1MpPS8g e3ByaW50ICQwfScgXAogCQkJIiR7R0NDX0VOVl9EfS8ke0NDX0NPTVB9IiA+ICIke0VOVl9EfS8w NWdjYyIKIAkJZWNobyAiTERQQVRIPVwiJHtNWV9MRFBBVEh9XCIiID4+ICIke0VOVl9EfS8wNWdj YyIKLQkJaWYgW1sgLW4gJHtHQ0NfU1BFQ1N9IF1dICYmIGZpbGVzX2V4aXN0ICR7TVlfTERQQVRI fSAke0dDQ19TUEVDU30gOyB0aGVuCi0JCQllY2hvICJHQ0NfU1BFQ1M9XCIke0dDQ19TUEVDU31c IiIgPj4gIiR7RU5WX0R9LzA1Z2NjIgorCQlpZiBbWyAtbiAke0dDQ19TUEVDU30gXV0gOyB0aGVu CisJCQlpZiBmaWxlc19leGlzdCAke09OTFlfTVlfTERQQVRIfSAke0dDQ19TUEVDU30gOyB0aGVu CisJCQkJZWNobyAiR0NDX1NQRUNTPVwiJHtHQ0NfU1BFQ1N9XCIiID4+ICIke0VOVl9EfS8wNWdj YyIKKwkJCWVsc2UKKwkJCQllY2hvCisJCQkJZXdhcm4gIllvdXIgR0NDIHNwZWMgY29uZmlndXJh dGlvbnMgYXJlIGJyb2tlbi4iCisJCQkJZXdhcm4gIlBsZWFzZSByZS1lbWVyZ2UgZ2NjLiIKKwkJ CQllY2hvCisJCQlmaQogCQllbHNlCiAJCQkjIFBlb3BsZSBuZWVkIHRvIHJlYnVpbGQgdGhlaXIg Z2NjIG9yIHNldHRpbmcgR0NDX1NQRUNTIHRvCiAJCQkjICIiIHdpbGwgY2F1c2UgaXNzdWVzIGFn YWluIDooCg==