145206 2006-08-26 15:11 0000 python's distutils does not respect CXXFLAGS 2008-04-19 14:46:35 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All All RESOLVED FIXED P2 normal --- 212178 1 vapier@gentoo.org python@gentoo.org dirtyepic@gentoo.org dsdale24@gmail.com markpeloquin@gmail.com vapier@gentoo.org 2006-08-26 15:11:02 0000 the wxpython package compiles a lot of C++ code using $(CFLAGS) instead of $(CXXFLAGS) # portageq envvar -v CFLAGS CXXFLAGS CFLAGS='-O2 -march=k8 -pipe -Wimplicit-function-declaration' CXXFLAGS='-O2 -march=k8 -pipe' # emerge wxpython ... x86_64-pc-linux-gnu-gcc -pthread -fno-strict-aliasing -DNDEBUG -O2 -march=k8 -pipe -Wimplicit-function- declaration -fPIC -DSWIG_TYPE_TABLE=_wxPython_table -DHAVE_CONFIG_H -DWXP_USE_THREAD=1 -UNDEBUG -DGTK_N O_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA -Iinclude -Isrc -I/usr/ lib64/wx/include/gtk2-ansi-release-2.6 -I/usr/include/wx-2.6 -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2. 0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/python2.4 -c src/gtk/grid_wrap.cpp -o build-gtk2/temp.linu x-x86_64-2.4/src/gtk/grid_wrap.o cc1plus: warning: command line option "-Wimplicit-function-declaration" is valid for C/ObjC but not for C++ cc1plus: warning: command line option "-Wimplicit-function-declaration" is valid for C/ObjC but not for C++ ... dirtyepic@gentoo.org 2007-12-28 20:40:38 0000 i took a look at this and i can't find where CFLAGS gets picked up by the build system. the only place that it seems to even look is in config.py: cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] which still wouldn't use CFLAGS. unless it gets this info from swig somehow. vapier@gentoo.org 2007-12-29 10:06:45 0000 i'm guessing this is distutils failing /usr/lib/python2.5/distutils/sysconfig.py this checks CFLAGS, CPPFLAGS, and LDFLAGS -- no CXXFLAGS markpeloquin@gmail.com 2008-04-03 07:50:42 0000 Created an attachment (id=148178) distutils uses CXXFLAGS instead of CFLAGS for C++ files I added "-include killcpp.h" to CFLAGS, where killcpp.h contained illegal c++ code, but valid c. emerge finished, so I'm pretty sure my solution worked :) I'm pretty sure it's correct, but I hope somebody with more python skills can look it over. I hope nobody minds that I patched against python-2.5.2, but that's what I have installed, and I need some sleep. markpeloquin@gmail.com 2008-04-03 08:01:32 0000 (From update of attachment 148178) strangeness crept in markpeloquin@gmail.com 2008-04-03 08:02:58 0000 Created an attachment (id=148180) fixed some strange things in my last patch (irrelevant code) dev-zero@gentoo.org 2008-04-03 13:00:12 0000 @Mark: nice job. The patch I started working on was meant to do the same but you were a bit faster. I guess it can be included as it is. vapier@gentoo.org 2008-04-07 02:03:28 0000 where did you get the .c/.m list of types ? there are other types which should go through the C compiler, but i think it may be saner to flip the logic ... hard code the list for C++, and have everything else go through C ... otherwise, thanks, it looks good :) markpeloquin@gmail.com 2008-04-07 06:18:36 0000 Created an attachment (id=148946) Better language detection Maybe this is more what you're looking for. I found a function detect_language() that uses a map of extension -> language. Below is a patch from my previous revision to this one. markpeloquin@gmail.com 2008-04-07 06:20:21 0000 Created an attachment (id=148947) The difference between last two revisions I made. vapier@gentoo.org 2008-04-07 21:33:46 0000 ah, very nice ... that looks good to me hawking@gentoo.org 2008-04-18 14:31:49 0000 +*python-2.5.2 (18 Apr 2008) +*python-2.4.4-r10 (18 Apr 2008) +*python-2.3.6-r5 (18 Apr 2008) + + 18 Apr 2008; Ali Polatel <hawking@gentoo.org> +python-2.3.6-r5.ebuild, + +python-2.4.4-r10.ebuild, +python-2.5.2.ebuild: + Version bumps. Updated patchsets to fix buffer overflow in zlib extension + (CVE-2008-1721) bug 217221 and unsafe PyString_FromStringAndSize(). Added + patch by Mark Peloquin for distutils to respect CXXFLAGS, bug 145206. Add + wininst USE flag to conditionally install MS Windows executables, bug + 198021. Use EAPI=1, rename nothreads and nocxx USE flags to threads and + cxx. + Thanks Mark, I've included your patch to our patchset. dsdale24@gmail.com 2008-04-19 13:48:13 0000 Yikes, this patch breaks distutils if CXXFLAGS is not defined. I discovered it when I tried to compile matplotlib outside of portage. Distutils fails with the following traceback: Traceback (most recent call last): File "setup.py", line 277, in <module> **additional_params File "/usr/lib64/python2.5/distutils/core.py", line 151, in setup dist.run_commands() File "/usr/lib64/python2.5/distutils/dist.py", line 974, in run_commands self.run_command(cmd) File "/usr/lib64/python2.5/distutils/dist.py", line 994, in run_command cmd_obj.run() File "/usr/lib64/python2.5/distutils/command/build.py", line 112, in run self.run_command(cmd_name) File "/usr/lib64/python2.5/distutils/cmd.py", line 333, in run_command self.distribution.run_command(command) File "/usr/lib64/python2.5/distutils/dist.py", line 994, in run_command cmd_obj.run() File "/usr/lib64/python2.5/distutils/command/build_ext.py", line 265, in run customize_compiler(self.compiler) File "/usr/lib64/python2.5/distutils/sysconfig.py", line 177, in customize_compiler cxx_cmd = cxx + ' ' + cxxflags TypeError: cannot concatenate 'str' and 'NoneType' objects If I define CXXFLAGS, I can compile again. hawking@gentoo.org 2008-04-19 14:46:35 0000 2.5.2-r2 and 2.4.4-r11 fixes that. 148178 2008-04-03 07:50 0000 distutils uses CXXFLAGS instead of CFLAGS for C++ files python-2.5.2-distutils-cxxflags.patch text/plain LS0tIFB5dGhvbi0yLjUuMi9MaWIvZGlzdHV0aWxzL3N5c2NvbmZpZy5weQkyMDA4LTA0LTAzIDAy OjMzOjEwLjAwMDAwMDAwMCAtMDUwMAorKysgUHl0aG9uLTIuNS4yL0xpYi9kaXN0dXRpbHMvc3lz Y29uZmlnLnB5CTIwMDgtMDQtMDMgMDI6Mzc6MTIuMDAwMDAwMDAwIC0wNTAwCkBAIC0xNDYsOSAr MTQ2LDEwIEBAIGRlZiBjdXN0b21pemVfY29tcGlsZXIoY29tcGlsZXIpOgogICAgIHZhcmllcyBh Y3Jvc3MgVW5pY2VzIGFuZCBpcyBzdG9yZWQgaW4gUHl0aG9uJ3MgTWFrZWZpbGUuCiAgICAgIiIi CiAgICAgaWYgY29tcGlsZXIuY29tcGlsZXJfdHlwZSA9PSAidW5peCI6Ci0gICAgICAgIChjYywg Y3h4LCBvcHQsIGNmbGFncywgY2NzaGFyZWQsIGxkc2hhcmVkLCBzb19leHQpID0gXAotICAgICAg ICAgICAgZ2V0X2NvbmZpZ192YXJzKCdDQycsICdDWFgnLCAnT1BUJywgJ0NGTEFHUycsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ0NDU0hBUkVEJywgJ0xEU0hBUkVEJywgJ1NPJykKKyAg ICAgICAgKGNjLCBjeHgsIG9wdCwgY2ZsYWdzLCBiYXNlY2ZsYWdzLCBjY3NoYXJlZCwgbGRzaGFy ZWQsIHNvX2V4dCwKKyAgICAgICAgICAgIGN4eGZsYWdzKSA9ICgKKyAgICAgICAgICAgIGdldF9j b25maWdfdmFycygnQ0MnLCAnQ1hYJywgJ09QVCcsICdDRkxBR1MnLCAnQkFTRUNGTEFHUycsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0NDU0hBUkVEJywgJ0xEU0hBUkVEJywgJ1NPJywg J0NYWEZMQUdTJykpCiAKICAgICAgICAgaWYgb3MuZW52aXJvbi5oYXNfa2V5KCdDQycpOgogICAg ICAgICAgICAgY2MgPSBvcy5lbnZpcm9uWydDQyddCkBAIC0xNjMsMTkgKzE2NCwyMyBAQCBkZWYg Y3VzdG9taXplX2NvbXBpbGVyKGNvbXBpbGVyKToKICAgICAgICAgaWYgb3MuZW52aXJvbi5oYXNf a2V5KCdMREZMQUdTJyk6CiAgICAgICAgICAgICBsZHNoYXJlZCA9IGxkc2hhcmVkICsgJyAnICsg b3MuZW52aXJvblsnTERGTEFHUyddCiAgICAgICAgIGlmIG9zLmVudmlyb24uaGFzX2tleSgnQ0ZM QUdTJyk6Ci0gICAgICAgICAgICBjZmxhZ3MgPSBvcHQgKyAnICcgKyBvcy5lbnZpcm9uWydDRkxB R1MnXQorICAgICAgICAgICAgY2ZsYWdzID0gYmFzZWNmbGFncyArICcgJyArIG9zLmVudmlyb25b J0NGTEFHUyddCiAgICAgICAgICAgICBsZHNoYXJlZCA9IGxkc2hhcmVkICsgJyAnICsgb3MuZW52 aXJvblsnQ0ZMQUdTJ10KICAgICAgICAgaWYgb3MuZW52aXJvbi5oYXNfa2V5KCdDUFBGTEFHUycp OgogICAgICAgICAgICAgY3BwID0gY3BwICsgJyAnICsgb3MuZW52aXJvblsnQ1BQRkxBR1MnXQog ICAgICAgICAgICAgY2ZsYWdzID0gY2ZsYWdzICsgJyAnICsgb3MuZW52aXJvblsnQ1BQRkxBR1Mn XQogICAgICAgICAgICAgbGRzaGFyZWQgPSBsZHNoYXJlZCArICcgJyArIG9zLmVudmlyb25bJ0NQ UEZMQUdTJ10KKyAgICAgICAgaWYgb3MuZW52aXJvbi5oYXNfa2V5KCdDWFhGTEFHUycpOgorICAg ICAgICAgICAgY3h4ZmxhZ3MgPSBiYXNlY2ZsYWdzICsgJyAnICsgb3MuZW52aXJvblsnQ1hYRkxB R1MnXQogCiAgICAgICAgIGNjX2NtZCA9IGNjICsgJyAnICsgY2ZsYWdzCisgICAgICAgIGN4eF9j bWQgPSBjeHggKyAnICcgKyBjeHhmbGFncwogICAgICAgICBjb21waWxlci5zZXRfZXhlY3V0YWJs ZXMoCiAgICAgICAgICAgICBwcmVwcm9jZXNzb3I9Y3BwLAogICAgICAgICAgICAgY29tcGlsZXI9 Y2NfY21kLAogICAgICAgICAgICAgY29tcGlsZXJfc289Y2NfY21kICsgJyAnICsgY2NzaGFyZWQs Ci0gICAgICAgICAgICBjb21waWxlcl9jeHg9Y3h4LAorICAgICAgICAgICAgY29tcGlsZXJfY3h4 PWN4eF9jbWQsCisgICAgICAgICAgICBjb21waWxlcl9jeHhfc289Y3h4X2NtZCArICcgJyArIGNj c2hhcmVkLAogICAgICAgICAgICAgbGlua2VyX3NvPWxkc2hhcmVkLAogICAgICAgICAgICAgbGlu a2VyX2V4ZT1jYykKIApAQCAtNTEyLDYgKzUxNyw3IEBAIGRlZiBnZXRfY29uZmlnX3ZhcnMoKmFy Z3MpOgogICAgICAgICAgICAgICAgIGZvciBrZXkgaW4gKCdMREZMQUdTJywgJ0JBU0VDRkxBR1Mn LAogICAgICAgICAgICAgICAgICAgICAgICAgIyBhIG51bWJlciBvZiBkZXJpdmVkIHZhcmlhYmxl cy4gVGhlc2UgbmVlZCB0byBiZQogICAgICAgICAgICAgICAgICAgICAgICAgIyBwYXRjaGVkIHVw IGFzIHdlbGwuCisgICAgICAgICAgICAgICAgICAgICAgICAnQ1hYRkxBR1MnLAogICAgICAgICAg ICAgICAgICAgICAgICAgJ0NGTEFHUycsICdQWV9DRkxBR1MnLCAnQkxEU0hBUkVEJyk6CiAKICAg ICAgICAgICAgICAgICAgICAgZmxhZ3MgPSBfY29uZmlnX3ZhcnNba2V5XQotLS0gUHl0aG9uLTIu NS4yL0xpYi9kaXN0dXRpbHMvdW5peGNjb21waWxlci5weQkyMDA4LTA0LTAzIDAyOjMzOjEwLjAw MDAwMDAwMCAtMDUwMAorKysgUHl0aG9uLTIuNS4yL0xpYi9kaXN0dXRpbHMvdW5peGNjb21waWxl ci5weQkyMDA4LTA0LTAzIDAyOjQxOjMwLjAwMDAwMDAwMCAtMDUwMApAQCAtMTE0LDYgKzExNCw3 IEBAIGNsYXNzIFVuaXhDQ29tcGlsZXIoQ0NvbXBpbGVyKToKICAgICAgICAgICAgICAgICAgICAn Y29tcGlsZXInICAgICA6IFsiY2MiXSwKICAgICAgICAgICAgICAgICAgICAnY29tcGlsZXJfc28n ICA6IFsiY2MiXSwKICAgICAgICAgICAgICAgICAgICAnY29tcGlsZXJfY3h4JyA6IFsiY2MiXSwK KwkJICAgJ2NvbXBpbGVyX2N4eF9zbycgOiBbImNjIl0sCiAgICAgICAgICAgICAgICAgICAgJ2xp bmtlcl9zbycgICAgOiBbImNjIiwgIi1zaGFyZWQiXSwKICAgICAgICAgICAgICAgICAgICAnbGlu a2VyX2V4ZScgICA6IFsiY2MiXSwKICAgICAgICAgICAgICAgICAgICAnYXJjaGl2ZXInICAgICA6 IFsiYXIiLCAiLWNyIl0sCkBAIC0xNjcsMTAgKzE2OCwxNSBAQCBjbGFzcyBVbml4Q0NvbXBpbGVy KENDb21waWxlcik6CiAKICAgICBkZWYgX2NvbXBpbGUoc2VsZiwgb2JqLCBzcmMsIGV4dCwgY2Nf YXJncywgZXh0cmFfcG9zdGFyZ3MsIHBwX29wdHMpOgogICAgICAgICBjb21waWxlcl9zbyA9IHNl bGYuY29tcGlsZXJfc28KKyAgICAgICAgY29tcGlsZXJfY3h4X3NvID0gc2VsZi5jb21waWxlcl9j eHhfc28KICAgICAgICAgaWYgc3lzLnBsYXRmb3JtID09ICdkYXJ3aW4nOgogICAgICAgICAgICAg Y29tcGlsZXJfc28gPSBfZGFyd2luX2NvbXBpbGVyX2ZpeHVwKGNvbXBpbGVyX3NvLCBjY19hcmdz ICsgZXh0cmFfcG9zdGFyZ3MpCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYuc3Bhd24o Y29tcGlsZXJfc28gKyBjY19hcmdzICsgW3NyYywgJy1vJywgb2JqXSArCisgICAgICAgICAgICBp ZiBleHQgPT0gJy5jJyBvciBleHQgPT0gJy5tJzoKKyAgICAgICAgICAgICAgICBjYyA9IGNvbXBp bGVyX3NvICsgY2NfYXJncworICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBjYyA9 IGNvbXBpbGVyX2N4eF9zbyArIGNjX2FyZ3MKKyAgICAgICAgICAgIHNlbGYuc3Bhd24oY2MgKyBj Y19hcmdzICsgW3NyYywgJy1vJywgb2JqXSArCiAgICAgICAgICAgICAgICAgICAgICAgIGV4dHJh X3Bvc3RhcmdzKQogICAgICAgICBleGNlcHQgRGlzdHV0aWxzRXhlY0Vycm9yLCBtc2c6CiAgICAg ICAgICAgICByYWlzZSBDb21waWxlRXJyb3IsIG1zZwo= 148180 2008-04-03 08:02 0000 fixed some strange things in my last patch (irrelevant code) python-2.5.2-distutils-cxxflags.patch text/plain LS0tIFB5dGhvbi0yLjUuMi9MaWIvZGlzdHV0aWxzL3N5c2NvbmZpZy5weQkyMDA4LTA0LTAzIDAy OjMzOjEwLjAwMDAwMDAwMCAtMDUwMAorKysgUHl0aG9uLTIuNS4yL0xpYi9kaXN0dXRpbHMvc3lz Y29uZmlnLnB5CTIwMDgtMDQtMDMgMDI6Mzc6MTIuMDAwMDAwMDAwIC0wNTAwCkBAIC0xNDYsOSAr MTQ2LDkgQEAgZGVmIGN1c3RvbWl6ZV9jb21waWxlcihjb21waWxlcik6CiAgICAgdmFyaWVzIGFj cm9zcyBVbmljZXMgYW5kIGlzIHN0b3JlZCBpbiBQeXRob24ncyBNYWtlZmlsZS4KICAgICAiIiIK ICAgICBpZiBjb21waWxlci5jb21waWxlcl90eXBlID09ICJ1bml4IjoKLSAgICAgICAgKGNjLCBj eHgsIG9wdCwgY2ZsYWdzLCBjY3NoYXJlZCwgbGRzaGFyZWQsIHNvX2V4dCkgPSBcCi0gICAgICAg ICAgICBnZXRfY29uZmlnX3ZhcnMoJ0NDJywgJ0NYWCcsICdPUFQnLCAnQ0ZMQUdTJywKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnQ0NTSEFSRUQnLCAnTERTSEFSRUQnLCAnU08nKQorICAg ICAgICAoY2MsIGN4eCwgb3B0LCBjZmxhZ3MsIGNjc2hhcmVkLCBsZHNoYXJlZCwgc29fZXh0LCBj eHhmbGFncykgPSAoCisgICAgICAgICAgICBnZXRfY29uZmlnX3ZhcnMoJ0NDJywgJ0NYWCcsICdP UFQnLCAnQ0ZMQUdTJywgJ0NDU0hBUkVEJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAn TERTSEFSRUQnLCAnU08nLCAnQ1hYRkxBR1MnKSkKIAogICAgICAgICBpZiBvcy5lbnZpcm9uLmhh c19rZXkoJ0NDJyk6CiAgICAgICAgICAgICBjYyA9IG9zLmVudmlyb25bJ0NDJ10KQEAgLTE2OSwx MyArMTY5LDE3IEBAIGRlZiBjdXN0b21pemVfY29tcGlsZXIoY29tcGlsZXIpOgogICAgICAgICAg ICAgY3BwID0gY3BwICsgJyAnICsgb3MuZW52aXJvblsnQ1BQRkxBR1MnXQogICAgICAgICAgICAg Y2ZsYWdzID0gY2ZsYWdzICsgJyAnICsgb3MuZW52aXJvblsnQ1BQRkxBR1MnXQogICAgICAgICAg ICAgbGRzaGFyZWQgPSBsZHNoYXJlZCArICcgJyArIG9zLmVudmlyb25bJ0NQUEZMQUdTJ10KKyAg ICAgICAgaWYgb3MuZW52aXJvbi5oYXNfa2V5KCdDWFhGTEFHUycpOgorICAgICAgICAgICAgY3h4 ZmxhZ3MgPSBvcHQgKyAnICcgKyBvcy5lbnZpcm9uWydDWFhGTEFHUyddCiAKICAgICAgICAgY2Nf Y21kID0gY2MgKyAnICcgKyBjZmxhZ3MKKyAgICAgICAgY3h4X2NtZCA9IGN4eCArICcgJyArIGN4 eGZsYWdzCiAgICAgICAgIGNvbXBpbGVyLnNldF9leGVjdXRhYmxlcygKICAgICAgICAgICAgIHBy ZXByb2Nlc3Nvcj1jcHAsCiAgICAgICAgICAgICBjb21waWxlcj1jY19jbWQsCiAgICAgICAgICAg ICBjb21waWxlcl9zbz1jY19jbWQgKyAnICcgKyBjY3NoYXJlZCwKLSAgICAgICAgICAgIGNvbXBp bGVyX2N4eD1jeHgsCisgICAgICAgICAgICBjb21waWxlcl9jeHg9Y3h4X2NtZCwKKyAgICAgICAg ICAgIGNvbXBpbGVyX2N4eF9zbz1jeHhfY21kICsgJyAnICsgY2NzaGFyZWQsCiAgICAgICAgICAg ICBsaW5rZXJfc289bGRzaGFyZWQsCiAgICAgICAgICAgICBsaW5rZXJfZXhlPWNjKQogCkBAIC01 MTIsNiArNTE2LDcgQEAgZGVmIGdldF9jb25maWdfdmFycygqYXJncyk6CiAgICAgICAgICAgICAg ICAgZm9yIGtleSBpbiAoJ0xERkxBR1MnLCAnQkFTRUNGTEFHUycsCiAgICAgICAgICAgICAgICAg ICAgICAgICAjIGEgbnVtYmVyIG9mIGRlcml2ZWQgdmFyaWFibGVzLiBUaGVzZSBuZWVkIHRvIGJl CiAgICAgICAgICAgICAgICAgICAgICAgICAjIHBhdGNoZWQgdXAgYXMgd2VsbC4KKyAgICAgICAg ICAgICAgICAgICAgICAgICdDWFhGTEFHUycsCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ0ZM QUdTJywgJ1BZX0NGTEFHUycsICdCTERTSEFSRUQnKToKIAogICAgICAgICAgICAgICAgICAgICBm bGFncyA9IF9jb25maWdfdmFyc1trZXldCi0tLSBQeXRob24tMi41LjIvTGliL2Rpc3R1dGlscy91 bml4Y2NvbXBpbGVyLnB5CTIwMDgtMDQtMDMgMDI6MzM6MTAuMDAwMDAwMDAwIC0wNTAwCisrKyBQ eXRob24tMi41LjIvTGliL2Rpc3R1dGlscy91bml4Y2NvbXBpbGVyLnB5CTIwMDgtMDQtMDMgMDI6 NDE6MzAuMDAwMDAwMDAwIC0wNTAwCkBAIC0xMTQsNiArMTE0LDcgQEAgY2xhc3MgVW5peENDb21w aWxlcihDQ29tcGlsZXIpOgogICAgICAgICAgICAgICAgICAgICdjb21waWxlcicgICAgIDogWyJj YyJdLAogICAgICAgICAgICAgICAgICAgICdjb21waWxlcl9zbycgIDogWyJjYyJdLAogICAgICAg ICAgICAgICAgICAgICdjb21waWxlcl9jeHgnIDogWyJjYyJdLAorICAgICAgICAgICAgICAgICAg ICdjb21waWxlcl9jeHhfc28nIDogWyJjYyJdLAogICAgICAgICAgICAgICAgICAgICdsaW5rZXJf c28nICAgIDogWyJjYyIsICItc2hhcmVkIl0sCiAgICAgICAgICAgICAgICAgICAgJ2xpbmtlcl9l eGUnICAgOiBbImNjIl0sCiAgICAgICAgICAgICAgICAgICAgJ2FyY2hpdmVyJyAgICAgOiBbImFy IiwgIi1jciJdLApAQCAtMTY3LDEwICsxNjgsMTUgQEAgY2xhc3MgVW5peENDb21waWxlcihDQ29t cGlsZXIpOgogCiAgICAgZGVmIF9jb21waWxlKHNlbGYsIG9iaiwgc3JjLCBleHQsIGNjX2FyZ3Ms IGV4dHJhX3Bvc3RhcmdzLCBwcF9vcHRzKToKICAgICAgICAgY29tcGlsZXJfc28gPSBzZWxmLmNv bXBpbGVyX3NvCisgICAgICAgIGNvbXBpbGVyX2N4eF9zbyA9IHNlbGYuY29tcGlsZXJfY3h4X3Nv CiAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAnZGFyd2luJzoKICAgICAgICAgICAgIGNvbXBp bGVyX3NvID0gX2Rhcndpbl9jb21waWxlcl9maXh1cChjb21waWxlcl9zbywgY2NfYXJncyArIGV4 dHJhX3Bvc3RhcmdzKQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBzZWxmLnNwYXduKGNvbXBp bGVyX3NvICsgY2NfYXJncyArIFtzcmMsICctbycsIG9ial0gKworICAgICAgICAgICAgaWYgZXh0 ID09ICcuYycgb3IgZXh0ID09ICcubSc6CisgICAgICAgICAgICAgICAgY2MgPSBjb21waWxlcl9z byArIGNjX2FyZ3MKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgY2MgPSBjb21w aWxlcl9jeHhfc28gKyBjY19hcmdzCisgICAgICAgICAgICBzZWxmLnNwYXduKGNjICsgY2NfYXJn cyArIFtzcmMsICctbycsIG9ial0gKwogICAgICAgICAgICAgICAgICAgICAgICBleHRyYV9wb3N0 YXJncykKICAgICAgICAgZXhjZXB0IERpc3R1dGlsc0V4ZWNFcnJvciwgbXNnOgogICAgICAgICAg ICAgcmFpc2UgQ29tcGlsZUVycm9yLCBtc2cK 148946 2008-04-07 06:18 0000 Better language detection python-2.5.2-distutils-cxxflags.patch text/plain LS0tIFB5dGhvbi0yLjUuMi9MaWIvZGlzdHV0aWxzL2Njb21waWxlci5weQkyMDA4LTA0LTA3IDAx OjA2OjIwLjAwMDAwMDAwMCAtMDUwMAorKysgUHl0aG9uLTIuNS4yL0xpYi9kaXN0dXRpbHMvY2Nv bXBpbGVyLnB5CTIwMDgtMDQtMDcgMDE6MTA6NTEuMDAwMDAwMDAwIC0wNTAwCkBAIC02ODksMTIg KzY4OSwxNSBAQCBjbGFzcyBDQ29tcGlsZXI6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkZXBlbmRzLCBleHRyYV9wb3N0YXJncykKICAgICAgICAgY2NfYXJncyA9IHNlbGYu X2dldF9jY19hcmdzKHBwX29wdHMsIGRlYnVnLCBleHRyYV9wcmVhcmdzKQogCisgICAgICAgIGxh bmcgPSBzZWxmLmRldGVjdF9sYW5ndWFnZShzb3VyY2VzKQorCiAgICAgICAgIGZvciBvYmogaW4g b2JqZWN0czoKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICBzcmMsIGV4dCA9IGJ1 aWxkW29ial0KICAgICAgICAgICAgIGV4Y2VwdCBLZXlFcnJvcjoKICAgICAgICAgICAgICAgICBj b250aW51ZQotICAgICAgICAgICAgc2VsZi5fY29tcGlsZShvYmosIHNyYywgZXh0LCBjY19hcmdz LCBleHRyYV9wb3N0YXJncywgcHBfb3B0cykKKyAgICAgICAgICAgIHNlbGYuX2NvbXBpbGUob2Jq LCBzcmMsIGV4dCwgY2NfYXJncywgZXh0cmFfcG9zdGFyZ3MsIHBwX29wdHMsCisgICAgICAgICAg ICAgICAgICAgICAgICAgIGxhbmc9bGFuZykKIAogICAgICAgICAjIFJldHVybiAqYWxsKiBvYmpl Y3QgZmlsZW5hbWVzLCBub3QganVzdCB0aGUgb25lcyB3ZSBqdXN0IGJ1aWx0LgogICAgICAgICBy ZXR1cm4gb2JqZWN0cwotLS0gUHl0aG9uLTIuNS4yL0xpYi9kaXN0dXRpbHMvc3lzY29uZmlnLnB5 CTIwMDgtMDQtMDcgMDE6MDY6MjAuMDAwMDAwMDAwIC0wNTAwCisrKyBQeXRob24tMi41LjIvTGli L2Rpc3R1dGlscy9zeXNjb25maWcucHkJMjAwOC0wNC0wNyAwMDo0NTo0OS4wMDAwMDAwMDAgLTA1 MDAKQEAgLTE0Niw5ICsxNDYsOSBAQCBkZWYgY3VzdG9taXplX2NvbXBpbGVyKGNvbXBpbGVyKToK ICAgICB2YXJpZXMgYWNyb3NzIFVuaWNlcyBhbmQgaXMgc3RvcmVkIGluIFB5dGhvbidzIE1ha2Vm aWxlLgogICAgICIiIgogICAgIGlmIGNvbXBpbGVyLmNvbXBpbGVyX3R5cGUgPT0gInVuaXgiOgot ICAgICAgICAoY2MsIGN4eCwgb3B0LCBjZmxhZ3MsIGNjc2hhcmVkLCBsZHNoYXJlZCwgc29fZXh0 KSA9IFwKLSAgICAgICAgICAgIGdldF9jb25maWdfdmFycygnQ0MnLCAnQ1hYJywgJ09QVCcsICdD RkxBR1MnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICdDQ1NIQVJFRCcsICdMRFNIQVJF RCcsICdTTycpCisgICAgICAgIChjYywgY3h4LCBvcHQsIGNmbGFncywgY2NzaGFyZWQsIGxkc2hh cmVkLCBzb19leHQsIGN4eGZsYWdzKSA9ICgKKyAgICAgICAgICAgIGdldF9jb25maWdfdmFycygn Q0MnLCAnQ1hYJywgJ09QVCcsICdDRkxBR1MnLCAnQ0NTSEFSRUQnLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICdMRFNIQVJFRCcsICdTTycsICdDWFhGTEFHUycpKQogCiAgICAgICAgIGlm IG9zLmVudmlyb24uaGFzX2tleSgnQ0MnKToKICAgICAgICAgICAgIGNjID0gb3MuZW52aXJvblsn Q0MnXQpAQCAtMTY5LDEzICsxNjksMTcgQEAgZGVmIGN1c3RvbWl6ZV9jb21waWxlcihjb21waWxl cik6CiAgICAgICAgICAgICBjcHAgPSBjcHAgKyAnICcgKyBvcy5lbnZpcm9uWydDUFBGTEFHUydd CiAgICAgICAgICAgICBjZmxhZ3MgPSBjZmxhZ3MgKyAnICcgKyBvcy5lbnZpcm9uWydDUFBGTEFH UyddCiAgICAgICAgICAgICBsZHNoYXJlZCA9IGxkc2hhcmVkICsgJyAnICsgb3MuZW52aXJvblsn Q1BQRkxBR1MnXQorICAgICAgICBpZiBvcy5lbnZpcm9uLmhhc19rZXkoJ0NYWEZMQUdTJyk6Cisg ICAgICAgICAgICBjeHhmbGFncyA9IG9wdCArICcgJyArIG9zLmVudmlyb25bJ0NYWEZMQUdTJ10K IAogICAgICAgICBjY19jbWQgPSBjYyArICcgJyArIGNmbGFncworICAgICAgICBjeHhfY21kID0g Y3h4ICsgJyAnICsgY3h4ZmxhZ3MKICAgICAgICAgY29tcGlsZXIuc2V0X2V4ZWN1dGFibGVzKAog ICAgICAgICAgICAgcHJlcHJvY2Vzc29yPWNwcCwKICAgICAgICAgICAgIGNvbXBpbGVyPWNjX2Nt ZCwKICAgICAgICAgICAgIGNvbXBpbGVyX3NvPWNjX2NtZCArICcgJyArIGNjc2hhcmVkLAotICAg ICAgICAgICAgY29tcGlsZXJfY3h4PWN4eCwKKyAgICAgICAgICAgIGNvbXBpbGVyX2N4eD1jeHhf Y21kLAorICAgICAgICAgICAgY29tcGlsZXJfY3h4X3NvPWN4eF9jbWQgKyAnICcgKyBjY3NoYXJl ZCwKICAgICAgICAgICAgIGxpbmtlcl9zbz1sZHNoYXJlZCwKICAgICAgICAgICAgIGxpbmtlcl9l eGU9Y2MpCiAKQEAgLTUxMiw2ICs1MTYsNyBAQCBkZWYgZ2V0X2NvbmZpZ192YXJzKCphcmdzKToK ICAgICAgICAgICAgICAgICBmb3Iga2V5IGluICgnTERGTEFHUycsICdCQVNFQ0ZMQUdTJywKICAg ICAgICAgICAgICAgICAgICAgICAgICMgYSBudW1iZXIgb2YgZGVyaXZlZCB2YXJpYWJsZXMuIFRo ZXNlIG5lZWQgdG8gYmUKICAgICAgICAgICAgICAgICAgICAgICAgICMgcGF0Y2hlZCB1cCBhcyB3 ZWxsLgorICAgICAgICAgICAgICAgICAgICAgICAgJ0NYWEZMQUdTJywKICAgICAgICAgICAgICAg ICAgICAgICAgICdDRkxBR1MnLCAnUFlfQ0ZMQUdTJywgJ0JMRFNIQVJFRCcpOgogCiAgICAgICAg ICAgICAgICAgICAgIGZsYWdzID0gX2NvbmZpZ192YXJzW2tleV0KLS0tIFB5dGhvbi0yLjUuMi9M aWIvZGlzdHV0aWxzL3VuaXhjY29tcGlsZXIucHkJMjAwOC0wNC0wNyAwMTowNjoyMC4wMDAwMDAw MDAgLTA1MDAKKysrIFB5dGhvbi0yLjUuMi9MaWIvZGlzdHV0aWxzL3VuaXhjY29tcGlsZXIucHkJ MjAwOC0wNC0wNyAwMToxMDo1NC4wMDAwMDAwMDAgLTA1MDAKQEAgLTExNCw2ICsxMTQsNyBAQCBj bGFzcyBVbml4Q0NvbXBpbGVyKENDb21waWxlcik6CiAgICAgICAgICAgICAgICAgICAgJ2NvbXBp bGVyJyAgICAgOiBbImNjIl0sCiAgICAgICAgICAgICAgICAgICAgJ2NvbXBpbGVyX3NvJyAgOiBb ImNjIl0sCiAgICAgICAgICAgICAgICAgICAgJ2NvbXBpbGVyX2N4eCcgOiBbImNjIl0sCisgICAg ICAgICAgICAgICAgICAgJ2NvbXBpbGVyX2N4eF9zbycgOiBbImNjIl0sCiAgICAgICAgICAgICAg ICAgICAgJ2xpbmtlcl9zbycgICAgOiBbImNjIiwgIi1zaGFyZWQiXSwKICAgICAgICAgICAgICAg ICAgICAnbGlua2VyX2V4ZScgICA6IFsiY2MiXSwKICAgICAgICAgICAgICAgICAgICAnYXJjaGl2 ZXInICAgICA6IFsiYXIiLCAiLWNyIl0sCkBAIC0xNjUsMTIgKzE2NiwxOCBAQCBjbGFzcyBVbml4 Q0NvbXBpbGVyKENDb21waWxlcik6CiAgICAgICAgICAgICBleGNlcHQgRGlzdHV0aWxzRXhlY0Vy cm9yLCBtc2c6CiAgICAgICAgICAgICAgICAgcmFpc2UgQ29tcGlsZUVycm9yLCBtc2cKIAotICAg IGRlZiBfY29tcGlsZShzZWxmLCBvYmosIHNyYywgZXh0LCBjY19hcmdzLCBleHRyYV9wb3N0YXJn cywgcHBfb3B0cyk6CisgICAgZGVmIF9jb21waWxlKHNlbGYsIG9iaiwgc3JjLCBleHQsIGNjX2Fy Z3MsIGV4dHJhX3Bvc3RhcmdzLCBwcF9vcHRzLAorICAgICAgICAgICAgICAgICBsYW5nPSdjJyk6 CiAgICAgICAgIGNvbXBpbGVyX3NvID0gc2VsZi5jb21waWxlcl9zbworICAgICAgICBjb21waWxl cl9jeHhfc28gPSBzZWxmLmNvbXBpbGVyX2N4eF9zbwogICAgICAgICBpZiBzeXMucGxhdGZvcm0g PT0gJ2Rhcndpbic6CiAgICAgICAgICAgICBjb21waWxlcl9zbyA9IF9kYXJ3aW5fY29tcGlsZXJf Zml4dXAoY29tcGlsZXJfc28sIGNjX2FyZ3MgKyBleHRyYV9wb3N0YXJncykKICAgICAgICAgdHJ5 OgotICAgICAgICAgICAgc2VsZi5zcGF3bihjb21waWxlcl9zbyArIGNjX2FyZ3MgKyBbc3JjLCAn LW8nLCBvYmpdICsKKyAgICAgICAgICAgIGlmIGxhbmcgPT0gJ2MrKyc6CisgICAgICAgICAgICAg ICAgY2MgPSBjb21waWxlcl9jeHhfc28gKyBjY19hcmdzCisgICAgICAgICAgICBlbHNlOgorICAg ICAgICAgICAgICAgIGNjID0gY29tcGlsZXJfc28gKyBjY19hcmdzCisgICAgICAgICAgICBzZWxm LnNwYXduKGNjICsgY2NfYXJncyArIFtzcmMsICctbycsIG9ial0gKwogICAgICAgICAgICAgICAg ICAgICAgICBleHRyYV9wb3N0YXJncykKICAgICAgICAgZXhjZXB0IERpc3R1dGlsc0V4ZWNFcnJv ciwgbXNnOgogICAgICAgICAgICAgcmFpc2UgQ29tcGlsZUVycm9yLCBtc2cK 148947 2008-04-07 06:20 0000 The difference between last two revisions I made. diff-between-revisions.patch text/plain LS0tIFB5dGhvbi0yLjUuMi5vbGQxL0xpYi9kaXN0dXRpbHMvY2NvbXBpbGVyLnB5CTIwMDgtMDQt MDcgMDA6NDQ6NDYuMDAwMDAwMDAwIC0wNTAwCisrKyBQeXRob24tMi41LjIvTGliL2Rpc3R1dGls cy9jY29tcGlsZXIucHkJMjAwOC0wNC0wNyAwMToxMDo1MS4wMDAwMDAwMDAgLTA1MDAKQEAgLTY4 OSwxMiArNjg5LDE1IEBAIGNsYXNzIENDb21waWxlcjoKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRlcGVuZHMsIGV4dHJhX3Bvc3RhcmdzKQogICAgICAgICBjY19hcmdzID0g c2VsZi5fZ2V0X2NjX2FyZ3MocHBfb3B0cywgZGVidWcsIGV4dHJhX3ByZWFyZ3MpCiAKKyAgICAg ICAgbGFuZyA9IHNlbGYuZGV0ZWN0X2xhbmd1YWdlKHNvdXJjZXMpCisKICAgICAgICAgZm9yIG9i aiBpbiBvYmplY3RzOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHNyYywgZXh0 ID0gYnVpbGRbb2JqXQogICAgICAgICAgICAgZXhjZXB0IEtleUVycm9yOgogICAgICAgICAgICAg ICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBzZWxmLl9jb21waWxlKG9iaiwgc3JjLCBleHQsIGNj X2FyZ3MsIGV4dHJhX3Bvc3RhcmdzLCBwcF9vcHRzKQorICAgICAgICAgICAgc2VsZi5fY29tcGls ZShvYmosIHNyYywgZXh0LCBjY19hcmdzLCBleHRyYV9wb3N0YXJncywgcHBfb3B0cywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgbGFuZz1sYW5nKQogCiAgICAgICAgICMgUmV0dXJuICphbGwq IG9iamVjdCBmaWxlbmFtZXMsIG5vdCBqdXN0IHRoZSBvbmVzIHdlIGp1c3QgYnVpbHQuCiAgICAg ICAgIHJldHVybiBvYmplY3RzCi0tLSBQeXRob24tMi41LjIub2xkMS9MaWIvZGlzdHV0aWxzL3Vu aXhjY29tcGlsZXIucHkJMjAwOC0wNC0wNyAwMTowNzoyNS4wMDAwMDAwMDAgLTA1MDAKKysrIFB5 dGhvbi0yLjUuMi9MaWIvZGlzdHV0aWxzL3VuaXhjY29tcGlsZXIucHkJMjAwOC0wNC0wNyAwMTox MDo1NC4wMDAwMDAwMDAgLTA1MDAKQEAgLTE2NiwxNiArMTY2LDE3IEBAIGNsYXNzIFVuaXhDQ29t cGlsZXIoQ0NvbXBpbGVyKToKICAgICAgICAgICAgIGV4Y2VwdCBEaXN0dXRpbHNFeGVjRXJyb3Is IG1zZzoKICAgICAgICAgICAgICAgICByYWlzZSBDb21waWxlRXJyb3IsIG1zZwogCi0gICAgZGVm IF9jb21waWxlKHNlbGYsIG9iaiwgc3JjLCBleHQsIGNjX2FyZ3MsIGV4dHJhX3Bvc3RhcmdzLCBw cF9vcHRzKToKKyAgICBkZWYgX2NvbXBpbGUoc2VsZiwgb2JqLCBzcmMsIGV4dCwgY2NfYXJncywg ZXh0cmFfcG9zdGFyZ3MsIHBwX29wdHMsCisgICAgICAgICAgICAgICAgIGxhbmc9J2MnKToKICAg ICAgICAgY29tcGlsZXJfc28gPSBzZWxmLmNvbXBpbGVyX3NvCiAgICAgICAgIGNvbXBpbGVyX2N4 eF9zbyA9IHNlbGYuY29tcGlsZXJfY3h4X3NvCiAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAn ZGFyd2luJzoKICAgICAgICAgICAgIGNvbXBpbGVyX3NvID0gX2Rhcndpbl9jb21waWxlcl9maXh1 cChjb21waWxlcl9zbywgY2NfYXJncyArIGV4dHJhX3Bvc3RhcmdzKQogICAgICAgICB0cnk6Ci0g ICAgICAgICAgICBpZiBleHQgPT0gJy5jJyBvciBleHQgPT0gJy5tJzoKLSAgICAgICAgICAgICAg ICBjYyA9IGNvbXBpbGVyX3NvICsgY2NfYXJncwotICAgICAgICAgICAgZWxzZToKKyAgICAgICAg ICAgIGlmIGxhbmcgPT0gJ2MrKyc6CiAgICAgICAgICAgICAgICAgY2MgPSBjb21waWxlcl9jeHhf c28gKyBjY19hcmdzCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGNjID0gY29t cGlsZXJfc28gKyBjY19hcmdzCiAgICAgICAgICAgICBzZWxmLnNwYXduKGNjICsgY2NfYXJncyAr IFtzcmMsICctbycsIG9ial0gKwogICAgICAgICAgICAgICAgICAgICAgICBleHRyYV9wb3N0YXJn cykKICAgICAgICAgZXhjZXB0IERpc3R1dGlsc0V4ZWNFcnJvciwgbXNnOgo=