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

Side by Side Diff: ports/glib/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/cairo/build.sh ('k') | ports/glibc-compat/Makefile » ('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 (c) 2011 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2011 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=" 5 EXECUTABLES="
6 gio/gapplication${NACL_EXEEXT} 6 gio/gapplication${NACL_EXEEXT}
7 glib/gtester${NACL_EXEEXT} 7 glib/gtester${NACL_EXEEXT}
8 gobject/gobject-query${NACL_EXEEXT} 8 gobject/gobject-query${NACL_EXEEXT}
9 " 9 "
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 LogExecute ${SRC_DIR}/configure \ 55 LogExecute ${SRC_DIR}/configure \
56 --host=nacl \ 56 --host=nacl \
57 --prefix=${PREFIX} \ 57 --prefix=${PREFIX} \
58 --disable-libelf \ 58 --disable-libelf \
59 --${NACL_OPTION}-mmx \ 59 --${NACL_OPTION}-mmx \
60 --${NACL_OPTION}-sse \ 60 --${NACL_OPTION}-sse \
61 --${NACL_OPTION}-sse2 \ 61 --${NACL_OPTION}-sse2 \
62 --${NACL_OPTION}-asm 62 --${NACL_OPTION}-asm
63 } 63 }
64
65 InstallStep() {
66 DefaultInstallStep
67 # fix pkgconfig files to explicitly include libffi
68 # for things that depend on glib
69 sed -i 's/-lglib-2.0 -lintl/-lglib-2.0 -lffi -lintl/'\
70 ${INSTALL_DIR}/naclports-dummydir/lib/pkgconfig/glib-2.0.pc
71
72 if [ "${NACL_LIBC}" = "newlib" ]; then
73 sed -i 's/-lffi -lintl/-lffi -lglibc-compat -lintl/'\
74 ${INSTALL_DIR}/naclports-dummydir/lib/pkgconfig/glib-2.0.pc
75 fi
76 }
OLDNEW
« no previous file with comments | « ports/cairo/build.sh ('k') | ports/glibc-compat/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698