[Pkg-javascript-devel] Bug#675856: [PATCH 3/5] update use_system_gyp.patch

[Shawn Landden]

From: Shawn Landen <shawnlandden at gmail.com>

---
 debian/patches/0011_use_system_gyp.patch |   45 +++++++++++++-----------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/debian/patches/0011_use_system_gyp.patch b/debian/patches/0011_use_system_gyp.patch
index dae1631..7440a43 100644
--- a/debian/patches/0011_use_system_gyp.patch
+++ b/debian/patches/0011_use_system_gyp.patch
@@ -1,39 +1,32 @@
 Description: Use gyp package, not build/gyp/gyp.
 Forwarded: not-needed
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2011-10-22
+Last-Update: 2012-06-03
 --- a/Makefile
 +++ b/Makefile
-@@ -207,27 +207,27 @@
- 
- # GYP file generation targets.
- $(OUTDIR)/Makefile-ia32: $(GYPFILES) $(ENVFILE)
--	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-+	gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 \
- 	              -S-ia32 $(GYPFLAGS)
- 
- $(OUTDIR)/Makefile-x64: $(GYPFILES) $(ENVFILE)
+@@ -214,14 +214,14 @@
+ MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
+ $(MAKEFILES): $(GYPFILES) $(ENVFILE)
+ 	GYP_GENERATORS=make \
 -	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
 +	gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 \
- 	              -S-x64 $(GYPFLAGS)
+ 	              -Ibuild/standalone.gypi --depth=. \
+ 	              -Dv8_target_arch=$(subst .,,$(suffix $@)) \
+ 	              -S.$(subst .,,$(suffix $@)) $(GYPFLAGS)
  
- $(OUTDIR)/Makefile-arm: $(GYPFILES) $(ENVFILE) build/armu.gypi
+ $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
+ 	GYP_GENERATORS=make \
 -	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
 +	gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi \
- 	              -S-arm $(GYPFLAGS)
+ 	              -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
  
- $(OUTDIR)/Makefile-mips: $(GYPFILES) $(ENVFILE) build/mipsu.gypi
+ $(OUTDIR)/Makefile.android: $(GYPFILES) $(ENVFILE) build/android.gypi \
+@@ -229,7 +229,7 @@
+ 	GYP_GENERATORS=make \
+ 	CC="${ANDROID_TOOL_PREFIX}-gcc" \
+ 	CXX="${ANDROID_TOOL_PREFIX}-g++" \
 -	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
 +	gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. -Ibuild/mipsu.gypi \
- 	              -S-mips $(GYPFLAGS)
- 
- $(OUTDIR)/Makefile-native: $(GYPFILES) $(ENVFILE)
--	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-+	gyp --generator-output="$(OUTDIR)" build/all.gyp \
- 	              -Ibuild/standalone.gypi --depth=. -S-native $(GYPFLAGS)
- 
- $(OUTDIR)/Makefile-android: $(GYPFILES) $(ENVFILE) build/android.gypi \
+ 	              -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
+ 	              -S.android $(GYPFLAGS)
+
-- 
1.7.10