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

Unified Diff: ports/ffmpeg/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
Index: ports/ffmpeg/nacl.patch
diff --git a/ports/ffmpeg/nacl.patch b/ports/ffmpeg/nacl.patch
index d11c7bac1748cf5702b40ad5af913b0a14d5db94..4d47322dfb49d2b6b2330442607084d1d1d96672 100644
--- a/ports/ffmpeg/nacl.patch
+++ b/ports/ffmpeg/nacl.patch
@@ -1,6 +1,29 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -116,7 +116,9 @@ ffprobe.o cmdutils.o libavcodec/utils.o libavformat/utils.o libavdevice/avdevice
+
+ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
+ $(CP) $< $@
+- $(STRIP) $@
++ -if test "$(NACL_ARCH)" != "le32"; then \
++ $(STRIP) $@; \
++ fi
+
+ %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS)
+ $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
diff --git a/configure b/configure
--- a/configure
+++ b/configure
+@@ -2719,7 +2719,7 @@ ln_s="ln -s -f"
+ nm_default="nm -g"
+ objformat="elf"
+ pkg_config_default=pkg-config
+-if ranlib 2>&1 | grep -q "\-D "; then
++if [ $NACL_ARCH != le32 ] && ranlib 2>&1 | grep -q "\-D "; then
+ ranlib_default="ranlib -D"
+ else
+ ranlib_default="ranlib"
@@ -4761,7 +4761,13 @@ if ! disabled network; then
fi
« make_all.sh ('K') | « ports/ffmpeg/build.sh ('k') | ports/freeimage/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698