[packages/thrift.git] / no_bundler_use.patch

Description: do not use bundler as per Ruby policy
 .
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Bug-Debian: https://bugs.debian.org/804668

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- thrift-0.9.3.orig/lib/rb/Makefile.am
+++ thrift-0.9.3/lib/rb/Makefile.am
@@ -22,19 +22,23 @@ DESTDIR ?= /
 if HAVE_BUNDLER
 
 all-local:
-	$(BUNDLER) install
-	$(BUNDLER) exec rake build_ext
+	echo Do not use bundler for all-local
+#	$(BUNDLER) install
+#	$(BUNDLER) exec rake build_ext
 
 install-exec-hook:
-	$(BUNDLER) exec rake install
+	echo Do not use bundler for install-exec-hook
+#	$(BUNDLER) exec rake install
 
 clean-local:
-	$(BUNDLER) install
-	$(BUNDLER) exec rake clean
+	echo Do not use bundler for clean-local
+#	$(BUNDLER) install
+#	$(BUNDLER) exec rake clean
 
 check-local: all
-	$(BUNDLER) install
-	$(BUNDLER) exec rake
+	echo Do not use bundler for check-local
+#	$(BUNDLER) install
+#	$(BUNDLER) exec rake
 
 endif
 
--- thrift-0.9.3.orig/lib/rb/Makefile.in
+++ thrift-0.9.3/lib/rb/Makefile.in
@@ -605,19 +605,19 @@ uninstall-am:
 DESTDIR ?= /
 
 @HAVE_BUNDLER_TRUE@all-local:
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) install
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) exec rake build_ext
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) install
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) exec rake build_ext
 
 @HAVE_BUNDLER_TRUE@install-exec-hook:
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) exec rake install
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) exec rake install
 
 @HAVE_BUNDLER_TRUE@clean-local:
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) install
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) exec rake clean
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) install
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) exec rake clean
 
 @HAVE_BUNDLER_TRUE@check-local: all
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) install
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) exec rake
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) install
+@HAVE_BUNDLER_TRUE@	echo No $(BUNDLER) exec rake
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- thrift-0.9.3.orig/test/rb/Makefile
+++ thrift-0.9.3/test/rb/Makefile
@@ -591,8 +591,9 @@ stubs: $(THRIFT) ../ThriftTest.thrift ..
 precross: stubs
 
 check: stubs
-	$(BUNDLER) install
-	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
+	echo Do not use bundler for check
+#	$(BUNDLER) install
+#	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- thrift-0.9.3.orig/test/rb/Makefile.am
+++ thrift-0.9.3/test/rb/Makefile.am
@@ -27,7 +27,8 @@ precross: stubs
 
 check: stubs
 if HAVE_BUNDLER
-	$(BUNDLER) install
-	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
+	echo Do not use bundler for check
+#	$(BUNDLER) install
+#	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
 endif
 
