| OLD | NEW |
| 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2013 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 EnableGlibcCompat | 5 EnableGlibcCompat |
| 6 EnableCliMain |
| 6 | 7 |
| 7 EXTRA_CONFIGURE_ARGS="--with-curses" | 8 EXTRA_CONFIGURE_ARGS="--with-curses" |
| 8 EXTRA_CONFIGURE_ARGS+=" --with-installed-readline --enable-readline" | 9 EXTRA_CONFIGURE_ARGS+=" --with-installed-readline --enable-readline" |
| 9 NACLPORTS_CPPFLAGS+=" -DHAVE_GETHOSTNAME -DNO_MAIN_ENV_ARG" | 10 NACLPORTS_CPPFLAGS+=" -DHAVE_GETHOSTNAME -DNO_MAIN_ENV_ARG" |
| 10 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main -Dpipe=nacl_spawn_pipe" | 11 NACLPORTS_CPPFLAGS+=" -Dpipe=nacl_spawn_pipe" |
| 11 NACLPORTS_LIBS+=" ${NACL_CLI_MAIN_LIB}" | |
| 12 | 12 |
| 13 EXECUTABLES="bash${NACL_EXEEXT}" | 13 EXECUTABLES="bash${NACL_EXEEXT}" |
| 14 | 14 |
| 15 # Configure requires this variable to be pre-set when cross compiling. | 15 # Configure requires this variable to be pre-set when cross compiling. |
| 16 export bash_cv_getcwd_malloc=yes | 16 export bash_cv_getcwd_malloc=yes |
| 17 | 17 |
| 18 PatchStep() { | 18 PatchStep() { |
| 19 DefaultPatchStep | 19 DefaultPatchStep |
| 20 ChangeDir ${SRC_DIR} | 20 ChangeDir ${SRC_DIR} |
| 21 } | 21 } |
| 22 | 22 |
| 23 BuildStep() { | 23 BuildStep() { |
| 24 # There is a missing depedency in the bash build system which means | 24 # There is a missing depedency in the bash build system which means |
| 25 # that parallel build will sometimes fail due to lib/intl/libintl.h | 25 # that parallel build will sometimes fail due to lib/intl/libintl.h |
| 26 # not being generated before files that use it are compiled. | 26 # not being generated before files that use it are compiled. |
| 27 # For example pathexp.c indirectly depends on libintl.h but compilation | 27 # For example pathexp.c indirectly depends on libintl.h but compilation |
| 28 # of this file doesn't depend on the rule that generates it. | 28 # of this file doesn't depend on the rule that generates it. |
| 29 # The fix is to explictly build lib/intl before we build everything else. | 29 # The fix is to explictly build lib/intl before we build everything else. |
| 30 LogExecute make -C lib/intl | 30 LogExecute make -C lib/intl |
| 31 DefaultBuildStep | 31 DefaultBuildStep |
| 32 } | 32 } |
| 33 | 33 |
| 34 PublishStep() { | 34 PublishStep() { |
| 35 PublishMultiArch bash${NACL_EXEEXT} bash bash_multiarch | 35 PublishMultiArch bash${NACL_EXEEXT} bash bash_multiarch |
| 36 } | 36 } |
| OLD | NEW |