| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 source pkg_info | |
| 7 source ../../build_tools/common.sh | |
| 8 | 6 |
| 9 AutogenStep() { | 7 AutogenStep() { |
| 10 ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} | 8 ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} |
| 11 # For some reason if we don't remove configure before running | 9 # For some reason if we don't remove configure before running |
| 12 # autoconf it doesn't always get updates correctly. About half | 10 # autoconf it doesn't always get updates correctly. About half |
| 13 # the time the old configure script (with no reference to nacl) | 11 # the time the old configure script (with no reference to nacl) |
| 14 # will remain after ./autogen.sh | 12 # will remain after ./autogen.sh |
| 15 rm -f configure | 13 rm -f configure |
| 16 ./autogen.sh | 14 ./autogen.sh |
| 17 PatchConfigure | 15 PatchConfigure |
| (...skipping 18 matching lines...) Expand all Loading... |
| 36 | 34 |
| 37 local conf_host=${NACL_CROSS_PREFIX} | 35 local conf_host=${NACL_CROSS_PREFIX} |
| 38 if [ ${NACL_ARCH} = "pnacl" ]; then | 36 if [ ${NACL_ARCH} = "pnacl" ]; then |
| 39 # The PNaCl tools use "pnacl-" as the prefix, but config.sub | 37 # The PNaCl tools use "pnacl-" as the prefix, but config.sub |
| 40 # does not know about "pnacl". It only knows about "le32-nacl". | 38 # does not know about "pnacl". It only knows about "le32-nacl". |
| 41 # Unfortunately, most of the config.subs here are so old that | 39 # Unfortunately, most of the config.subs here are so old that |
| 42 # it doesn't know about that "le32" either. So we just say "nacl". | 40 # it doesn't know about that "le32" either. So we just say "nacl". |
| 43 conf_host="nacl" | 41 conf_host="nacl" |
| 44 fi | 42 fi |
| 45 | 43 |
| 46 ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} | 44 BUILD_DIR=${BUILD_DIR}-test |
| 47 MakeDir ${NACL_BUILD_SUBDIR}-test | 45 MakeDir ${BUILD_DIR} |
| 48 ChangeDir ${NACL_BUILD_SUBDIR}-test | 46 ChangeDir ${BUILD_DIR} |
| 49 | 47 |
| 50 LIBS="$LDFLAGS" LogExecute ../test/configure \ | 48 LIBS="$LDFLAGS" LogExecute ../test/configure \ |
| 51 --host=${conf_host} \ | 49 --host=${conf_host} \ |
| 52 --disable-assembly \ | 50 --disable-assembly \ |
| 53 --disable-pthread-sem \ | 51 --disable-pthread-sem \ |
| 54 --prefix=${NACLPORTS_PREFIX} \ | 52 --prefix=${NACLPORTS_PREFIX} \ |
| 55 --exec-prefix=${NACLPORTS_PREFIX} \ | 53 --exec-prefix=${NACLPORTS_PREFIX} \ |
| 56 --libdir=${NACLPORTS_LIBDIR} \ | 54 --libdir=${NACLPORTS_LIBDIR} \ |
| 57 --oldincludedir=${NACLPORTS_INCLUDE} | 55 --oldincludedir=${NACLPORTS_INCLUDE} |
| 58 } | 56 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 75 | 73 |
| 76 local conf_host=${NACL_CROSS_PREFIX} | 74 local conf_host=${NACL_CROSS_PREFIX} |
| 77 if [ ${NACL_ARCH} = "pnacl" ]; then | 75 if [ ${NACL_ARCH} = "pnacl" ]; then |
| 78 # The PNaCl tools use "pnacl-" as the prefix, but config.sub | 76 # The PNaCl tools use "pnacl-" as the prefix, but config.sub |
| 79 # does not know about "pnacl". It only knows about "le32-nacl". | 77 # does not know about "pnacl". It only knows about "le32-nacl". |
| 80 # Unfortunately, most of the config.subs here are so old that | 78 # Unfortunately, most of the config.subs here are so old that |
| 81 # it doesn't know about that "le32" either. So we just say "nacl". | 79 # it doesn't know about that "le32" either. So we just say "nacl". |
| 82 conf_host="nacl-pnacl" | 80 conf_host="nacl-pnacl" |
| 83 fi | 81 fi |
| 84 | 82 |
| 85 MakeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}/${NACL_BUILD_SUBDIR} | 83 MakeDir ${BUILD_DIR} |
| 86 ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}/${NACL_BUILD_SUBDIR} | 84 ChangeDir ${BUILD_DIR} |
| 87 | 85 |
| 88 LogExecute ../configure \ | 86 LogExecute ../configure \ |
| 89 --host=${conf_host} \ | 87 --host=${conf_host} \ |
| 90 --disable-assembly \ | 88 --disable-assembly \ |
| 91 --disable-pthread-sem \ | 89 --disable-pthread-sem \ |
| 92 --prefix=${NACLPORTS_PREFIX} \ | 90 --prefix=${NACLPORTS_PREFIX} \ |
| 93 --exec-prefix=${NACLPORTS_PREFIX} \ | 91 --exec-prefix=${NACLPORTS_PREFIX} \ |
| 94 --libdir=${NACLPORTS_LIBDIR} \ | 92 --libdir=${NACLPORTS_LIBDIR} \ |
| 95 --oldincludedir=${NACLPORTS_INCLUDE} | 93 --oldincludedir=${NACLPORTS_INCLUDE} |
| 96 } | 94 } |
| (...skipping 24 matching lines...) Expand all Loading... |
| 121 ExtractStep | 119 ExtractStep |
| 122 PatchStep | 120 PatchStep |
| 123 AutogenStep | 121 AutogenStep |
| 124 ConfigureStep | 122 ConfigureStep |
| 125 BuildStep | 123 BuildStep |
| 126 InstallStep | 124 InstallStep |
| 127 ConfigureTests | 125 ConfigureTests |
| 128 BuildStep | 126 BuildStep |
| 129 PublishStep | 127 PublishStep |
| 130 } | 128 } |
| 131 | |
| 132 | |
| 133 PackageInstall | |
| 134 exit 0 | |
| OLD | NEW |