summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChaoren Lin <chaorenl@google.com>2015-09-08 12:44:28 -0700
committerChaoren Lin <chaorenl@google.com>2015-09-08 12:45:39 -0700
commit2337f3a412d30e5a4e0272bd2d063b9d2774e01e (patch)
tree7a1567c2f5005118ad39e54bea8a594eda4c1f3b
parent4b2e8dbecc879039c0cc2a69876ac99779394549 (diff)
downloadlinux-x86-2337f3a412d30e5a4e0272bd2d063b9d2774e01e.tar.gz
Adding binaries for 2.7.10
-rwxr-xr-xbin/python2.7bin9961 -> 9857 bytes
-rwxr-xr-xbuild-common.sh89
-rwxr-xr-xbuild-python.sh25
-rw-r--r--include/python2.7/pyconfig.h2
-rwxr-xr-xlib/libpython2.7.so.1.0bin5953637 -> 5950453 bytes
-rw-r--r--lib/python2.7/_sysconfigdata.py16
-rw-r--r--lib/python2.7/config/Makefile8
-rw-r--r--lib/python2.7/config/libpython2.7.abin9825194 -> 9824034 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_bisect.sobin29824 -> 29643 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_codecs_cn.sobin174984 -> 174813 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_codecs_hk.sobin178552 -> 178318 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_codecs_iso2022.sobin60336 -> 59585 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_codecs_jp.sobin301680 -> 301263 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_codecs_kr.sobin156728 -> 156545 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_codecs_tw.sobin127416 -> 127290 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_collections.sobin92376 -> 91280 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_csv.sobin72664 -> 71243 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_ctypes.sobin442704 -> 434228 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_ctypes_test.sobin47640 -> 47054 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_curses.sobin203712 -> 188720 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_curses_panel.sobin39208 -> 38579 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_elementtree.sobin124024 -> 120113 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_functools.sobin34696 -> 30422 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_hashlib.sobin0 -> 58493 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_heapq.sobin49224 -> 49061 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_hotshot.sobin89264 -> 87778 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_io.sobin406152 -> 396588 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_json.sobin104568 -> 102662 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_locale.sobin47456 -> 45963 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_lsprof.sobin51008 -> 50534 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_multibytecodec.sobin84712 -> 83636 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_multiprocessing.sobin85408 -> 83923 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_random.sobin36032 -> 35720 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_socket.sobin199016 -> 186210 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_ssl.sobin0 -> 220288 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_struct.sobin97520 -> 95816 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/_testcapi.sobin130440 -> 123967 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/array.sobin108032 -> 106278 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/audioop.sobin85336 -> 83588 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/binascii.sobin57408 -> 56534 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/cPickle.sobin246472 -> 237804 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/cStringIO.sobin54184 -> 53740 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/cmath.sobin85664 -> 80966 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/crypt.sobin18328 -> 18367 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/datetime.sobin272168 -> 265838 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/fcntl.sobin53672 -> 51207 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/future_builtins.sobin20496 -> 20543 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/grp.sobin27360 -> 27493 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/itertools.sobin139912 -> 138234 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/linuxaudiodev.sobin37640 -> 36969 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/math.sobin100824 -> 95095 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/mmap.sobin68040 -> 66270 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/nis.sobin42552 -> 42420 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/operator.sobin90720 -> 88809 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/ossaudiodev.sobin67928 -> 63278 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/parser.sobin225184 -> 219719 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/pyexpat.sobin681728 -> 674959 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/resource.sobin29344 -> 28533 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/select.sobin66360 -> 64524 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/spwd.sobin27168 -> 27277 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/strop.sobin74656 -> 73107 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/syslog.sobin28720 -> 27492 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/termios.sobin43704 -> 43519 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/time.sobin52664 -> 51414 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/unicodedata.sobin745432 -> 740165 bytes
-rwxr-xr-xlib/python2.7/lib-dynload/zlib.sobin65944 -> 64007 bytes
-rw-r--r--lib/python2.7/lib2to3/Grammar2.7.10.final.0.picklebin20469 -> 20469 bytes
67 files changed, 71 insertions, 69 deletions
diff --git a/bin/python2.7 b/bin/python2.7
index 80f2929..e490554 100755
--- a/bin/python2.7
+++ b/bin/python2.7
Binary files differ
diff --git a/build-common.sh b/build-common.sh
index 8c7eeb2..6189069 100755
--- a/build-common.sh
+++ b/build-common.sh
@@ -1,64 +1,56 @@
-# latest version of this file can be found at
-# https://android.googlesource.com/platform/external/lldb-utils
+# latest version of this file can be found at
+# sso://googleplex-android/platform/external/lldb-utils
#
# inputs
-# $PROJ - project name (cmake|ninja|swig)
+# $PROJ - project name
# $VER - project version
# $1 - name of this file
#
# this file does the following:
#
# 1) define the following env vars
-# OS - linux|darwin|windows
-# USER - username
-# CORES - numer of cores (for parallel builds)
-# PATH (with appropriate compilers)
-# CFLAGS/CXXFLAGS/LDFLAGS
-# RD - root directory for source and object files
-# INSTALL - install directory/git repo root
-# SCRIPT_FILE=absolute path to the parent build script
-# SCRIPT_DIR=absolute path to the parent build script's directory
-# COMMON_FILE=absolute path to this file
-
-#
+# OS - linux|darwin|windows
+# USER - username
+# CORES - numer of cores (for parallel builds)
+# PATH (with appropriate compilers)
+# CFLAGS/CXXFLAGS/LDFLAGS
+# RD - root directory for source and object files
+# INSTALL - install directory/git repo root
+# SCRIPT_FILE - absolute path to the parent build script
+# SCRIPT_DIR - absolute path to the parent build script's directory
+# COMMON_FILE - absolute path to this file
# 2) create an empty tmp directory at /tmp/$PROJ-$USER
# 3) checkout the destination git repo to /tmp/prebuilts/$PROJ/$OS-x86/$VER
# 4) cd $RD
UNAME="$(uname)"
+SCRATCH=/tmp
+UPSTREAM=sso://googleplex-android/platform/prebuilts
case "$UNAME" in
Linux)
- SCRATCH=/tmp
OS='linux'
INSTALL_VER=$VER
;;
Darwin)
- SCRATCH=/tmp
OS='darwin'
- OSX_MIN=10.6
+ OSX_MIN=10.8
+ export CC=clang
+ export CXX=$CC++
export CFLAGS="$CFLAGS -mmacosx-version-min=$OSX_MIN"
- export CXXFLAGS="$CXXFLAGS -mmacosx-version-min=$OSX_MIN"
+ export CXXFLAGS="$CXXFLAGS -mmacosx-version-min=$OSX_MIN -stdlib=libc++"
export LDFLAGS="$LDFLAGS -mmacosx-version-min=$OSX_MIN"
INSTALL_VER=$VER
;;
*_NT-*)
- if [[ "$UNAME" == CYGWIN_NT-* ]]; then
- PATH_PREFIX=/cygdrive
- else
- # MINGW32_NT-*
- PATH_PREFIX=
- fi
- SCRATCH=$PATH_PREFIX/d/src/tmp
USER=$USERNAME
OS='windows'
CORES=$NUMBER_OF_PROCESSORS
# VS2013 x64 Native Tools Command Prompt
case "$MSVS" in
2013)
- export PATH="$PATH_PREFIX/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/amd64/":"$PATH_PREFIX/c/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/":"$PATH"
- export INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\INCLUDE;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\INCLUDE;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um;C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt;"
- export LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB\\amd64;C:\\Program Files (x86)\\Windows Kits\\8.1\\lib\\winv6.3\\um\\x64;"
- export LIBPATH="C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\LIB\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\ATLMFC\\LIB\\amd64;C:\\Program Files (x86)\\Windows Kits\\8.1\\References\\CommonConfiguration\\Neutral;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1\\ExtensionSDKs\\Microsoft.VCLibs\\12.0\\References\\CommonConfiguration\\neutral;"
+ devenv() {
+ cmd /c "${VS120COMNTOOLS}VsDevCmd.bat" '&' devenv.com "$@"
+ }
INSTALL_VER=${VER}_${MSVS}
;;
*)
@@ -79,7 +71,7 @@ INSTALL="$RD/install"
# OSX lacks a "realpath" bash command
realpath() {
- [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+ [[ "$1" == /* ]] && echo "$1" || echo "$PWD/${1#./}"
}
SCRIPT_FILE=$(realpath "$0")
@@ -95,31 +87,40 @@ cd $RD
# clone prebuilt gcc
case "$OS" in
linux)
- GCC_DIR=$RD/gcc
- GCC_LIB=$GCC_DIR/lib/gcc/x86_64-linux/4.8 # crtbegin.o and libgcc.a
- GCC_LIB2=$GCC_DIR/x86_64-linux/lib64 # libgcc_s.so
-
# can't get prebuilt clang working so we're using host clang-3.5 https://b/22748915
+ #CLANG_DIR=$RD/clang
+ #git clone $UPSTREAM/clang/linux-x86/host/3.6 $CLANG_DIR
+ #export CC="$CLANG_DIR/bin/clang"
+ #export CXX="$CC++"
export CC=clang-3.5
export CXX=clang++-3.5
- export CFLAGS="$CFLAGS -fuse-ld=gold --sysroot $GCC_DIR/sysroot -B$GCC_LIB"
- export CXXFLAGS="$CFLAGS -Ix86_64-linux/include/c++/4.8 -Ix86_64-linux/include/x86_64-linux/c++/4.8"
- export LDFLAGS="$LDFLAGS -m64 --sysroot $GCC_DIR/sysroot -L$GCC_LIB -L$GCC_LIB2"
- # lldb uses at least one function from glibc2.12
- git clone https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8 $GCC_DIR
+
+ GCC_DIR=$RD/gcc
+ git clone $UPSTREAM/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8 $GCC_DIR
+
+ find "$GCC_DIR" -name x86_64-linux -exec ln -fns {} {}-gnu \;
+
+ FLAGS+=(-fuse-ld=gold)
+ FLAGS+=(--gcc-toolchain="$GCC_DIR")
+ FLAGS+=(--sysroot "$GCC_DIR/sysroot")
+ FLAGS+=(-B"$GCC_DIR/bin/x86_64-linux-")
+ export CFLAGS="$CFLAGS ${FLAGS[*]}"
+ export CXXFLAGS="$CXXFLAGS ${FLAGS[*]}"
+ export LDFLAGS="$LDFLAGS -m64"
;;
esac
commit_and_push()
{
+ BRANCH=studio-master-dev
# check into a local git clone
rm -rf $SCRATCH/prebuilts/$PROJ/
mkdir -p $SCRATCH/prebuilts/$PROJ/
cd $SCRATCH/prebuilts/$PROJ/
- git clone https://android.googlesource.com/platform/prebuilts/$PROJ/$OS-x86
+ git clone $UPSTREAM/$PROJ/$OS-x86 -b $BRANCH
GIT_REPO="$SCRATCH/prebuilts/$PROJ/$OS-x86"
cd $GIT_REPO
- git rm -r * || true # ignore error caused by empty directory
+ rm -rf *
mv $INSTALL/* $GIT_REPO
cp $SCRIPT_FILE $GIT_REPO
cp $COMMON_FILE $GIT_REPO
@@ -128,7 +129,7 @@ commit_and_push()
git commit -m "Adding binaries for $INSTALL_VER"
# execute this command to upload
- #git push origin HEAD:refs/for/master
+ #git push origin HEAD:refs/for/$BRANCH
- rm -rf $RD || true # ignore error
+ rm -rf $RD
}
diff --git a/build-python.sh b/build-python.sh
index 4a7870c..a4a8224 100755
--- a/build-python.sh
+++ b/build-python.sh
@@ -1,10 +1,10 @@
#!/bin/bash -ex
-# latest version of this file can be found at
+# latest version of this file can be found at
# https://android.googlesource.com/platform/external/lldb-utils
#
-# Download & build swig on the local machine
+# Download & build python on the local machine
# works on Linux, OSX, and Windows (Cygwin)
-# leaves output in /tmp/prebuilts/install/
+# leaves output in /tmp/prebuilts/python/$OS-x86
PROJ=python
VER=2.7.10
@@ -20,18 +20,18 @@ cd $BASE
case "$OS" in
windows)
- cp PC/pyconfig.h Include
- devenv.com PCbuild/pcbuild.sln /Upgrade
+ cp PC/pyconfig.h Include/
+ devenv PCbuild/pcbuild.sln /Upgrade
# some projects will fail and that's okay
- devenv.com PCbuild/pcbuild.sln /Build Debug /Out log.txt || egrep -c "========== Build: 18 succeeded, 7 failed, 0 up-to-date, 1 skipped ==========" log.txt
- devenv.com PCbuild/pcbuild.sln /Build Release /Out log.txt || egrep -c "========== Build: 17 succeeded, 7 failed, 1 up-to-date, 1 skipped ==========" log.txt
- devenv.com PCbuild/pcbuild.sln /Build "Release|x64" /Out log.txt || egrep -c "========== Build: 16 succeeded, 7 failed, 2 up-to-date, 1 skipped ==========" log.txt
- devenv.com PCbuild/pcbuild.sln /Build "Debug|x64" /Out log.txt || egrep -c "========== Build: 16 succeeded, 7 failed, 2 up-to-date, 1 skipped ==========" log.txt
+ devenv PCbuild/pcbuild.sln /Build Debug || true
+ devenv PCbuild/pcbuild.sln /Build Release || true
+ devenv PCbuild/pcbuild.sln /Build "Debug^|x64" || true
+ devenv PCbuild/pcbuild.sln /Build "Release^|x64" || true
curl -L http://llvm.org/svn/llvm-project/lldb/trunk/scripts/install_custom_python.py -o install_custom_python.py
- python install_custom_python.py --source "$(cygpath -w $RD/Python-$VER)" --dest "$(cygpath -w $INSTALL)" --overwrite --silent
+ python install_custom_python.py --source "$(cygpath -w "$RD/$BASE")" --dest "$(cygpath -w "$INSTALL")" --overwrite --silent
;;
linux|darwin)
- # can't get prebuilt clang working https://b/22748915
+ unset CFLAGS CXXFLAGS
mkdir $RD/build
cd $RD/build
$RD/$BASE/configure --prefix=$INSTALL --enable-unicode=ucs4 --enable-shared
@@ -40,5 +40,6 @@ linux|darwin)
;;
esac
-commit_and_push
+find $INSTALL '(' -name '*.pyc' -or -name '*.pyo' ')' -delete
+commit_and_push
diff --git a/include/python2.7/pyconfig.h b/include/python2.7/pyconfig.h
index adfd839..957ad23 100644
--- a/include/python2.7/pyconfig.h
+++ b/include/python2.7/pyconfig.h
@@ -549,7 +549,7 @@
#define HAVE_PUTENV 1
/* Define if the libcrypto has RAND_egd */
-/* #undef HAVE_RAND_EGD */
+#define HAVE_RAND_EGD 1
/* Define to 1 if you have the `readlink' function. */
#define HAVE_READLINK 1
diff --git a/lib/libpython2.7.so.1.0 b/lib/libpython2.7.so.1.0
index d00ec6c..130646c 100755
--- a/lib/libpython2.7.so.1.0
+++ b/lib/libpython2.7.so.1.0
Binary files differ
diff --git a/lib/python2.7/_sysconfigdata.py b/lib/python2.7/_sysconfigdata.py
index ed35900..41343a3 100644
--- a/lib/python2.7/_sysconfigdata.py
+++ b/lib/python2.7/_sysconfigdata.py
@@ -11,21 +11,21 @@ build_time_vars = {'AC_APPLE_UNIVERSAL_BUILD': 0,
'AST_H': 'Include/Python-ast.h',
'AST_H_DIR': 'Include',
'ATHEOS_THREADS': 0,
- 'BASECFLAGS': '-fno-strict-aliasing',
+ 'BASECFLAGS': '-fno-strict-aliasing -OPT:Olimit=0',
'BASEMODLIBS': '',
'BEOS_THREADS': 0,
'BINDIR': '/tmp/python-chaorenl/install/bin',
'BINLIBDEST': '/tmp/python-chaorenl/install/lib/python2.7',
'BLDLIBRARY': '-L. -lpython2.7',
- 'BLDSHARED': 'clang-3.5 -pthread -shared -m64 --sysroot /tmp/python-chaorenl/gcc/sysroot -L/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -L/tmp/python-chaorenl/gcc/x86_64-linux/lib64',
+ 'BLDSHARED': 'clang-3.5 -pthread -shared -m64',
'BUILDEXE': '',
'BUILDPYTHON': 'python',
'CC': 'clang-3.5 -pthread',
'CCSHARED': '-fPIC',
- 'CFLAGS': '-fno-strict-aliasing -fuse-ld=gold --sysroot /tmp/python-chaorenl/gcc/sysroot -B/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes',
+ 'CFLAGS': '-fno-strict-aliasing -OPT:Olimit=0 -g -O2 -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes',
'CFLAGSFORSHARED': '-fPIC',
'CONFIGFILES': 'configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in',
- 'CONFIG_ARGS': "'--prefix=/tmp/python-chaorenl/install' '--enable-unicode=ucs4' '--enable-shared' 'CC=clang-3.5' 'CFLAGS= -fuse-ld=gold --sysroot /tmp/python-chaorenl/gcc/sysroot -B/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8' 'LDFLAGS= -m64 --sysroot /tmp/python-chaorenl/gcc/sysroot -L/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -L/tmp/python-chaorenl/gcc/x86_64-linux/lib64'",
+ 'CONFIG_ARGS': "'--prefix=/tmp/python-chaorenl/install' '--enable-unicode=ucs4' '--enable-shared' 'CC=clang-3.5' 'LDFLAGS= -m64'",
'CONFINCLUDEDIR': '/tmp/python-chaorenl/install/include',
'CONFINCLUDEPY': '/tmp/python-chaorenl/install/include/python2.7',
'COREPYTHONPATH': ':plat-linux2:lib-tk:lib-old',
@@ -227,7 +227,7 @@ build_time_vars = {'AC_APPLE_UNIVERSAL_BUILD': 0,
'HAVE_PTHREAD_SIGMASK': 1,
'HAVE_PTY_H': 1,
'HAVE_PUTENV': 1,
- 'HAVE_RAND_EGD': 0,
+ 'HAVE_RAND_EGD': 1,
'HAVE_READLINK': 1,
'HAVE_REALPATH': 1,
'HAVE_RL_CALLBACK': 0,
@@ -365,11 +365,11 @@ build_time_vars = {'AC_APPLE_UNIVERSAL_BUILD': 0,
'INSTALL_SHARED': '/usr/bin/install -c -m 555',
'INSTSONAME': 'libpython2.7.so.1.0',
'LDCXXSHARED': 'clang++-3.5 -pthread -shared',
- 'LDFLAGS': '-m64 --sysroot /tmp/python-chaorenl/gcc/sysroot -L/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -L/tmp/python-chaorenl/gcc/x86_64-linux/lib64',
+ 'LDFLAGS': '-m64',
'LDLAST': '',
'LDLIBRARY': 'libpython2.7.so',
'LDLIBRARYDIR': '',
- 'LDSHARED': 'clang-3.5 -pthread -shared -m64 --sysroot /tmp/python-chaorenl/gcc/sysroot -L/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -L/tmp/python-chaorenl/gcc/x86_64-linux/lib64',
+ 'LDSHARED': 'clang-3.5 -pthread -shared -m64',
'LIBC': '',
'LIBDEST': '/tmp/python-chaorenl/install/lib/python2.7',
'LIBDIR': '/tmp/python-chaorenl/install/lib',
@@ -443,7 +443,7 @@ build_time_vars = {'AC_APPLE_UNIVERSAL_BUILD': 0,
'PYTHON_FOR_BUILD': './python -E',
'PYTHON_HEADERS': '\\',
'PYTHON_OBJS': '\\',
- 'PY_CFLAGS': '-fno-strict-aliasing -fuse-ld=gold --sysroot /tmp/python-chaorenl/gcc/sysroot -B/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -I. -IInclude -I/tmp/python-chaorenl/Python-2.7.10/Include -fPIC -DPy_BUILD_CORE',
+ 'PY_CFLAGS': '-fno-strict-aliasing -OPT:Olimit=0 -g -O2 -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -I. -IInclude -I/tmp/python-chaorenl/Python-2.7.10/Include -fPIC -DPy_BUILD_CORE',
'PY_FORMAT_LONG_LONG': '"ll"',
'PY_FORMAT_SIZE_T': '"z"',
'PY_UNICODE_TYPE': 0,
diff --git a/lib/python2.7/config/Makefile b/lib/python2.7/config/Makefile
index 2943a70..26bdeaf 100644
--- a/lib/python2.7/config/Makefile
+++ b/lib/python2.7/config/Makefile
@@ -68,13 +68,13 @@ MAKESETUP= $(srcdir)/Modules/makesetup
# Compiler options
OPT= -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes
-BASECFLAGS= -fno-strict-aliasing
-CFLAGS= $(BASECFLAGS) -fuse-ld=gold --sysroot /tmp/python-chaorenl/gcc/sysroot -B/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 $(OPT) $(EXTRA_CFLAGS)
+BASECFLAGS= -fno-strict-aliasing -OPT:Olimit=0
+CFLAGS= $(BASECFLAGS) -g -O2 $(OPT) $(EXTRA_CFLAGS)
# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
# be able to build extension modules using the directories specified in the
# environment variables
CPPFLAGS= -I. -IInclude -I$(srcdir)/Include
-LDFLAGS= -m64 --sysroot /tmp/python-chaorenl/gcc/sysroot -L/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -L/tmp/python-chaorenl/gcc/x86_64-linux/lib64
+LDFLAGS= -m64
LDLAST=
SGI_ABI=
CCSHARED= -fPIC
@@ -155,7 +155,7 @@ EXEMODE= 755
FILEMODE= 644
# configure script arguments
-CONFIG_ARGS= '--prefix=/tmp/python-chaorenl/install' '--enable-unicode=ucs4' '--enable-shared' 'CC=clang-3.5' 'CFLAGS= -fuse-ld=gold --sysroot /tmp/python-chaorenl/gcc/sysroot -B/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8' 'LDFLAGS= -m64 --sysroot /tmp/python-chaorenl/gcc/sysroot -L/tmp/python-chaorenl/gcc/lib/gcc/x86_64-linux/4.8 -L/tmp/python-chaorenl/gcc/x86_64-linux/lib64'
+CONFIG_ARGS= '--prefix=/tmp/python-chaorenl/install' '--enable-unicode=ucs4' '--enable-shared' 'CC=clang-3.5' 'LDFLAGS= -m64'
# Subdirectories with code
diff --git a/lib/python2.7/config/libpython2.7.a b/lib/python2.7/config/libpython2.7.a
index 7ae9d32..43c32f8 100644
--- a/lib/python2.7/config/libpython2.7.a
+++ b/lib/python2.7/config/libpython2.7.a
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_bisect.so b/lib/python2.7/lib-dynload/_bisect.so
index 25c41b9..aedb40d 100755
--- a/lib/python2.7/lib-dynload/_bisect.so
+++ b/lib/python2.7/lib-dynload/_bisect.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_codecs_cn.so b/lib/python2.7/lib-dynload/_codecs_cn.so
index 876c43d..599306f 100755
--- a/lib/python2.7/lib-dynload/_codecs_cn.so
+++ b/lib/python2.7/lib-dynload/_codecs_cn.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_codecs_hk.so b/lib/python2.7/lib-dynload/_codecs_hk.so
index 71b0666..8b9654c 100755
--- a/lib/python2.7/lib-dynload/_codecs_hk.so
+++ b/lib/python2.7/lib-dynload/_codecs_hk.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_codecs_iso2022.so b/lib/python2.7/lib-dynload/_codecs_iso2022.so
index 4093e56..42c24b9 100755
--- a/lib/python2.7/lib-dynload/_codecs_iso2022.so
+++ b/lib/python2.7/lib-dynload/_codecs_iso2022.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_codecs_jp.so b/lib/python2.7/lib-dynload/_codecs_jp.so
index 0723955..d87d7bf 100755
--- a/lib/python2.7/lib-dynload/_codecs_jp.so
+++ b/lib/python2.7/lib-dynload/_codecs_jp.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_codecs_kr.so b/lib/python2.7/lib-dynload/_codecs_kr.so
index 1b7847b..f1730d2 100755
--- a/lib/python2.7/lib-dynload/_codecs_kr.so
+++ b/lib/python2.7/lib-dynload/_codecs_kr.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_codecs_tw.so b/lib/python2.7/lib-dynload/_codecs_tw.so
index dc6a43f..5ae6eec 100755
--- a/lib/python2.7/lib-dynload/_codecs_tw.so
+++ b/lib/python2.7/lib-dynload/_codecs_tw.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_collections.so b/lib/python2.7/lib-dynload/_collections.so
index 2e4b25f..02f2084 100755
--- a/lib/python2.7/lib-dynload/_collections.so
+++ b/lib/python2.7/lib-dynload/_collections.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_csv.so b/lib/python2.7/lib-dynload/_csv.so
index 34ca32e..3640c89 100755
--- a/lib/python2.7/lib-dynload/_csv.so
+++ b/lib/python2.7/lib-dynload/_csv.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_ctypes.so b/lib/python2.7/lib-dynload/_ctypes.so
index bb75405..3323ec3 100755
--- a/lib/python2.7/lib-dynload/_ctypes.so
+++ b/lib/python2.7/lib-dynload/_ctypes.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_ctypes_test.so b/lib/python2.7/lib-dynload/_ctypes_test.so
index d751f5f..fad0d19 100755
--- a/lib/python2.7/lib-dynload/_ctypes_test.so
+++ b/lib/python2.7/lib-dynload/_ctypes_test.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_curses.so b/lib/python2.7/lib-dynload/_curses.so
index 5ce9f6e..4467141 100755
--- a/lib/python2.7/lib-dynload/_curses.so
+++ b/lib/python2.7/lib-dynload/_curses.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_curses_panel.so b/lib/python2.7/lib-dynload/_curses_panel.so
index 94c20e5..8c56626 100755
--- a/lib/python2.7/lib-dynload/_curses_panel.so
+++ b/lib/python2.7/lib-dynload/_curses_panel.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_elementtree.so b/lib/python2.7/lib-dynload/_elementtree.so
index 73d8ac9..bd3f536 100755
--- a/lib/python2.7/lib-dynload/_elementtree.so
+++ b/lib/python2.7/lib-dynload/_elementtree.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_functools.so b/lib/python2.7/lib-dynload/_functools.so
index 6dd2e83..132b8b5 100755
--- a/lib/python2.7/lib-dynload/_functools.so
+++ b/lib/python2.7/lib-dynload/_functools.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_hashlib.so b/lib/python2.7/lib-dynload/_hashlib.so
new file mode 100755
index 0000000..f752342
--- /dev/null
+++ b/lib/python2.7/lib-dynload/_hashlib.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_heapq.so b/lib/python2.7/lib-dynload/_heapq.so
index 2d26a73..31e3f0a 100755
--- a/lib/python2.7/lib-dynload/_heapq.so
+++ b/lib/python2.7/lib-dynload/_heapq.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_hotshot.so b/lib/python2.7/lib-dynload/_hotshot.so
index ba15cf8..3f9fddc 100755
--- a/lib/python2.7/lib-dynload/_hotshot.so
+++ b/lib/python2.7/lib-dynload/_hotshot.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_io.so b/lib/python2.7/lib-dynload/_io.so
index 14ab6a1..c06dc6c 100755
--- a/lib/python2.7/lib-dynload/_io.so
+++ b/lib/python2.7/lib-dynload/_io.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_json.so b/lib/python2.7/lib-dynload/_json.so
index 7fb90f3..fb181d7 100755
--- a/lib/python2.7/lib-dynload/_json.so
+++ b/lib/python2.7/lib-dynload/_json.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_locale.so b/lib/python2.7/lib-dynload/_locale.so
index 0e2ed4e..f3db56c 100755
--- a/lib/python2.7/lib-dynload/_locale.so
+++ b/lib/python2.7/lib-dynload/_locale.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_lsprof.so b/lib/python2.7/lib-dynload/_lsprof.so
index e86ffc7..2b1c57f 100755
--- a/lib/python2.7/lib-dynload/_lsprof.so
+++ b/lib/python2.7/lib-dynload/_lsprof.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_multibytecodec.so b/lib/python2.7/lib-dynload/_multibytecodec.so
index 86197c6..f6ea1a9 100755
--- a/lib/python2.7/lib-dynload/_multibytecodec.so
+++ b/lib/python2.7/lib-dynload/_multibytecodec.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_multiprocessing.so b/lib/python2.7/lib-dynload/_multiprocessing.so
index 2393d70..f79b535 100755
--- a/lib/python2.7/lib-dynload/_multiprocessing.so
+++ b/lib/python2.7/lib-dynload/_multiprocessing.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_random.so b/lib/python2.7/lib-dynload/_random.so
index 9906353..16bb6ab 100755
--- a/lib/python2.7/lib-dynload/_random.so
+++ b/lib/python2.7/lib-dynload/_random.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_socket.so b/lib/python2.7/lib-dynload/_socket.so
index 9b6673d..8bba56b 100755
--- a/lib/python2.7/lib-dynload/_socket.so
+++ b/lib/python2.7/lib-dynload/_socket.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_ssl.so b/lib/python2.7/lib-dynload/_ssl.so
new file mode 100755
index 0000000..0468c9e
--- /dev/null
+++ b/lib/python2.7/lib-dynload/_ssl.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_struct.so b/lib/python2.7/lib-dynload/_struct.so
index 54f346e..177c9b4 100755
--- a/lib/python2.7/lib-dynload/_struct.so
+++ b/lib/python2.7/lib-dynload/_struct.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/_testcapi.so b/lib/python2.7/lib-dynload/_testcapi.so
index 4a0980a..f43b362 100755
--- a/lib/python2.7/lib-dynload/_testcapi.so
+++ b/lib/python2.7/lib-dynload/_testcapi.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/array.so b/lib/python2.7/lib-dynload/array.so
index f168c9b..8498c9a 100755
--- a/lib/python2.7/lib-dynload/array.so
+++ b/lib/python2.7/lib-dynload/array.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/audioop.so b/lib/python2.7/lib-dynload/audioop.so
index 861c0ff..21b7695 100755
--- a/lib/python2.7/lib-dynload/audioop.so
+++ b/lib/python2.7/lib-dynload/audioop.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/binascii.so b/lib/python2.7/lib-dynload/binascii.so
index c5c5ba8..ef0495e 100755
--- a/lib/python2.7/lib-dynload/binascii.so
+++ b/lib/python2.7/lib-dynload/binascii.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/cPickle.so b/lib/python2.7/lib-dynload/cPickle.so
index 4c91254..c36a5a0 100755
--- a/lib/python2.7/lib-dynload/cPickle.so
+++ b/lib/python2.7/lib-dynload/cPickle.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/cStringIO.so b/lib/python2.7/lib-dynload/cStringIO.so
index 97bf5af..6432175 100755
--- a/lib/python2.7/lib-dynload/cStringIO.so
+++ b/lib/python2.7/lib-dynload/cStringIO.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/cmath.so b/lib/python2.7/lib-dynload/cmath.so
index 59b428f..1d7a380 100755
--- a/lib/python2.7/lib-dynload/cmath.so
+++ b/lib/python2.7/lib-dynload/cmath.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/crypt.so b/lib/python2.7/lib-dynload/crypt.so
index effd0c4..29e809d 100755
--- a/lib/python2.7/lib-dynload/crypt.so
+++ b/lib/python2.7/lib-dynload/crypt.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/datetime.so b/lib/python2.7/lib-dynload/datetime.so
index ac684d2..d0c87a9 100755
--- a/lib/python2.7/lib-dynload/datetime.so
+++ b/lib/python2.7/lib-dynload/datetime.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/fcntl.so b/lib/python2.7/lib-dynload/fcntl.so
index 04e42ca..6fe1c0e 100755
--- a/lib/python2.7/lib-dynload/fcntl.so
+++ b/lib/python2.7/lib-dynload/fcntl.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/future_builtins.so b/lib/python2.7/lib-dynload/future_builtins.so
index 02e365c..6d2806d 100755
--- a/lib/python2.7/lib-dynload/future_builtins.so
+++ b/lib/python2.7/lib-dynload/future_builtins.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/grp.so b/lib/python2.7/lib-dynload/grp.so
index 3dcb968..ae174b2 100755
--- a/lib/python2.7/lib-dynload/grp.so
+++ b/lib/python2.7/lib-dynload/grp.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/itertools.so b/lib/python2.7/lib-dynload/itertools.so
index 09173b2..4cddbd0 100755
--- a/lib/python2.7/lib-dynload/itertools.so
+++ b/lib/python2.7/lib-dynload/itertools.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/linuxaudiodev.so b/lib/python2.7/lib-dynload/linuxaudiodev.so
index f1506cd..9c12bbf 100755
--- a/lib/python2.7/lib-dynload/linuxaudiodev.so
+++ b/lib/python2.7/lib-dynload/linuxaudiodev.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/math.so b/lib/python2.7/lib-dynload/math.so
index 1a6761c..74ff5f0 100755
--- a/lib/python2.7/lib-dynload/math.so
+++ b/lib/python2.7/lib-dynload/math.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/mmap.so b/lib/python2.7/lib-dynload/mmap.so
index ee413a5..1bf74f2 100755
--- a/lib/python2.7/lib-dynload/mmap.so
+++ b/lib/python2.7/lib-dynload/mmap.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/nis.so b/lib/python2.7/lib-dynload/nis.so
index bae5437..1866a0b 100755
--- a/lib/python2.7/lib-dynload/nis.so
+++ b/lib/python2.7/lib-dynload/nis.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/operator.so b/lib/python2.7/lib-dynload/operator.so
index f83aa4a..0cac67f 100755
--- a/lib/python2.7/lib-dynload/operator.so
+++ b/lib/python2.7/lib-dynload/operator.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/ossaudiodev.so b/lib/python2.7/lib-dynload/ossaudiodev.so
index ee1a96d..7e1c5ef 100755
--- a/lib/python2.7/lib-dynload/ossaudiodev.so
+++ b/lib/python2.7/lib-dynload/ossaudiodev.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/parser.so b/lib/python2.7/lib-dynload/parser.so
index 5b431b1..cf228b9 100755
--- a/lib/python2.7/lib-dynload/parser.so
+++ b/lib/python2.7/lib-dynload/parser.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/pyexpat.so b/lib/python2.7/lib-dynload/pyexpat.so
index b7f3b50..6ab6f31 100755
--- a/lib/python2.7/lib-dynload/pyexpat.so
+++ b/lib/python2.7/lib-dynload/pyexpat.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/resource.so b/lib/python2.7/lib-dynload/resource.so
index d449629..4fb237a 100755
--- a/lib/python2.7/lib-dynload/resource.so
+++ b/lib/python2.7/lib-dynload/resource.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/select.so b/lib/python2.7/lib-dynload/select.so
index bdf558e..0c25df1 100755
--- a/lib/python2.7/lib-dynload/select.so
+++ b/lib/python2.7/lib-dynload/select.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/spwd.so b/lib/python2.7/lib-dynload/spwd.so
index d63ff8b..daf8bcb 100755
--- a/lib/python2.7/lib-dynload/spwd.so
+++ b/lib/python2.7/lib-dynload/spwd.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/strop.so b/lib/python2.7/lib-dynload/strop.so
index 03e81fb..e2ba938 100755
--- a/lib/python2.7/lib-dynload/strop.so
+++ b/lib/python2.7/lib-dynload/strop.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/syslog.so b/lib/python2.7/lib-dynload/syslog.so
index 2d06d9f..c1ca9a4 100755
--- a/lib/python2.7/lib-dynload/syslog.so
+++ b/lib/python2.7/lib-dynload/syslog.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/termios.so b/lib/python2.7/lib-dynload/termios.so
index 1ca32f9..306c954 100755
--- a/lib/python2.7/lib-dynload/termios.so
+++ b/lib/python2.7/lib-dynload/termios.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/time.so b/lib/python2.7/lib-dynload/time.so
index 154025a..91c778d 100755
--- a/lib/python2.7/lib-dynload/time.so
+++ b/lib/python2.7/lib-dynload/time.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/unicodedata.so b/lib/python2.7/lib-dynload/unicodedata.so
index 93ed99d..4be49d6 100755
--- a/lib/python2.7/lib-dynload/unicodedata.so
+++ b/lib/python2.7/lib-dynload/unicodedata.so
Binary files differ
diff --git a/lib/python2.7/lib-dynload/zlib.so b/lib/python2.7/lib-dynload/zlib.so
index da27095..dae20f9 100755
--- a/lib/python2.7/lib-dynload/zlib.so
+++ b/lib/python2.7/lib-dynload/zlib.so
Binary files differ
diff --git a/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle b/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
index 89da9c7..4bb7978 100644
--- a/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
+++ b/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
Binary files differ