Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(595)

Side by Side Diff: ports/python/build.sh

Issue 1417373005: Fix shared library support in glibc python build (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build_tools/common.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 EXECUTABLES=python${NACL_EXEEXT} 5 EXECUTABLES=python${NACL_EXEEXT}
6 6
7 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" 7 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
8 8
9 # This build relies on certain host binaries and python's configure 9 # This build relies on certain host binaries and python's configure
10 # requires us to set --build= as well as --host=. 10 # requires us to set --build= as well as --host=.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 script+=".sh" 75 script+=".sh"
76 fi 76 fi
77 TranslateAndWriteLauncherScript ${pexe} x86-64 python.x86-64.nexe ${script} 77 TranslateAndWriteLauncherScript ${pexe} x86-64 python.x86-64.nexe ${script}
78 fi 78 fi
79 } 79 }
80 80
81 PublishStep() { 81 PublishStep() {
82 local assembly_dir=${PUBLISH_DIR} 82 local assembly_dir=${PUBLISH_DIR}
83 MakeDir ${assembly_dir} 83 MakeDir ${assembly_dir}
84 84
85
86 ChangeDir ${assembly_dir} 85 ChangeDir ${assembly_dir}
87 if [[ $TOOLCHAIN == pnacl ]]; then 86 if [[ $TOOLCHAIN == pnacl ]]; then
88 local tar_file=pydata.tar 87 local tar_file=pydata.tar
89 LogExecute cp ${INSTALL_DIR}${PREFIX}/bin/python${NACL_EXEEXT} \ 88 LogExecute cp ${INSTALL_DIR}${PREFIX}/bin/python${NACL_EXEEXT} \
90 python${NACL_EXEEXT} 89 python${NACL_EXEEXT}
91 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ 90 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
92 python${NACL_EXEEXT} -s . -o python.nmf 91 python${NACL_EXEEXT} -s . -o python.nmf
93 else 92 else
94 local tar_file=_platform_specific/${NACL_ARCH}/pydata.tar 93 local tar_file=_platform_specific/${NACL_ARCH}/pydata.tar
95 MakeDir _platform_specific/${NACL_ARCH} 94 MakeDir _platform_specific/${NACL_ARCH}
96 LogExecute cp ${INSTALL_DIR}${PREFIX}/bin/python${NACL_EXEEXT} \ 95 LogExecute cp ${INSTALL_DIR}${PREFIX}/bin/python${NACL_EXEEXT} \
97 _platform_specific/${NACL_ARCH}/python${NACL_EXEEXT} 96 _platform_specific/${NACL_ARCH}/python${NACL_EXEEXT}
98 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py --no-arch-prefix \ 97 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py --no-arch-prefix \
99 _platform_specific/*/python${NACL_EXEEXT} -s . -o python.nmf 98 _platform_specific/*/python${NACL_EXEEXT} -s . -o python.nmf
100 fi 99 fi
101 100
102 LogExecute tar cf ${tar_file} -C ${INSTALL_DIR}${PREFIX} lib/python2.7 101 LogExecute tar cf ${tar_file} -C ${INSTALL_DIR}${PREFIX} lib/python2.7
102 if [[ $NACL_SHARED == 1 ]]; then
103 # Extra shared libraries depedencies requires by python loadable modules
104 LogExecute tar rf ${tar_file} -h -C ${NACL_PREFIX} lib/libz.so.1 \
105 lib/libreadline.so lib/libncurses.so.5 lib/libbz2.so.1.0 \
bradnelson 2015/10/27 17:34:23 Just so I'm clear, these are missed because they c
106 lib/libssl.so.1.0.0 lib/libcrypto.so.1.0.0
107 fi
103 LogExecute shasum ${tar_file} > ${tar_file}.hash 108 LogExecute shasum ${tar_file} > ${tar_file}.hash
104 109
105 LogExecute python ${TOOLS_DIR}/create_term.py python.nmf 110 LogExecute python ${TOOLS_DIR}/create_term.py python.nmf
106 111
107 GenerateManifest ${START_DIR}/manifest.json ${assembly_dir} 112 GenerateManifest ${START_DIR}/manifest.json ${assembly_dir}
108 InstallNaClTerm ${assembly_dir} 113 InstallNaClTerm ${assembly_dir}
109 LogExecute cp ${START_DIR}/background.js ${assembly_dir} 114 LogExecute cp ${START_DIR}/background.js ${assembly_dir}
110 LogExecute cp ${START_DIR}/python.js ${assembly_dir} 115 LogExecute cp ${START_DIR}/python.js ${assembly_dir}
111 LogExecute cp ${START_DIR}/index.html ${assembly_dir} 116 LogExecute cp ${START_DIR}/index.html ${assembly_dir}
112 LogExecute cp ${START_DIR}/icon_16.png ${assembly_dir} 117 LogExecute cp ${START_DIR}/icon_16.png ${assembly_dir}
113 LogExecute cp ${START_DIR}/icon_48.png ${assembly_dir} 118 LogExecute cp ${START_DIR}/icon_48.png ${assembly_dir}
114 LogExecute cp ${START_DIR}/icon_128.png ${assembly_dir} 119 LogExecute cp ${START_DIR}/icon_128.png ${assembly_dir}
115 ChangeDir ${PUBLISH_DIR} 120 ChangeDir ${PUBLISH_DIR}
116 CreateWebStoreZip python.zip . 121 CreateWebStoreZip python.zip .
117 } 122 }
OLDNEW
« no previous file with comments | « build_tools/common.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698