152958 2016-01-10 09:41:32 -0800 [webkitdirs] Try arch and uname commands on non-windows OS 2017-03-20 15:42:04 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen webkit-unassigned achristensen bfulgham clopez commit-queue dbates lforschler mcatanzaro oldest_to_newest 1154222 0 annulen 2016-01-10 09:41:32 -0800 Right now, determineArchitecture() uses `arch` and `uname -m` commands to determine architecture in case of condition (isGtk() || isAppleMacWebKit() || isEfl()) is true. This should be !anyWindows() instead, because this code is applicable to any non-windows OS WebKit supports (even Haiku which once was supported is moderately POSIX-compliant and has uname command). 1154230 1 268654 annulen 2016-01-10 10:34:06 -0800 Created attachment 268654 Patch 1154239 2 268658 annulen 2016-01-10 11:27:36 -0800 Created attachment 268658 Patch 1154241 3 268658 mcatanzaro 2016-01-10 11:31:11 -0800 Comment on attachment 268658 Patch I'm going to wait for EWS before giving this cq+ since your last attempt broke every bot :) 1154265 4 268658 commit-queue 2016-01-10 13:56:22 -0800 Comment on attachment 268658 Patch Clearing flags on attachment: 268658 Committed r194832: <http://trac.webkit.org/changeset/194832> 1154266 5 commit-queue 2016-01-10 13:56:25 -0800 All reviewed patches have been landed. Closing bug. 1289601 6 clopez 2017-03-20 15:42:04 -0700 FYI: It seems the command "arch" doesn't gives the expected thing on MacOS: clopez@macpro ~ $ arch i386 clopez@macpro ~ $ uname -m x86_64 clopez@macpro ~ $ which arch /usr/bin/arch clopez@macpro ~ $ sw_vers ProductName: Mac OS X ProductVersion: 10.12.3 BuildVersion: 16D32 clopez@macpro ~ $ file /bin/ls /bin/ls: Mach-O 64-bit executable x86_64 And this is on OpenBSD: neutrino@wolfman $ arch OpenBSD.i386 neutrino@wolfman $ uname -m i386 neutrino@wolfman $ file /bin/ls /bin/ls: ELF 32-bit LSB shared object, Intel 80386, version 1 And on Linux it seems a simple wrapper for 'uname -m', so I'm proposing to remove the call to arch and just leave the one for uname -m on bug 169886 268654 2016-01-10 10:34:06 -0800 2016-01-10 11:27:28 -0800 Patch bug-152958-20160110213334.patch text/plain 2254 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0ODI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDNlNThlNGI1ZWJkMDcyZDE1NjA1ZTk1NGM1MTk3Y2U4 MDZmNjUzZS4uYmZlY2E1MjBhNWY4YTFkNzg1ZTdiYWI5M2JjMWI0NWMxMWMyNTk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE2LTAxLTEwICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4K KworICAgICAgICBbd2Via2l0ZGlyc10gVHJ5IGFyY2ggYW5kIHVuYW1lIGNvbW1hbmRzIG9uIG5v bi13aW5kb3dzIE9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTI5NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSaWdodCBub3csIGRldGVybWluZUFyY2hpdGVjdHVyZSgpICB1c2VzIGBhcmNoYCBhbmQg YHVuYW1lIC1tYAorICAgICAgICBjb21tYW5kcyB0byBkZXRlcm1pbmUgYXJjaGl0ZWN0dXJlIGlu IGNhc2Ugb2YgY29uZGl0aW9uIChpc0d0aygpIHx8CisgICAgICAgIGlzQXBwbGVNYWNXZWJLaXQo KSB8fCBpc0VmbCgpKSBpcyB0cnVlLiBUaGlzIHNob3VsZCBiZSAhYW55V2luZG93cygpCisgICAg ICAgIGluc3RlYWQsIGJlY2F1c2UgdGhpcyBjb2RlIGlzIGFwcGxpY2FibGUgdG8gYW55IG5vbi13 aW5kb3dzIE9TIFdlYktpdAorICAgICAgICBzdXBwb3J0cyAoZXZlbiBIYWlrdSB3aGljaCBvbmNl IHdhcyBzdXBwb3J0ZWQgaXMgbW9kZXJhdGVseQorICAgICAgICBQT1NJWC1jb21wbGlhbnQgYW5k IGhhcyB1bmFtZSBjb21tYW5kKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToK KyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6CisKIDIwMTYtMDEtMDggIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMg bWlzLWNvdW50cyB0b3RhbHMgd2hlbiB0aGVyZSBhcmUgb3RoZXIgY3Jhc2hlcwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDcwNjk4MGMyMDZiZmNkNWNmOTNlM2U4MzcwZWYwNWM4OTAwNDRiNzEuLmU5YzY0 M2ViMGMwZTE1ZWQ5MGEyZGFkMzEyZGMzNDI4ODEzOGQwYTEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTM0NywxNiArMzQ3LDE4IEBAIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKICAgICAgICAgfQog ICAgIH0KIAotICAgIGlmICghJGFyY2hpdGVjdHVyZSAmJiAoaXNHdGsoKSB8fCBpc0FwcGxlTWFj V2ViS2l0KCkgfHwgaXNFZmwoKSkpIHsKLSAgICAgICAgIyBGYWxsIGJhY2sgdG8gb3V0cHV0IG9m IGBhcmNoJywgaWYgaXQgaXMgcHJlc2VudC4KLSAgICAgICAgJGFyY2hpdGVjdHVyZSA9IGBhcmNo YDsKLSAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKLSAgICB9CisgICAgaWYgKCFhbnlXaW5k b3dzKCkpIHsKKyAgICAgICAgaWYgKCEkYXJjaGl0ZWN0dXJlKSB7CisgICAgICAgICAgICAjIEZh bGwgYmFjayB0byBvdXRwdXQgb2YgYGFyY2gnLCBpZiBpdCBpcyBwcmVzZW50LgorICAgICAgICAg ICAgJGFyY2hpdGVjdHVyZSA9IGBhcmNoYDsKKyAgICAgICAgICAgIGNob21wICRhcmNoaXRlY3R1 cmU7CisgICAgICAgIH0KIAotICAgIGlmICghJGFyY2hpdGVjdHVyZSAmJiAoaXNHdGsoKSB8fCBp c0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNFZmwoKSkpIHsKLSAgICAgICAgIyBGYWxsIGJhY2sgdG8g b3V0cHV0IG9mIGB1bmFtZSAtbScsIGlmIGl0IGlzIHByZXNlbnQuCi0gICAgICAgICRhcmNoaXRl Y3R1cmUgPSBgdW5hbWUgLW1gOwotICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOworICAgICAg ICBpZiAoISRhcmNoaXRlY3R1cmUpIHsKKyAgICAgICAgICAgICMgRmFsbCBiYWNrIHRvIG91dHB1 dCBvZiBgdW5hbWUgLW0nLCBpZiBpdCBpcyBwcmVzZW50LgorICAgICAgICAgICAgJGFyY2hpdGVj dHVyZSA9IGB1bmFtZSAtbWA7CisgICAgICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOworICAg ICAgICB9CiAgICAgfQogCiAgICAgJGFyY2hpdGVjdHVyZSA9ICd4ODZfNjQnIGlmICgkYXJjaGl0 ZWN0dXJlID1+IC9hbWQ2NC8gJiYgaXNCU0QoKSk7Cg== 268658 2016-01-10 11:27:36 -0800 2016-01-10 13:56:22 -0800 Patch bug-152958-20160110222704.patch text/plain 2256 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0ODI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDNlNThlNGI1ZWJkMDcyZDE1NjA1ZTk1NGM1MTk3Y2U4 MDZmNjUzZS4uYmZlY2E1MjBhNWY4YTFkNzg1ZTdiYWI5M2JjMWI0NWMxMWMyNTk0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE2LTAxLTEwICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4K KworICAgICAgICBbd2Via2l0ZGlyc10gVHJ5IGFyY2ggYW5kIHVuYW1lIGNvbW1hbmRzIG9uIG5v bi13aW5kb3dzIE9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTI5NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSaWdodCBub3csIGRldGVybWluZUFyY2hpdGVjdHVyZSgpICB1c2VzIGBhcmNoYCBhbmQg YHVuYW1lIC1tYAorICAgICAgICBjb21tYW5kcyB0byBkZXRlcm1pbmUgYXJjaGl0ZWN0dXJlIGlu IGNhc2Ugb2YgY29uZGl0aW9uIChpc0d0aygpIHx8CisgICAgICAgIGlzQXBwbGVNYWNXZWJLaXQo KSB8fCBpc0VmbCgpKSBpcyB0cnVlLiBUaGlzIHNob3VsZCBiZSAhYW55V2luZG93cygpCisgICAg ICAgIGluc3RlYWQsIGJlY2F1c2UgdGhpcyBjb2RlIGlzIGFwcGxpY2FibGUgdG8gYW55IG5vbi13 aW5kb3dzIE9TIFdlYktpdAorICAgICAgICBzdXBwb3J0cyAoZXZlbiBIYWlrdSB3aGljaCBvbmNl IHdhcyBzdXBwb3J0ZWQgaXMgbW9kZXJhdGVseQorICAgICAgICBQT1NJWC1jb21wbGlhbnQgYW5k IGhhcyB1bmFtZSBjb21tYW5kKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToK KyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6CisKIDIwMTYtMDEtMDggIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMg bWlzLWNvdW50cyB0b3RhbHMgd2hlbiB0aGVyZSBhcmUgb3RoZXIgY3Jhc2hlcwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDcwNjk4MGMyMDZiZmNkNWNmOTNlM2U4MzcwZWYwNWM4OTAwNDRiNzEuLjM0YzVj NmY4NTUwZjIxYTIxYmQ5ODdkNjNkYWEzOWM1ZDA2YTM2NmIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTM0NywxNiArMzQ3LDE4IEBAIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKICAgICAgICAgfQog ICAgIH0KIAotICAgIGlmICghJGFyY2hpdGVjdHVyZSAmJiAoaXNHdGsoKSB8fCBpc0FwcGxlTWFj V2ViS2l0KCkgfHwgaXNFZmwoKSkpIHsKLSAgICAgICAgIyBGYWxsIGJhY2sgdG8gb3V0cHV0IG9m IGBhcmNoJywgaWYgaXQgaXMgcHJlc2VudC4KLSAgICAgICAgJGFyY2hpdGVjdHVyZSA9IGBhcmNo YDsKLSAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKLSAgICB9CisgICAgaWYgKCFpc0FueVdp bmRvd3MoKSkgeworICAgICAgICBpZiAoISRhcmNoaXRlY3R1cmUpIHsKKyAgICAgICAgICAgICMg RmFsbCBiYWNrIHRvIG91dHB1dCBvZiBgYXJjaCcsIGlmIGl0IGlzIHByZXNlbnQuCisgICAgICAg ICAgICAkYXJjaGl0ZWN0dXJlID0gYGFyY2hgOworICAgICAgICAgICAgY2hvbXAgJGFyY2hpdGVj dHVyZTsKKyAgICAgICAgfQogCi0gICAgaWYgKCEkYXJjaGl0ZWN0dXJlICYmIChpc0d0aygpIHx8 IGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc0VmbCgpKSkgewotICAgICAgICAjIEZhbGwgYmFjayB0 byBvdXRwdXQgb2YgYHVuYW1lIC1tJywgaWYgaXQgaXMgcHJlc2VudC4KLSAgICAgICAgJGFyY2hp dGVjdHVyZSA9IGB1bmFtZSAtbWA7Ci0gICAgICAgIGNob21wICRhcmNoaXRlY3R1cmU7CisgICAg ICAgIGlmICghJGFyY2hpdGVjdHVyZSkgeworICAgICAgICAgICAgIyBGYWxsIGJhY2sgdG8gb3V0 cHV0IG9mIGB1bmFtZSAtbScsIGlmIGl0IGlzIHByZXNlbnQuCisgICAgICAgICAgICAkYXJjaGl0 ZWN0dXJlID0gYHVuYW1lIC1tYDsKKyAgICAgICAgICAgIGNob21wICRhcmNoaXRlY3R1cmU7Cisg ICAgICAgIH0KICAgICB9CiAKICAgICAkYXJjaGl0ZWN0dXJlID0gJ3g4Nl82NCcgaWYgKCRhcmNo aXRlY3R1cmUgPX4gL2FtZDY0LyAmJiBpc0JTRCgpKTsK