--- thrift-0.9.3.orig/test/rb/Makefile.in
+++ thrift-0.9.3/test/rb/Makefile.in
@@ -591,8 +591,9 @@ stubs: $(THRIFT) ../ThriftTest.thrift ..
 precross: stubs
 
 check: stubs
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) install
-@HAVE_BUNDLER_TRUE@	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
+@HAVE_BUNDLER_TRUE@	echo Do not use bundler for check
+@HAVE_BUNDLER_TRUE@	#$(BUNDLER) install
+@HAVE_BUNDLER_TRUE@	#$(BUNDLER) exec $(RUBY) -I. test_suite.rb
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Commit	Line	Data
016f6701 AM	1	Description: do not use bundler as per Ruby policy
	2	.
	3	Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
	4	Bug-Debian: https://bugs.debian.org/804668
	5
	6	---
	7	The information above should follow the Patch Tagging Guidelines, please
	8	checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
	9	are templates for supplementary fields that you might want to add:
	10
	11	Origin: <vendor\|upstream\|other>, <url of original patch>
	12	Bug: <url in upstream bugtracker>
	13	Bug-Debian: https://bugs.debian.org/<bugnumber>
	14	Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
	15	Forwarded: <no\|not-needed\|url proving that it has been forwarded>
	16	Reviewed-By: <name and email of someone who approved the patch>
	17	Last-Update: <YYYY-MM-DD>
	18
	19	--- thrift-0.9.3.orig/lib/rb/Makefile.am
	20	+++ thrift-0.9.3/lib/rb/Makefile.am
	21	@@ -22,19 +22,23 @@ DESTDIR ?= /
	22	if HAVE_BUNDLER
	23
	24	all-local:
	25	- $(BUNDLER) install
	26	- $(BUNDLER) exec rake build_ext
	27	+ echo Do not use bundler for all-local
	28	+# $(BUNDLER) install
	29	+# $(BUNDLER) exec rake build_ext
	30
	31	install-exec-hook:
	32	- $(BUNDLER) exec rake install
	33	+ echo Do not use bundler for install-exec-hook
	34	+# $(BUNDLER) exec rake install
	35
	36	clean-local:
	37	- $(BUNDLER) install
	38	- $(BUNDLER) exec rake clean
	39	+ echo Do not use bundler for clean-local
	40	+# $(BUNDLER) install
	41	+# $(BUNDLER) exec rake clean
	42
	43	check-local: all
	44	- $(BUNDLER) install
	45	- $(BUNDLER) exec rake
	46	+ echo Do not use bundler for check-local
	47	+# $(BUNDLER) install
	48	+# $(BUNDLER) exec rake
	49
	50	endif
	51
	52	--- thrift-0.9.3.orig/lib/rb/Makefile.in
	53	+++ thrift-0.9.3/lib/rb/Makefile.in
	54	@@ -605,19 +605,19 @@ uninstall-am:
	55	DESTDIR ?= /
	56
	57	@HAVE_BUNDLER_TRUE@all-local:
	58	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) install
	59	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) exec rake build_ext
	60	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) install
	61	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) exec rake build_ext
	62
	63	@HAVE_BUNDLER_TRUE@install-exec-hook:
	64	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) exec rake install
65	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) exec rake install
66
67	@HAVE_BUNDLER_TRUE@clean-local:
68	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) install
69	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) exec rake clean
70	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) install
71	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) exec rake clean
72
73	@HAVE_BUNDLER_TRUE@check-local: all
74	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) install
75	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) exec rake
76	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) install
77	+@HAVE_BUNDLER_TRUE@ echo No $(BUNDLER) exec rake
78
79	# Tell versions [3.59,3.63) of GNU make to not export all variables.
80	# Otherwise a system limit (for SysV at least) may be exceeded.
81	--- thrift-0.9.3.orig/test/rb/Makefile
82	+++ thrift-0.9.3/test/rb/Makefile
83	@@ -591,8 +591,9 @@ stubs: $(THRIFT) ../ThriftTest.thrift ..
84	precross: stubs
85
86	check: stubs
87	- $(BUNDLER) install
88	- $(BUNDLER) exec $(RUBY) -I. test_suite.rb
89	+ echo Do not use bundler for check
90	+# $(BUNDLER) install
91	+# $(BUNDLER) exec $(RUBY) -I. test_suite.rb
92
93	# Tell versions [3.59,3.63) of GNU make to not export all variables.
94	# Otherwise a system limit (for SysV at least) may be exceeded.
95	--- thrift-0.9.3.orig/test/rb/Makefile.am
96	+++ thrift-0.9.3/test/rb/Makefile.am
97	@@ -27,7 +27,8 @@ precross: stubs
98
99	check: stubs
100	if HAVE_BUNDLER
101	- $(BUNDLER) install
102	- $(BUNDLER) exec $(RUBY) -I. test_suite.rb
103	+ echo Do not use bundler for check
104	+# $(BUNDLER) install
105	+# $(BUNDLER) exec $(RUBY) -I. test_suite.rb
106	endif
107
108	--- thrift-0.9.3.orig/test/rb/Makefile.in
109	+++ thrift-0.9.3/test/rb/Makefile.in
110	@@ -591,8 +591,9 @@ stubs: $(THRIFT) ../ThriftTest.thrift ..
111	precross: stubs
112
113	check: stubs
114	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) install
115	-@HAVE_BUNDLER_TRUE@ $(BUNDLER) exec $(RUBY) -I. test_suite.rb
116	+@HAVE_BUNDLER_TRUE@ echo Do not use bundler for check
117	+@HAVE_BUNDLER_TRUE@ #$(BUNDLER) install
118	+@HAVE_BUNDLER_TRUE@ #$(BUNDLER) exec $(RUBY) -I. test_suite.rb
119
120	# Tell versions [3.59,3.63) of GNU make to not export all variables.
121	# Otherwise a system limit (for SysV at least) may be exceeded.