From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Date: Tue, 8 Jan 2019 21:31:07 +0000 (+0000)
Subject: do not use bundler as per Ruby policy
X-Git-Tag: archive/raspbian/0.13.0-6+rpi1~1^2^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d484661237e18c2a85c775eca267786f11836c9f;p=thrift.git

do not use bundler as per Ruby policy

Bug-Debian: https://bugs.debian.org/804668



Gbp-Pq: Name no_bundler_use.patch
---

diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index 137edb4..e69ce7b 100755
--- a/lib/rb/Makefile.am
+++ b/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
 
diff --git a/lib/rb/Makefile.in b/lib/rb/Makefile.in
index 0fd7134..4077cbe 100644
--- a/lib/rb/Makefile.in
+++ b/lib/rb/Makefile.in
@@ -639,19 +639,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.
diff --git a/test/rb/Makefile b/test/rb/Makefile
index 4fb0e3a..d6ee089 100644
--- a/test/rb/Makefile
+++ b/test/rb/Makefile
@@ -624,8 +624,9 @@ stubs: $(THRIFT) ../ThriftTest.thrift ../SmallTest.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.
diff --git a/test/rb/Makefile.am b/test/rb/Makefile.am
index 4bd4704..0a451cc 100644
--- a/test/rb/Makefile.am
+++ b/test/rb/Makefile.am
@@ -25,7 +25,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
 
diff --git a/test/rb/Makefile.in b/test/rb/Makefile.in
index 4359764..ac9233f 100644
--- a/test/rb/Makefile.in
+++ b/test/rb/Makefile.in
@@ -624,8 +624,9 @@ stubs: $(THRIFT) ../ThriftTest.thrift ../SmallTest.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.