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 137edb4d4244433fd573d0a72bb36f83fef0e08a..e69ce7b9fcf3ac9cbbe36e3b2686120b63791126 100755 (executable)
--- 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 0fd713482c98a91687e39e1fd132fd6ec0750e98..4077cbee59c9e6ae5e039dcb7f703483c6172052 100644 (file)
--- 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 4fb0e3ab7a2e7df0a0f4fd91de57495b17395376..d6ee0893814a419c592b8f7d6190d203cf889d70 100644 (file)
--- 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 4bd4704817c1eb60386476e4df3c147753b91dfa..0a451cc5f77e31841c741e2b2e2489a1614e8c9b 100644 (file)
--- 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 435976417f322f9de61733e16d733810bbd59c1c..ac9233f3b3ee681e8fe1dcad1fbd0995cc0c9257 100644 (file)
--- 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.