128040 2006-03-29 15:02 0000 coreutils fix for regex test 2006-04-27 05:58:55 0000 1 1 1 Unclassified Gentoo Linux Core system unspecified All Linux RESOLVED FIXED P2 normal --- 1 exg@gentoo.org base-system@gentoo.org bsd@gentoo.org exg@gentoo.org 2006-03-29 15:02:02 0000 The following patch fixes the test to detect a working glibc regex api; there is no need to use --without-included-regex, and regoff_t is now defined properly, so it should work automagically. exg@gentoo.org 2006-03-29 15:03:25 0000 Created an attachment (id=83403) gnulib-regex.patch vapier@gentoo.org 2006-04-10 17:58:46 0000 added to 5.94-r2 bbj@gentoo.org 2006-04-27 03:21:52 0000 And about dropping --without-included-regex, can it be done now? It causes coreutils to not compile on OpenBSD. vapier@gentoo.org 2006-04-27 05:58:55 0000 no ... on 64bit hosts it'll use the included regex still 83403 2006-03-29 15:03 0000 gnulib-regex.patch gnulib-regex.patch text/plain SW5kZXg6IG00L3JlZ2V4Lm00Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9zb3VyY2VzL2dudWxpYi9n bnVsaWIvbTQvcmVnZXgubTQsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDcKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjUxCmRpZmYgLXUgLXIxLjQ3IC1yMS41MQotLS0gZ251bGliL200L3JlZ2V4Lm00 CTIgRGVjIDIwMDUgMDA6MzA6MDkgLTAwMDAJMS40NworKysgZ251bGliL200L3JlZ2V4Lm00CTI1 IE1hciAyMDA2IDA5OjQ4OjQ3IC0wMDAwCTEuNTEKQEAgLTEsNyArMSw3IEBACi0jc2VyaWFsIDMx Cisjc2VyaWFsIDM1CiAKLSMgQ29weXJpZ2h0IChDKSAxOTk2LCAxOTk3LCAxOTk4LCAxOTk5LCAy MDAwLCAyMDAxLCAyMDAzLCAyMDA0LCAyMDA1IEZyZWUKLSMgU29mdHdhcmUgRm91bmRhdGlvbiwg SW5jLgorIyBDb3B5cmlnaHQgKEMpIDE5OTYsIDE5OTcsIDE5OTgsIDE5OTksIDIwMDAsIDIwMDEs IDIwMDMsIDIwMDQsIDIwMDUsCisjIDIwMDYgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMu CiAjCiAjIFRoaXMgZmlsZSBpcyBmcmVlIHNvZnR3YXJlOyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uCiAjIGdpdmVzIHVubGltaXRlZCBwZXJtaXNzaW9uIHRvIGNvcHkgYW5kL29yIGRpc3Ry aWJ1dGUgaXQsCkBAIC0xNCwzMSArMTQsNiBAQAogCiBBQ19ERUZVTihbZ2xfUkVHRVhdLAogWwot ICBBQ19SRVFVSVJFKFtBQ19TWVNfTEFSR0VGSUxFXSkgZG5sIGZvciBhIHN1ZmZpY2VudGx5LXdp ZGUgb2ZmX3QKLQotICBBQ19DQUNIRV9DSEVDSyhbd2hldGhlciBvZmZfdCBjYW4gYmUgdXNlZCBp biBhIHN3aXRjaCBzdGF0ZW1lbnRdLAotICAgIFtnbF9jdl90eXBlX29mZl90X3N3aXRjaF0sCi0g ICAgW0FDX0NPTVBJTEVfSUZFTFNFKAotICAgICAgW0FDX0xBTkdfUFJPR1JBTSgKLSAgICAgICAg IFtBQ19JTkNMVURFU19ERUZBVUxUXSwKLQkgW1tvZmZfdCBvID0gLTE7Ci0JICAgc3dpdGNoIChv KQotCSAgICAgewotCSAgICAgY2FzZSAtMjoKLQkgICAgICAgcmV0dXJuIDE7Ci0JICAgICBjYXNl IC0xOgotCSAgICAgICByZXR1cm4gMjsKLQkgICAgIGRlZmF1bHQ6Ci0JICAgICAgIHJldHVybiAw OwotCSAgICAgfQotCSBdXSldLAotICAgICAgW2dsX2N2X3R5cGVfb2ZmX3Rfc3dpdGNoPXllc10s Ci0gICAgICBbZ2xfY3ZfdHlwZV9vZmZfdF9zd2l0Y2g9bm9dKV0pCi0gIGlmIHRlc3QgJGdsX2N2 X3R5cGVfb2ZmX3Rfc3dpdGNoID0geWVzOyB0aGVuCi0gICAgQUNfREVGSU5FKFtfUkVHRVhfTEFS R0VfT0ZGU0VUU10sIDEsCi0gICAgICBbRGVmaW5lIGlmIHlvdSB3YW50IHJlZ29mZl90IHRvIGJl IGF0IGxlYXN0IGFzIHdpZGUgUE9TSVggcmVxdWlyZXMuXSkKLSAgZmkKLQogICBBQ19MSUJTT1VS Q0VTKAogICAgIFtyZWdjb21wLmMsIHJlZ2V4LmMsIHJlZ2V4LmgsCiAgICAgIHJlZ2V4X2ludGVy bmFsLmMsIHJlZ2V4X2ludGVybmFsLmgsIHJlZ2V4ZWMuY10pCkBAIC00OSw3ICsyNCw3IEBACiAJ CSAgICAgc3lzdGVtcyB3aXRoIHJlY2VudC1lbm91Z2ggdmVyc2lvbnMgb2YgdGhlIEdOVSBDCiAJ CSAgICAgTGlicmFyeSAodXNlIHdpdGggY2F1dGlvbiBvbiBvdGhlciBzeXN0ZW1zKV0pXSkKIAot ICBjYXNlICR3aXRoX2luY2x1ZGVkX3JlZ2V4IGluCisgIGNhc2UgJHdpdGhfaW5jbHVkZWRfcmVn ZXggaW4gIygKICAgeWVzfG5vKSBhY191c2VfaW5jbHVkZWRfcmVnZXg9JHdpdGhfaW5jbHVkZWRf cmVnZXgKIAk7OwogICAnJykKQEAgLTU5LDIwICszNCwxOCBAQAogICAgICMgcmVnZXguYy4gIFRo ZSBmaXJzdCBmYWlsaW5nIHJlZ3VsYXIgZXhwcmVzc2lvbiBpcyBmcm9tIGBTcGVuY2VyIGVyZQog ICAgICMgdGVzdCAjNzUnIGluIGdyZXAtMi4zLgogICAgIEFDX0NBQ0hFX0NIRUNLKFtmb3Igd29y a2luZyByZV9jb21waWxlX3BhdHRlcm5dLAotCQkgICBbZ2xfY3ZfZnVuY19yZV9jb21waWxlX3Bh dHRlcm5fYnJva2VuXSwKKwkJICAgW2dsX2N2X2Z1bmNfcmVfY29tcGlsZV9wYXR0ZXJuX3dvcmtp bmddLAogICAgICAgW0FDX1JVTl9JRkVMU0UoCiAJW0FDX0xBTkdfUFJPR1JBTSgKIAkgIFtBQ19J TkNMVURFU19ERUZBVUxUCi0JICAgI2luY2x1ZGUgPHJlZ2V4Lmg+XSwKKwkgICAjaW5jbHVkZSA8 cmVnZXguaD4KKwkgICBdLAogCSAgW1tzdGF0aWMgc3RydWN0IHJlX3BhdHRlcm5fYnVmZmVyIHJl Z2V4OwogCSAgICBjb25zdCBjaGFyICpzOwogCSAgICBzdHJ1Y3QgcmVfcmVnaXN0ZXJzIHJlZ3M7 Ci0JICAgIC8qIFVzZSB0aGUgUE9TSVgtY29tcGxpYW50IHNwZWxsaW5nIHdpdGggbGVhZGluZyBS RUdfLAotCSAgICAgICByYXRoZXIgdGhhbiB0aGUgdHJhZGl0aW9uYWwgR05VIHNwZWxsaW5nIHdp dGggbGVhZGluZyBSRV8sCi0JICAgICAgIHNvIHRoYXQgd2UgcmVqZWN0IG9sZGVyIGxpYmMgaW1w bGVtZW50YXRpb25zLiAgKi8KLQkgICAgcmVfc2V0X3N5bnRheCAoUkVHX1NZTlRBWF9QT1NJWF9F R1JFUCk7CisJICAgIHJlX3NldF9zeW50YXggKFJFX1NZTlRBWF9QT1NJWF9FR1JFUCk7CiAJICAg IG1lbXNldCAoJnJlZ2V4LCAwLCBzaXplb2YgKHJlZ2V4KSk7Ci0JICAgIHMgPSByZV9jb21waWxl X3BhdHRlcm4gKCJhWzpAOj5AOl1iXG4iLCA5LCAmcmVnZXgpOworCSAgICBzID0gcmVfY29tcGls ZV9wYXR0ZXJuICgiYVtbOkA6PkA6XV1iXG4iLCAxMSwgJnJlZ2V4KTsKIAkgICAgLyogVGhpcyBz aG91bGQgZmFpbCB3aXRoIF9JbnZhbGlkIGNoYXJhY3RlciBjbGFzcyBuYW1lXyBlcnJvci4gICov CiAJICAgIGlmICghcykKIAkgICAgICBleGl0ICgxKTsKQEAgLTEwNiwxMCArNzksOSBAQAogCSAg ICAgIGV4aXQgKDEpOwogCiAJICAgIC8qIFRoZSB2ZXJzaW9uIG9mIHJlZ2V4LmMgaW4gb2xkZXIg dmVyc2lvbnMgb2YgZ251bGliCi0JICAgICAgIGlnbm9yZWQgUkVHX0lHTk9SRV9DQVNFICh3aGlj aCB3YXMgdGhlbiBjYWxsZWQgUkVfSUNBU0UpLgotCSAgICAgICBEZXRlY3QgdGhhdCBwcm9ibGVt IHRvby4gICovCisJICAgICAgIGlnbm9yZWQgUkVfSUNBU0UuICBEZXRlY3QgdGhhdCBwcm9ibGVt IHRvby4gICovCiAJICAgIG1lbXNldCAoJnJlZ2V4LCAwLCBzaXplb2YgKHJlZ2V4KSk7Ci0JICAg IHJlX3NldF9zeW50YXggKFJFR19TWU5UQVhfRU1BQ1MgfCBSRUdfSUdOT1JFX0NBU0UpOworCSAg ICByZV9zZXRfc3ludGF4IChSRV9TWU5UQVhfRU1BQ1MgfCBSRV9JQ0FTRSk7CiAJICAgIHMgPSBy ZV9jb21waWxlX3BhdHRlcm4gKCJ4IiwgMSwgJnJlZ2V4KTsKIAkgICAgaWYgKHMpCiAJICAgICAg ZXhpdCAoMSk7CkBAIC0xMjMsMjQgKzk1LDI5IEBACiAJICAgICAgZXhpdCAoMSk7CiAKIAkgICAg LyogUmVqZWN0IGhvc3RzIHdob3NlIHJlZ29mZl90IHZhbHVlcyBhcmUgdG9vIG5hcnJvdy4KLQkg ICAgICAgVGhlc2UgaW5jbHVkZSBnbGliYyAyLjMuNSBvbiBob3N0cyB3aXRoIDY0LWJpdCBvZmZf dAotCSAgICAgICBhbmQgMzItYml0IGludCwgYW5kIFNvbGFyaXMgMTAgb24gaG9zdHMgd2l0aCAz Mi1iaXQgaW50Ci0JICAgICAgIGFuZCBfRklMRV9PRkZTRVRfQklUUz02NC4gICovCi0JICAgIGlm IChzaXplb2YgKHJlZ29mZl90KSA8IHNpemVvZiAob2ZmX3QpKQorCSAgICAgICBUaGVzZSBpbmNs dWRlIGdsaWJjIDIuMy41IG9uIGhvc3RzIHdpdGggNjQtYml0IHB0cmRpZmZfdAorCSAgICAgICBh bmQgMzItYml0IGludC4gICovCisJICAgIGlmIChzaXplb2YgKHJlZ29mZl90KSA8IHNpemVvZiAo cHRyZGlmZl90KQorCQl8fCBzaXplb2YgKHJlZ29mZl90KSA8IHNpemVvZiAoc3NpemVfdCkpCiAJ ICAgICAgZXhpdCAoMSk7CiAKIAkgICAgZXhpdCAoMCk7XV0pXSwKLSAgICAgICBbZ2xfY3ZfZnVu Y19yZV9jb21waWxlX3BhdHRlcm5fYnJva2VuPW5vXSwKLSAgICAgICBbZ2xfY3ZfZnVuY19yZV9j b21waWxlX3BhdHRlcm5fYnJva2VuPXllc10sCi0gICAgICAgZG5sIFdoZW4gY3Jvc3Njb21waWxp bmcsIGFzc3VtZSBpdCBpcyBicm9rZW4uCi0gICAgICAgW2dsX2N2X2Z1bmNfcmVfY29tcGlsZV9w YXR0ZXJuX2Jyb2tlbj15ZXNdKV0pCi0gICAgYWNfdXNlX2luY2x1ZGVkX3JlZ2V4PSRnbF9jdl9m dW5jX3JlX2NvbXBpbGVfcGF0dGVybl9icm9rZW4KKyAgICAgICBbZ2xfY3ZfZnVuY19yZV9jb21w aWxlX3BhdHRlcm5fd29ya2luZz15ZXNdLAorICAgICAgIFtnbF9jdl9mdW5jX3JlX2NvbXBpbGVf cGF0dGVybl93b3JraW5nPW5vXSwKKyAgICAgICBkbmwgV2hlbiBjcm9zc2NvbXBpbGluZywgYXNz dW1lIGl0IGlzIG5vdCB3b3JraW5nLgorICAgICAgIFtnbF9jdl9mdW5jX3JlX2NvbXBpbGVfcGF0 dGVybl93b3JraW5nPW5vXSldKQorICAgIGNhc2UgJGdsX2N2X2Z1bmNfcmVfY29tcGlsZV9wYXR0 ZXJuX3dvcmtpbmcgaW4gIygKKyAgICB5ZXMpIGFjX3VzZV9pbmNsdWRlZF9yZWdleD1ubzs7ICMo CisgICAgbm8pIGFjX3VzZV9pbmNsdWRlZF9yZWdleD15ZXM7OworICAgIGVzYWMKICAgICA7Owog ICAqKSBBQ19NU0dfRVJST1IoW0ludmFsaWQgdmFsdWUgZm9yIC0td2l0aC1pbmNsdWRlZC1yZWdl eDogJHdpdGhfaW5jbHVkZWRfcmVnZXhdKQogICAgIDs7CiAgIGVzYWMKIAogICBpZiB0ZXN0ICRh Y191c2VfaW5jbHVkZWRfcmVnZXggPSB5ZXM7IHRoZW4KKyAgICBBQ19ERUZJTkUoW19SRUdFWF9M QVJHRV9PRkZTRVRTXSwgMSwKKyAgICAgIFtEZWZpbmUgaWYgeW91IHdhbnQgcmVnb2ZmX3QgdG8g YmUgYXQgbGVhc3QgYXMgd2lkZSBQT1NJWCByZXF1aXJlcy5dKQogICAgIEFDX0RFRklORShbcmVf c3ludGF4X29wdGlvbnNdLCBbcnBsX3JlX3N5bnRheF9vcHRpb25zXSwKICAgICAgIFtEZWZpbmUg dG8gcnBsX3JlX3N5bnRheF9vcHRpb25zIGlmIHRoZSByZXBsYWNlbWVudCBzaG91bGQgYmUgdXNl ZC5dKQogICAgIEFDX0RFRklORShbcmVfc2V0X3N5bnRheF0sIFtycGxfcmVfc2V0X3N5bnRheF0s CkluZGV4OiBsaWIvcmVnZXguaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvc291cmNlcy9nbnVsaWIv Z251bGliL2xpYi9yZWdleC5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjM0CnJldHJpZXZpbmcg cmV2aXNpb24gMS4zNQpkaWZmIC11IC1yMS4zNCAtcjEuMzUKLS0tIGdudWxpYi9saWIvcmVnZXgu aAkzMSBBdWcgMjAwNSAyMjo1MToxMCAtMDAwMAkxLjM0CisrKyBnbnVsaWIvbGliL3JlZ2V4LmgJ MTcgTWFyIDIwMDYgMDc6MjY6NDIgLTAwMDAJMS4zNQpAQCAtMSw2ICsxLDYgQEAKIC8qIERlZmlu aXRpb25zIGZvciBkYXRhIHN0cnVjdHVyZXMgYW5kIHJvdXRpbmVzIGZvciB0aGUgcmVndWxhcgog ICAgZXhwcmVzc2lvbiBsaWJyYXJ5LgotICAgQ29weXJpZ2h0IChDKSAxOTg1LDE5ODktOTMsMTk5 NS05OCwyMDAwLDIwMDEsMjAwMiwyMDAzLDIwMDUKKyAgIENvcHlyaWdodCAoQykgMTk4NSwxOTg5 LTkzLDE5OTUtOTgsMjAwMCwyMDAxLDIwMDIsMjAwMywyMDA1LDIwMDYKICAgIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbiwgSW5jLgogICAgVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhlIEdOVSBDIExp YnJhcnkuCiAKQEAgLTUzLDExICs1MywxMyBAQAogCiAvKiBUaGUgdHlwZSBvZiB0aGUgb2Zmc2V0 IG9mIGEgYnl0ZSB3aXRoaW4gYSBzdHJpbmcuCiAgICBGb3IgaGlzdG9yaWNhbCByZWFzb25zIFBP U0lYIDEwMDMuMS0yMDA0IHJlcXVpcmVzIHRoYXQgcmVnb2ZmX3QgYmUKLSAgIGF0IGxlYXN0IGFz IHdpZGUgYXMgb2ZmX3QuICBUaGlzIGlzIGEgYml0IG9kZCAoYW5kIG1hbnkgY29tbW9uCi0gICBQ T1NJWCBwbGF0Zm9ybXMgc2V0IGl0IHRvIHRoZSBtb3JlLXNlbnNpYmxlIHNzaXplX3QpIGJ1dCB3 ZSBtaWdodAotICAgYXMgd2VsbCBjb25mb3JtLiAgV2UgZG9uJ3Qga25vdyBvZiBhbnkgaG9zdHMg d2hlcmUgc3NpemVfdCBpcyB3aWRlcgotICAgdGhhbiBvZmZfdCwgc28gb2ZmX3QgaXMgc2FmZS4g ICovCi10eXBlZGVmIG9mZl90IHJlZ29mZl90OworICAgYXQgbGVhc3QgYXMgd2lkZSBhcyBvZmZf dC4gIEhvd2V2ZXIsIG1hbnkgY29tbW9uIFBPU0lYIHBsYXRmb3JtcyBzZXQKKyAgIHJlZ29mZl90 IHRvIHRoZSBtb3JlLXNlbnNpYmxlIHNzaXplX3QgYW5kIHRoZSBPcGVuIEdyb3VwIGhhcworICAg c2lnbmFsbGVkIGl0cyBpbnRlbnRpb24gdG8gY2hhbmdlIHRoZSByZXF1aXJlbWVudCB0byBiZSB0 aGF0CisgICByZWdvZmZfdCBiZSBhdCBsZWFzdCBhcyB3aWRlIGFzIHB0cmRpZmZfdCBhbmQgc3Np emVfdDsgc2VlIFhCRCBFUk4KKyAgIDYwICgyMDA1LTA4LTI1KS4gIFdlIGRvbid0IGtub3cgb2Yg YW55IGhvc3RzIHdoZXJlIHNzaXplX3Qgb3IKKyAgIHB0cmRpZmZfdCBpcyB3aWRlciB0aGFuIGxv bmcgaW50LCBzbyBsb25nIGludCBpcyBzYWZlLiAgKi8KK3R5cGVkZWYgbG9uZyBpbnQgcmVnb2Zm X3Q7CiAKIC8qIFRoZSB0eXBlIG9mIG5vbm5lZ2F0aXZlIG9iamVjdCBpbmRleGVzLiAgVHJhZGl0 aW9uYWxseSwgR05VIHJlZ2V4CiAgICB1c2VzICdpbnQnIGZvciB0aGVzZS4gIENvZGUgdGhhdCB1 c2VzIF9fcmVfaWR4X3Qgc2hvdWxkIHdvcmsK