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

Side by Side Diff: ports/vim/nacl.patch

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 7 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:
View unified diff | Download patch
OLDNEW
1 diff --git a/src/Makefile b/src/Makefile 1 diff --git a/src/Makefile b/src/Makefile
2 --- a/src/Makefile 2 --- a/src/Makefile
3 +++ b/src/Makefile 3 +++ b/src/Makefile
4 @@ -1737,7 +1737,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c vers ion.h 4 @@ -1737,7 +1737,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c vers ion.h
5 sh $(srcdir)/link.sh 5 sh $(srcdir)/link.sh
6 6
7 xxd/xxd$(EXEEXT): xxd/xxd.c 7 xxd/xxd$(EXEEXT): xxd/xxd.c
8 - cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ 8 - cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
9 + cd xxd; CC="$(CC)" EXEEXT="$(EXEEXT)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDF LAGS="$(LDFLAGS)" \ 9 + cd xxd; CC="$(CC)" EXEEXT="$(EXEEXT)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDF LAGS="$(LDFLAGS)" \
10 $(MAKE) -f Makefile 10 $(MAKE) -f Makefile
11 11
12 # Build the language specific files if they were unpacked. 12 # Build the language specific files if they were unpacked.
13 @@ -1926,7 +1926,9 @@ installvimbin: $(VIMTARGET) $(DESTDIR)$(exec_prefix) $(DES T_BIN)
14 rm -f $(DEST_BIN)/$(VIMNAME).rm; \
15 fi
16 $(INSTALL_PROG) $(VIMTARGET) $(DEST_BIN)
17 - $(STRIP) $(DEST_BIN)/$(VIMTARGET)
18 + -if test "$(NACL_ARCH)" != "le32"; then \
19 + $(STRIP) $(DEST_BIN)/$(VIMTARGET); \
20 + fi
21 chmod $(BINMOD) $(DEST_BIN)/$(VIMTARGET)
22 # may create a link to the new executable from /usr/bin/vi
23 -$(LINKIT)
24 @@ -2063,7 +2065,9 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN ) \
25 rm -f $(DEST_BIN)/xxd.rm; \
26 fi
27 $(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN)
28 - $(STRIP) $(DEST_BIN)/xxd$(EXEEXT)
29 + -if test "$(NACL_ARCH)" != "le32"; then \
30 + $(STRIP) $(DEST_BIN)/xxd$(EXEEXT) \
31 + fi
32 chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
33 -$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
34
13 diff --git a/src/auto/configure b/src/auto/configure 35 diff --git a/src/auto/configure b/src/auto/configure
14 --- a/src/auto/configure 36 --- a/src/auto/configure
15 +++ b/src/auto/configure 37 +++ b/src/auto/configure
16 @@ -13006,16 +13006,16 @@ $as_echo "yes" >&6; } 38 @@ -13006,16 +13006,16 @@ $as_echo "yes" >&6; }
17 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 39 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18 $as_echo "no" >&6; } 40 $as_echo "no" >&6; }
19 fi 41 fi
20 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_ FORTIFY_SOURCE=1" >&5 42 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_ FORTIFY_SOURCE=1" >&5
21 -$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } 43 -$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
22 - if test "$gccmajor" -gt "3"; then 44 - if test "$gccmajor" -gt "3"; then
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 @@ -1,7 +1,7 @@ 107 @@ -1,7 +1,7 @@
86 # The most simplistic Makefile 108 # The most simplistic Makefile
87 109
88 -xxd: xxd.c 110 -xxd: xxd.c
89 - $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c 111 - $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c
90 +xxd$(EXEEXT): xxd.c 112 +xxd$(EXEEXT): xxd.c
91 + $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd$(EXEEXT) xxd.c 113 + $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd$(EXEEXT) xxd.c
92 114
93 clean: 115 clean:
94 rm -f xxd xxd.o 116 rm -f xxd xxd.o
OLDNEW
« make_all.sh ('K') | « ports/toybox/nacl.patch ('k') | ports/x264/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698