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

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

Issue 1553053002: Update pnacl toolchain build (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 11 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 | « ports/nacl-spawn/nacl_spawn.cc ('k') | ports/pnacl-binutils-src/pkg_info » ('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/compat/Makefile.am b/compat/Makefile.am 1 diff --git a/compat/Makefile.am b/compat/Makefile.am
2 --- a/compat/Makefile.am 2 --- a/compat/Makefile.am
3 +++ b/compat/Makefile.am 3 +++ b/compat/Makefile.am
4 @@ -1,8 +1,7 @@ 4 @@ -1,8 +1,7 @@
5 -noinst_LTLIBRARIES= libbsd_compat.la 5 -noinst_LTLIBRARIES= libbsd_compat.la
6 noinst_HEADERS= bsd_compat.h endian_util.h \ 6 noinst_HEADERS= bsd_compat.h endian_util.h \
7 humanize_number.h 7 humanize_number.h
8 8
9 -libbsd_compat_la_SOURCES= basename.c \ 9 -libbsd_compat_la_SOURCES= basename.c \
10 +sources= basename.c \ 10 +sources= basename.c \
(...skipping 1478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 #include <archive.h> 1489 #include <archive.h>
1490 #include <sqlite3.h> 1490 #include <sqlite3.h>
1491 #include <stdbool.h> 1491 #include <stdbool.h>
1492 +#include <stdint.h> 1492 +#include <stdint.h>
1493 #include <uthash.h> 1493 #include <uthash.h>
1494 #include <utlist.h> 1494 #include <utlist.h>
1495 #include <ucl.h> 1495 #include <ucl.h>
1496 diff --git a/libpkg/private/utils.h b/libpkg/private/utils.h 1496 diff --git a/libpkg/private/utils.h b/libpkg/private/utils.h
1497 --- a/libpkg/private/utils.h 1497 --- a/libpkg/private/utils.h
1498 +++ b/libpkg/private/utils.h 1498 +++ b/libpkg/private/utils.h
1499 @@ -39,6 +39,10 @@ 1499 @@ -39,11 +39,16 @@
1500 #include <openssl/pem.h> 1500 #include <openssl/pem.h>
1501 #include <openssl/rsa.h> 1501 #include <openssl/rsa.h>
1502 1502
1503 +#ifndef MAXHOSTNAMELEN 1503 +#ifndef MAXHOSTNAMELEN
1504 +#define MAXHOSTNAMELEN 64 1504 +#define MAXHOSTNAMELEN 64
1505 +#endif 1505 +#endif
1506 + 1506 +
1507 #define STARTS_WITH(string, needle) (strncasecmp(string, needle, strlen(needle) ) == 0) 1507 #define STARTS_WITH(string, needle) (strncasecmp(string, needle, strlen(needle) ) == 0)
1508 1508
1509 #define ERROR_SQLITE(db, query) do { \ 1509 #define ERROR_SQLITE(db, query) do { \
1510 - pkg_emit_error("sqlite error while executing %s in file %s:%d: %s", (que ry), \
1511 - __FILE__, __LINE__, sqlite3_errmsg(db)); \
1512 + pkg_emit_error("sqlite error executing %s on %s at %s:%d: %s", (query), \
1513 + sqlite3_db_filename(db, "main"), bsd_basename(__FILE__), __LINE__, \
1514 + sqlite3_errmsg(db)); \
1515 } while(0)
1516
1517 KHASH_MAP_INIT_INT(hardlinks, int)
1510 diff --git a/libpkg/repo/binary/fetch.c b/libpkg/repo/binary/fetch.c 1518 diff --git a/libpkg/repo/binary/fetch.c b/libpkg/repo/binary/fetch.c
1511 --- a/libpkg/repo/binary/fetch.c 1519 --- a/libpkg/repo/binary/fetch.c
1512 +++ b/libpkg/repo/binary/fetch.c 1520 +++ b/libpkg/repo/binary/fetch.c
1513 @@ -42,6 +42,11 @@ 1521 @@ -42,6 +42,11 @@
1514 #include <limits.h> 1522 #include <limits.h>
1515 1523
1516 #include <libgen.h> 1524 #include <libgen.h>
1517 +#ifdef __native_client__ 1525 +#ifdef __native_client__
1518 +#include <sys/types.h> 1526 +#include <sys/types.h>
1519 +#include <sys/wait.h> 1527 +#include <sys/wait.h>
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
2174 2182
2175 +if DYNAMIC 2183 +if DYNAMIC
2176 + GENERIC_LDADD+= $(top_builddir)/compat/libbsd_compat.la -lutil 2184 + GENERIC_LDADD+= $(top_builddir)/compat/libbsd_compat.la -lutil
2177 +else 2185 +else
2178 + GENERIC_LDADD+= $(top_builddir)/compat/libbsd_compat_static.la 2186 + GENERIC_LDADD+= $(top_builddir)/compat/libbsd_compat_static.la
2179 +endif 2187 +endif
2180 + 2188 +
2181 if HAVE_ELF_ABI 2189 if HAVE_ELF_ABI
2182 if LIBELF_BUNDLED 2190 if LIBELF_BUNDLED
2183 GENERIC_LDADD+= $(top_builddir)/external/libelf_static.la 2191 GENERIC_LDADD+= $(top_builddir)/external/libelf_static.la
OLDNEW
« no previous file with comments | « ports/nacl-spawn/nacl_spawn.cc ('k') | ports/pnacl-binutils-src/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698