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

Unified Diff: ports/devenv/install-base-packages.sh

Issue 1285953002: Switch devenv to use pkg packages (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@toolchain_install
Patch Set: Created 5 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/devenv/build.sh ('k') | ports/devenv/package » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/devenv/install-base-packages.sh
diff --git a/ports/devenv/install-base-packages.sh b/ports/devenv/install-base-packages.sh
index 17fbf4fc128f82f2cf3092a7d621a5f4c11d1d9d..0d2e384dd4d65555bb671266180d75caac6bf267 100755
--- a/ports/devenv/install-base-packages.sh
+++ b/ports/devenv/install-base-packages.sh
@@ -9,7 +9,7 @@
CheckNaClEnabled() {
# Skip check on if this isn't newlib.
- if [[ "${TOOLCHAIN}" != newlib ]]; then
+ if [[ ${TOOLCHAIN} != newlib ]]; then
return
fi
TMP_CHECK_FILE="/tmp/.enable_nacl_check.nexe"
@@ -40,28 +40,44 @@ CheckNaClEnabled() {
}
InstallBasePackages() {
+ local default_packages=""
+
+ # For glibc, we need to install some library dependencies first
+ if [[ ${TOOLCHAIN} == glibc ]]; then
+ default_packages+="\
+ -i zlib \
+ -i bzip2 \
+ -i openssl \
+ -i ncurses \
+ -i readline"
+ fi
+
# Core packages.
- local default_packages="\
+ local default_packages+="\
+ -i corelibs \
+ -i nacl-spawn \
-i coreutils \
-i bash \
-i curl \
-i findutils \
+ -i pcre \
-i grep \
-i git \
-i less \
-i make \
-i nano \
-i python \
- -i grep \
-i vim"
local have_gcc=0
- if [[ "${NACL_ARCH}" == "i686" || "${NACL_ARCH}" == "x86_64" ]]; then
- default_packages+=" \
- -i emacs \
- -i mingn.base \
- -i mingn.lib"
- have_gcc=1
+ if [[ ${TOOLCHAIN} == glibc ]]; then
+ if [[ ${NACL_ARCH} == i686 || ${NACL_ARCH} == x86_64 ]]; then
+ default_packages+=" \
+ -i binutils \
+ -i gcc \
+ -i mingn"
+ have_gcc=1
+ fi
fi
# Check for updates on some packages.
« no previous file with comments | « ports/devenv/build.sh ('k') | ports/devenv/package » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698