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

Side by Side Diff: ports/gtk+/build.sh

Issue 1260083004: Add needed functions to glibc-compat for pkg (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: fix wrong c++ lib 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
« no previous file with comments | « ports/glibc-compat/src/writev.c ('k') | ports/libx11/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Native Client Authors. All rights reserved. 1 # Copyright 2015 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 ConfigureStep() { 5 ConfigureStep() {
6 if [ "${NACL_LIBC}" = "newlib" ]; then 6 if [ "${NACL_LIBC}" = "newlib" ]; then
7 # newlib requires different library order to deal with static libraries 7 # newlib requires different library order to deal with static libraries
8 export LIBS+=" -lXext -lX11 -lxcb -lXau" 8 export LIBS+=" -lXext -lX11 -lxcb -lXau -lglibc-compat"
9 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" 9 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
10 fi 10 fi
11 11
12 # fix pkgconfig files to explicitly include libffi 12 # fix pkgconfig files to explicitly include libffi
13 # for things that depend on glib 13 # for things that depend on glib
14 sed -i 's/-lglib-2.0 -lintl/-lglib-2.0 -lffi -lintl/'\ 14 sed -i 's/-lglib-2.0 -lintl/-lglib-2.0 -lffi -lintl/'\
15 ${NACLPORTS_LIBDIR}/pkgconfig/glib-2.0.pc 15 ${NACLPORTS_LIBDIR}/pkgconfig/glib-2.0.pc
16 16
17 if [ "${NACL_LIBC}" = "newlib" ]; then
18 sed -i 's/-lffi -lintl/-lffi -lglibc-compat -lintl/'\
19 ${NACLPORTS_LIBDIR}/pkgconfig/glib-2.0.pc
20 fi
21
17 EXTRA_CONFIGURE_ARGS+=" --disable-shm --enable-explicit-deps --disable-cups \ 22 EXTRA_CONFIGURE_ARGS+=" --disable-shm --enable-explicit-deps --disable-cups \
18 --enable-gtk-doc-html=no" 23 --enable-gtk-doc-html=no"
19 24
20 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main -pthread" 25 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main -pthread"
21 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}" 26 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"
22 export enable_gtk_doc=no 27 export enable_gtk_doc=no
23 28
24 DefaultConfigureStep 29 DefaultConfigureStep
25 } 30 }
26 31
27 PublishStep() { 32 PublishStep() {
28 MakeDir ${PUBLISH_DIR} 33 MakeDir ${PUBLISH_DIR}
29 local APP_DIR="${PUBLISH_DIR}/${NACL_ARCH}/gtk+" 34 local APP_DIR="${PUBLISH_DIR}/${NACL_ARCH}/gtk+"
30 MakeDir ${APP_DIR} 35 MakeDir ${APP_DIR}
31 ChangeDir ${APP_DIR} 36 ChangeDir ${APP_DIR}
32 local exe="${APP_DIR}/gtk-demo${NACL_EXEEXT}" 37 local exe="${APP_DIR}/gtk-demo${NACL_EXEEXT}"
33 LogExecute cp ${INSTALL_DIR}/naclports-dummydir/bin/gtk-demo${NACL_EXEEXT} \ 38 LogExecute cp ${INSTALL_DIR}/naclports-dummydir/bin/gtk-demo${NACL_EXEEXT} \
34 ${exe} 39 ${exe}
35 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ 40 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
36 ${exe} -s . -L ${INSTALL_DIR}/naclports-dummydir/lib \ 41 ${exe} -s . -L ${INSTALL_DIR}/naclports-dummydir/lib \
37 -o gtk-demo.nmf 42 -o gtk-demo.nmf
38 LogExecute python ${TOOLS_DIR}/create_term.py -n gtk-demo gtk-demo.nmf 43 LogExecute python ${TOOLS_DIR}/create_term.py -n gtk-demo gtk-demo.nmf
39 InstallNaClTerm ${APP_DIR} 44 InstallNaClTerm ${APP_DIR}
40 LogExecute cp -f ${START_DIR}/*.js ${APP_DIR} 45 LogExecute cp -f ${START_DIR}/*.js ${APP_DIR}
41 } 46 }
OLDNEW
« no previous file with comments | « ports/glibc-compat/src/writev.c ('k') | ports/libx11/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698