ports/xorg-server/build.sh - Issue 1285953002: Switch devenv to use pkg packages

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ports/xorg-server/build.sh

Issue 1285953002: Switch devenv to use pkg packages (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@toolchain_install

Patch Set: 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:

Index: ports/xorg-server/build.sh

diff --git a/ports/xorg-server/build.sh b/ports/xorg-server/build.sh

index c23fc18852834486059c6c54bc674d08f4af8795..f747d6e46690afa96591c7337d26cf58afaf9ee3 100755

--- a/ports/xorg-server/build.sh

+++ b/ports/xorg-server/build.sh

@@ -83,8 +83,7 @@ InstallStep() {

local BASH_DIR=${NACL_PACKAGES_PUBLISH}/bash/${TOOLCHAIN}/bash_multiarch

LogExecute cp -fR ${BASH_DIR}/* ${ASSEMBLY_DIR}

- local XKBCOMP_DIR=${NACL_PACKAGES_PUBLISH}/xkbcomp/${TOOLCHAIN}/${NACL_ARCH}

- LogExecute cp ${XKBCOMP_DIR}/xkbcomp \

+ LogExecute cp ${NACLPORTS_BIN}/xkbcomp${NACL_EXEEXT} \

${ASSEMBLY_DIR}/xkbcomp_${NACL_ARCH}${NACL_EXEEXT}

LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \

${ASSEMBLY_DIR}/xkbcomp_*${NACL_EXEEXT} \

« no previous file with comments | « ports/xkbcomp/build.sh ('k') | ports/xz/build.sh » ('j') | no next file with comments »