| OLD | NEW |
| 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 if [ "${NACL_LIBC}" == "newlib" ]; then |
| 24 NACLPORTS_LDFLAGS+=" -lglibc-compat" |
| 25 fi |
| 26 |
| 23 EXECUTABLES="test/cairo-test-suite${NACL_EXEEXT}" | 27 EXECUTABLES="test/cairo-test-suite${NACL_EXEEXT}" |
| 24 | 28 |
| 25 # This is only necessary for pnacl | 29 # This is only necessary for pnacl |
| 26 export ax_cv_c_float_words_bigendian=no | 30 export ax_cv_c_float_words_bigendian=no |
| 27 | 31 |
| 28 # Enable the x backend | 32 # Enable the x backend |
| 29 EXTRA_CONFIGURE_ARGS+=" --with-x" | 33 EXTRA_CONFIGURE_ARGS+=" --with-x" |
| 30 EXTRA_CONFIGURE_ARGS+=" --enable-xlib=yes" | 34 EXTRA_CONFIGURE_ARGS+=" --enable-xlib=yes" |
| 31 EXTRA_CONFIGURE_ARGS+=" --enable-xlib-xrender=yes" | 35 EXTRA_CONFIGURE_ARGS+=" --enable-xlib-xrender=yes" |
| 32 # disable xcb | 36 # disable xcb |
| 33 EXTRA_CONFIGURE_ARGS+=" --disable-xcb" | 37 EXTRA_CONFIGURE_ARGS+=" --disable-xcb" |
| 34 EXTRA_CONFIGURE_ARGS+=" --disable-xlib-xcb" | 38 EXTRA_CONFIGURE_ARGS+=" --disable-xlib-xcb" |
| 35 EXTRA_CONFIGURE_ARGS+=" --disable-xcb-shm" | 39 EXTRA_CONFIGURE_ARGS+=" --disable-xcb-shm" |
| 36 # gobjects required for gdk-pixbuf -> gtk+ | 40 # gobjects required for gdk-pixbuf -> gtk+ |
| 37 EXTRA_CONFIGURE_ARGS+=" --enable-gobject=yes" | 41 EXTRA_CONFIGURE_ARGS+=" --enable-gobject=yes" |
| 38 | 42 |
| 39 export ac_cv_func_XRenderCreateLinearGradient=yes | 43 export ac_cv_func_XRenderCreateLinearGradient=yes |
| 40 export ac_cv_func_XRenderCreateRadialGradient=yes | 44 export ac_cv_func_XRenderCreateRadialGradient=yes |
| 41 export ac_cv_func_XRenderCreateConicalGradient=yes | 45 export ac_cv_func_XRenderCreateConicalGradient=yes |
| OLD | NEW |