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

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

Issue 1882443002: Fix ports to pass generic options which work with new and old drivers (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « docs/port_list.md ('k') | ports/mesa/nacl.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/Makefile b/Makefile 1 diff --git a/Makefile b/Makefile
2 --- a/Makefile 2 --- a/Makefile
3 +++ b/Makefile 3 +++ b/Makefile
4 @@ -99,7 +99,11 @@ endif # PLATFORM_SHARED_EXT 4 @@ -99,7 +99,11 @@ endif # PLATFORM_SHARED_EXT
5 5
6 all: $(SHARED) $(LIBRARY) 6 all: $(SHARED) $(LIBRARY)
7 7
8 -check: all $(PROGRAMS) $(TESTS) 8 -check: all $(PROGRAMS) $(TESTS)
9 +tests: $(TESTS) 9 +tests: $(TESTS)
10 + 10 +
11 +programs: $(PROGRAMS) 11 +programs: $(PROGRAMS)
12 + 12 +
13 +check: all programs tests 13 +check: all programs tests
14 for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done 14 for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
15 15
16 clean: 16 clean:
17 @@ -108,7 +112,7 @@ clean:
18
19 $(LIBRARY): $(LIBOBJECTS)
20 rm -f $@
21 - $(AR) -rs $@ $(LIBOBJECTS)
22 + $(AR) rs $@ $(LIBOBJECTS)
23
24 db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL)
25 $(CXX) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS)
26 @@ -190,7 +194,7 @@ write_batch_test: db/write_batch_test.o $(LIBOBJECTS) $(TEST HARNESS)
27
28 $(MEMENVLIBRARY) : $(MEMENVOBJECTS)
29 rm -f $@
30 - $(AR) -rs $@ $(MEMENVOBJECTS)
31 + $(AR) rs $@ $(MEMENVOBJECTS)
32
33 memenv_test : helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRARY) $(TESTHA RNESS)
34 $(CXX) $(LDFLAGS) helpers/memenv/memenv_test.o $(MEMENVLIBRARY) $(LIBRAR Y) $(TESTHARNESS) -o $@ $(LIBS)
17 diff --git a/build_detect_platform b/build_detect_platform 35 diff --git a/build_detect_platform b/build_detect_platform
18 --- a/build_detect_platform 36 --- a/build_detect_platform
19 +++ b/build_detect_platform 37 +++ b/build_detect_platform
20 @@ -104,6 +104,31 @@ case "$TARGET_OS" in 38 @@ -104,6 +104,31 @@ case "$TARGET_OS" in
21 PLATFORM_LIBS="-lpthread" 39 PLATFORM_LIBS="-lpthread"
22 PORT_FILE=port/port_posix.cc 40 PORT_FILE=port/port_posix.cc
23 ;; 41 ;;
24 + NaCl) 42 + NaCl)
25 + PLATFORM=OS_NACL 43 + PLATFORM=OS_NACL
26 + COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_NACL -DLEVELDB_PLATFORM_PO SIX" 44 + COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_NACL -DLEVELDB_PLATFORM_PO SIX"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 struct flock f; 141 struct flock f;
124 memset(&f, 0, sizeof(f)); 142 memset(&f, 0, sizeof(f));
125 @@ -262,6 +291,7 @@ static int LockOrUnlock(int fd, bool lock) { 143 @@ -262,6 +291,7 @@ static int LockOrUnlock(int fd, bool lock) {
126 f.l_start = 0; 144 f.l_start = 0;
127 f.l_len = 0; // Lock/unlock entire file 145 f.l_len = 0; // Lock/unlock entire file
128 return fcntl(fd, F_SETLK, &f); 146 return fcntl(fd, F_SETLK, &f);
129 +#endif 147 +#endif
130 } 148 }
131 149
132 class PosixFileLock : public FileLock { 150 class PosixFileLock : public FileLock {
OLDNEW
« no previous file with comments | « docs/port_list.md ('k') | ports/mesa/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698