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

Side by Side Diff: ports/cairo/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 | « PRESUBMIT.py ('k') | ports/glib/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 (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 # Workaround for arm-gcc bug: 5 # Workaround for arm-gcc bug:
6 # https://code.google.com/p/nativeclient/issues/detail?id=3205 6 # https://code.google.com/p/nativeclient/issues/detail?id=3205
7 # TODO(sbc): remove this once the issue is fixed 7 # TODO(sbc): remove this once the issue is fixed
8 if [ "${NACL_ARCH}" = "arm" ]; then 8 if [ "${NACL_ARCH}" = "arm" ]; then
9 NACLPORTS_CPPFLAGS+=" -mfpu=vfp" 9 NACLPORTS_CPPFLAGS+=" -mfpu=vfp"
10 fi 10 fi
11 11
12 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" 12 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
13 13
14 if [ "${NACL_LIBC}" != "glibc"]; then 14 if [ "${NACL_LIBC}" != "glibc" ]; then
15 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}" 15 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"
16 else 16 else
17 # moved cli_main flags here to alleviate glibc for linker order problems 17 # moved cli_main flags here to alleviate glibc for linker order problems
18 # This forces it to the end of the line, because -lnacl_io needs to come 18 # This forces it to the end of the line, because -lnacl_io needs to come
19 # before -lpthreads so it can inject properly 19 # before -lpthreads so it can inject properly
20 export LIBS+=" ${NACL_CLI_MAIN_LIB}" 20 export LIBS+=" ${NACL_CLI_MAIN_LIB}"
21 fi 21 fi
22 22
23 EXECUTABLES="test/cairo-test-suite${NACL_EXEEXT}" 23 EXECUTABLES="test/cairo-test-suite${NACL_EXEEXT}"
24 24
25 # This is only necessary for pnacl 25 # This is only necessary for pnacl
26 export ax_cv_c_float_words_bigendian=no 26 export ax_cv_c_float_words_bigendian=no
27 27
28 # Enable the x backend 28 # Enable the x backend
29 EXTRA_CONFIGURE_ARGS+=" --with-x" 29 EXTRA_CONFIGURE_ARGS+=" --with-x"
30 EXTRA_CONFIGURE_ARGS+=" --enable-xlib=yes" 30 EXTRA_CONFIGURE_ARGS+=" --enable-xlib=yes"
31 EXTRA_CONFIGURE_ARGS+=" --enable-xlib-xrender=yes" 31 EXTRA_CONFIGURE_ARGS+=" --enable-xlib-xrender=yes"
32 # disable xcb 32 # disable xcb
33 EXTRA_CONFIGURE_ARGS+=" --disable-xcb" 33 EXTRA_CONFIGURE_ARGS+=" --disable-xcb"
34 EXTRA_CONFIGURE_ARGS+=" --disable-xlib-xcb" 34 EXTRA_CONFIGURE_ARGS+=" --disable-xlib-xcb"
35 EXTRA_CONFIGURE_ARGS+=" --disable-xcb-shm" 35 EXTRA_CONFIGURE_ARGS+=" --disable-xcb-shm"
36 # gobjects required for gdk-pixbuf -> gtk+ 36 # gobjects required for gdk-pixbuf -> gtk+
37 EXTRA_CONFIGURE_ARGS+=" --enable-gobject=yes" 37 EXTRA_CONFIGURE_ARGS+=" --enable-gobject=yes"
38 38
39 export ac_cv_func_XRenderCreateLinearGradient=yes 39 export ac_cv_func_XRenderCreateLinearGradient=yes
40 export ac_cv_func_XRenderCreateRadialGradient=yes 40 export ac_cv_func_XRenderCreateRadialGradient=yes
41 export ac_cv_func_XRenderCreateConicalGradient=yes 41 export ac_cv_func_XRenderCreateConicalGradient=yes
OLDNEW
« no previous file with comments | « PRESUBMIT.py ('k') | ports/glib/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698