8000 Fix some failures by yan12125 · Pull Request #10 · rave-engine/python3-android · GitHub
[go: up one dir, main page]
Skip to content

Fix some failures #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2015
Merged

Fix some failures #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee73692
Link select.cpython-34m.so with libm.so
yan12125 Nov 21, 2015
969dbfa
Correctly handling in android_version()
yan12125 Nov 21, 2015
76ca331
Use utf-8 everywhere
yan12125 Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions mk/python/3.4.3/python-3.4.3-android-misc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -ru Python-3.3.5/Lib/platform.py Python-3.3.5-android/Lib/platform.py
--- Python-3.3.5/Lib/platform.py 2014-03-09 09:40:13.000000000 +0100
+++ Python-3.3.5-android/Lib/platform.py 2014-08-04 22:19:36.000000000 +0200
@@ -368,6 +368,63 @@
@@ -368,6 +368,76 @@
supported_dists=supported_dists,
full_distribution_name=0)

Expand Down Expand Up @@ -30,37 +30,50 @@ diff -ru Python-3.3.5/Lib/platform.py Python-3.3.5-android/Lib/platform.py
+ # Try the 'official' API tool first, since /system/build.prop might
+ # not be the only source for properties.
+ if os.access('/system/bin/getprop', os.X_OK):
+ def _getprop(prop):
+ android_property_fd = _get_android_property_fd()
+ pass_fds = (android_property_fd,) if android_property_fd else ()
+ try:
+ result = subprocess.check_output(['/system/bin/getprop', prop],
+ pass_fds=pass_fds)
+ return result.decode('utf-8').strip()
+ except (subprocess.CalledProcessError, UnicodeDecodeError):
+ raise RuntimeError('getprop failed')
+
+ try:
+ output = subprocess.check_output(['/system/bin/getprop',
+ _android_version_property])
+ version = output.decode('ascii').strip()
+ version = _getprop(_android_version_property)
+ version_obtained = True
+ except (subprocess.CalledProcessError, UnicodeDecodeError):
+ except RuntimeError:
+ pass
+
+ try:
+ output = subprocess.check_output(['/system/bin/getprop',
+ _android_buildstr_property])
+ buildstr = output.decode('ascii').strip()
+ buildstr = _getprop(_android_buildstr_property)
+ buildstr_obtained = True
+ except (subprocess.CalledProcessError, UnicodeDecodeError):
+ except RuntimeError:
+ pass
+ done = version_obtained and buildstr_obtained
+
+ # Fall back to parsing /system/build.prop manually.
+ if not done and os.path.isfile('/system/build.prop'):
+ for line in open('/system/build.prop'):
+ if '=' not in line:
+ for line in open('/system/build.prop', 'rb'):
+ if b'=' not in line:
+ continue
+ key, val = line.split('=')
+ key = key.strip()
+ key, val = line.split(b'=', maxsplit=1)
+ key = key.strip().decode('utf-8')
+
+ if not version_obtained and key == _android_version_property:
+ version = val.strip()
+ elif not buildstr_obtained and key == _android_buildstr_property:
+ buildstr = val.strip()
+ version = val.strip().decode('utf-8')
+ if not buildstr_obtained and key == _android_buildstr_property:
+ buildstr = val.strip().decode('utf-8')
+
+ return version, buildstr
+
+def _get_android_property_fd():
+ android_property_workspace = os.getenv('ANDROID_PROPERTY_WORKSPACE')
+ if android_property_workspace:
+ property_fd_str = android_property_workspace.split(',')[0]
+ if property_fd_str.isdigit():
+ return int(property_fd_str)
+
def popen(cmd, mode='r', bufsize=-1):

Expand Down
10 changes: 10 additions & 0 deletions mk/python/3.4.3/python-3.4.3-python-misc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@ diff -ru Python-3.3.5/setup.py Python-3.3.5-android/setup.py
lib = sysconfig.get_config_var('TIMEMODULE_LIB')
if lib:
time_libs.append(lib)
@@ -631,7 +631,8 @@
missing.append('spwd')

# select(2); not on ancient System V
- exts.append( Extension('select', ['selectmodule.c']) )
+ exts.append( Extension('select', ['selectmodule.c'],
+ libraries=['m']) )

# Fred Drake's interface to the Python parser
exts.append( Extension('parser', ['parsermodule.c']) )
@@ -639,7 +639,8 @@
# Operations on audio samples
# According to #993173, this one should actually work fine on
Expand Down
0