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

Side by Side Diff: ports/blackbox/build.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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2014 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 EXTRA_CONFIGURE_ARGS+=" --with-x" 5 EXTRA_CONFIGURE_ARGS+=" --with-x"
6 EXTRA_CONFIGURE_ARGS+=" --x-includes=${NACLPORTS_INCLUDE}" 6 EXTRA_CONFIGURE_ARGS+=" --x-includes=${NACLPORTS_INCLUDE}"
7 EXTRA_CONFIGURE_ARGS+=" --x-libraries=${NACLPORTS_LIBDIR}" 7 EXTRA_CONFIGURE_ARGS+=" --x-libraries=${NACLPORTS_LIBDIR}"
8 8
9 EXECUTABLES="src/blackbox util/bsetroot util/bstyleconvert" 9 EXECUTABLES="src/blackbox util/bsetroot util/bstyleconvert"
10 10
11 export EXTRA_LIBS+="-liconv \ 11 export EXTRA_LIBS+="-liconv \
12 -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}" 12 -lXext -lXmu -lSM -lICE -lXt -lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}"
13 # TODO(bradnelson): Find a better general pattern for this. 13 # TODO(bradnelson): Find a better general pattern for this.
14 # Repeat these here to include them which checking for X11 and linking libxcb, 14 # Repeat these here to include them which checking for X11 and linking libxcb,
15 # which references ki_fcntl directly. 15 # which references ki_fcntl directly.
16 export LIBS+=" -lnacl_io -lppapi" 16 export LIBS+=" -lnacl_io -lppapi"
17 17
18 if [ "${NACL_LIBC}" = "newlib" ]; then 18 if [ "${NACL_LIBC}" = "newlib" ]; then
19 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" 19 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
20 export LIBS+=" -lglibc-compat" 20 export LIBS+=" -lglibc-compat"
21 # List again at the end of the others to resolve use of getservbyname in an X 21 # List again at the end of the others to resolve use of getservbyname in an X
22 # library. 22 # library.
23 export EXTRA_LIBS+=" -lglibc-compat" 23 export EXTRA_LIBS+=" -lglibc-compat"
24 fi 24 fi
25
26 PublishStep() {
27 PublishByArchForDevEnv
28 }
OLDNEW
« no previous file with comments | « ports/bison/build.sh ('k') | ports/bzip2/build.sh » ('j') | ports/curl/nacl.patch » ('J')

Powered by Google App Engine
This is Rietveld 408576698