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

Side by Side Diff: ports/emacs/build.sh

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month 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/emacs-x/pkg_info ('k') | ports/emacs/emacs_pepper.c » ('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) 2014 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2014 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 OS_JOBS=1 5 OS_JOBS=1
6 6
7 export RUNPROGRAM="${NACL_SDK_ROOT}/tools/sel_ldr.py" 7 export RUNPROGRAM="${NACL_SDK_ROOT}/tools/sel_ldr.py"
8 8
9 EXTRA_CONFIGURE_ARGS+=" --prefix=/usr --exec-prefix=/usr" 9 EXTRA_CONFIGURE_ARGS+=" --prefix=/usr --exec-prefix=/usr"
10 10
(...skipping 24 matching lines...) Expand all
35 # but required for static linking. 35 # but required for static linking.
36 COMPAT_LIBS="-pthread ${COMPAT_LIBS}" 36 COMPAT_LIBS="-pthread ${COMPAT_LIBS}"
37 if [ ${EMACS_X:-0} = 1 ]; then 37 if [ ${EMACS_X:-0} = 1 ]; then
38 COMPAT_LIBS="-lxcb -lXau -lXpm ${COMPAT_LIBS}" 38 COMPAT_LIBS="-lxcb -lXau -lXpm ${COMPAT_LIBS}"
39 fi 39 fi
40 COMPAT_LIBS="-lnacl_io ${COMPAT_LIBS}" 40 COMPAT_LIBS="-lnacl_io ${COMPAT_LIBS}"
41 COMPAT_LIBS+=" -lglibc-compat" 41 COMPAT_LIBS+=" -lglibc-compat"
42 NACLPORTS_LIBS+=" ${COMPAT_LIBS}" 42 NACLPORTS_LIBS+=" ${COMPAT_LIBS}"
43 fi 43 fi
44 44
45 EnableCliMain
45 EnableGlibcCompat 46 EnableGlibcCompat
46 47
47 ConfigureStep() { 48 ConfigureStep() {
48 export CFLAGS="${NACLPORTS_CFLAGS} -I${NACL_SDK_ROOT}/include" 49 export CFLAGS="${NACLPORTS_CFLAGS} -I${NACL_SDK_ROOT}/include"
49 DefaultConfigureStep 50 DefaultConfigureStep
50 } 51 }
51 52
52 # Build twice to workaround a problem in the build script that builds something 53 # Build twice to workaround a problem in the build script that builds something
53 # partially the first time that makes the second time succeed. 54 # partially the first time that makes the second time succeed.
54 # TODO(petewil): Find and fix the problem that makes us build twice. 55 # TODO(petewil): Find and fix the problem that makes us build twice.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 fi 137 fi
137 LogExecute cp ${XORG_DIR}/*.tar ${ASSEMBLY_DIR}/ 138 LogExecute cp ${XORG_DIR}/*.tar ${ASSEMBLY_DIR}/
138 LogExecute cp ${XORG_DIR}/*.js ${ASSEMBLY_DIR}/ 139 LogExecute cp ${XORG_DIR}/*.js ${ASSEMBLY_DIR}/
139 LogExecute cp ${XORG_DIR}/*.html ${ASSEMBLY_DIR}/ 140 LogExecute cp ${XORG_DIR}/*.html ${ASSEMBLY_DIR}/
140 141
141 LogExecute cp ${START_DIR}/../emacs-x/Xsdl.js ${ASSEMBLY_DIR}/ 142 LogExecute cp ${START_DIR}/../emacs-x/Xsdl.js ${ASSEMBLY_DIR}/
142 fi 143 fi
143 ChangeDir ${PUBLISH_DIR} 144 ChangeDir ${PUBLISH_DIR}
144 CreateWebStoreZip emacs-${VERSION}.zip emacs 145 CreateWebStoreZip emacs-${VERSION}.zip emacs
145 } 146 }
OLDNEW
« no previous file with comments | « ports/emacs-x/pkg_info ('k') | ports/emacs/emacs_pepper.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698