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

Unified Diff: ports/x264/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, 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 side-by-side diff with in-line comments
Download patch
« make_all.sh ('K') | « ports/vim/nacl.patch ('k') | ports/zlib/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/x264/nacl.patch
diff --git a/ports/x264/nacl.patch b/ports/x264/nacl.patch
index 6ff680bddcbbd1c4558c627ce20970b949622b37..96db4703a03cb48af64644fba6dc57c0a9e66eaf 100644
--- a/ports/x264/nacl.patch
+++ b/ports/x264/nacl.patch
@@ -20,7 +20,7 @@ diff --git a/configure b/configure
+ *nacl*)
+ SYS="NACL"
+ define HAVE_MALLOC_H
-+ if [[ $(basename ${CC}) =~ pnacl-* ]]; then
++ if [[ $(basename ${CC}) =~ pnacl-* || $(basename ${CC}) =~ le32-nacl-* ]]; then
+ EXE=.pexe
+ else
+ EXE=.nexe
@@ -35,7 +35,7 @@ diff --git a/configure b/configure
echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
$CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
+ # there is no pnacl-strings binary.
-+ if [[ ! $(basename ${CC}) =~ pnacl-* ]]; then
++ if [[ ! $(basename ${CC}) =~ pnacl-* && ! $(basename ${CC}) =~ le32-nacl-* ]]; then
if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
define WORDS_BIGENDIAN
elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then
« make_all.sh ('K') | « ports/vim/nacl.patch ('k') | ports/zlib/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698