Make multiarch behave in debian-standard way

Author: maths22

debian/patches/0012-use-debian-standard-multiarch.patch

@@ -0,0 +1,32 @@
+Description: Avoid multiarching bins and linking multiarch lib data to global dirs
+  This reverts the effects of github.com/ruby/ruby/pull/10010 to remain in alignment with standard
+  debian multiarch filesystem layout
+Origin: https://github.com/sorah-rbpkg/ruby/commit/f482d322a9490cee80ac6af4e08cdfb1f4b7abbc (cleaned up)
+Last-Update: 2025-02-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tool/rbinstall.rb
++++ b/tool/rbinstall.rb
+@@ -366,9 +366,7 @@
+ goruby_install_name = "go" + ruby_install_name
+ 
+ bindir = CONFIG["bindir", true]
+-if CONFIG["libdirname"] == "archlibdir"
+-  archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"}
+-end
++archbindir = nil
+ libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
+ rubyhdrdir = CONFIG["rubyhdrdir", true]
+ archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
+@@ -898,11 +896,6 @@
+   if pc and File.file?(pc) and File.size?(pc)
+     prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
+     install pc, pkgconfigdir, :mode => $data_mode
+-    if (pkgconfig_base = CONFIG["libdir", true]) != libdir
+-      prepare "pkgconfig data link", File.join(pkgconfig_base, "pkgconfig")
+-      ln_sf(File.join("..", Path.relative(pkgconfigdir, pkgconfig_base), pc),
+-            File.join(pkgconfig_base, "pkgconfig", pc))
+-    end
+   end
+ end
+ 

debian/patches/series

@@ -7,3 +7,4 @@
 0007-Port-to-kfreebsd-amd64.patch
 0009-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
 0011-don-t-try-to-download-stuff-in-configure.patch
+0012-use-debian-standard-multiarch.patch

debian/rules

@@ -136,13 +136,6 @@ endif
 override_dh_auto_install-arch:
 	$(MAKE) install-nodoc V=1 DESTDIR=$(CURDIR)/debian/tmp
 	find $(CURDIR)/debian/tmp -ls
-	# restore previous behaviour from ruby 3.3
-	# replace the symlink with the actual file - /usr/x86_64-pc-linux-gnu/bin
-	if [ -L $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION) ]; then \
-		TARGET=$$(readlink -f $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION)); \
-		rm -f $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION); \
-		cp $$TARGET $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION); \
-	fi
 	# handle embedded copy of jquery
 	$(RM) $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBY_API_VERSION)/rdoc/generator/template/darkfish/js/jquery.js
 	dh_link -plibruby$(RUBY_VERSION) /usr/share/javascript/jquery/jquery.min.js /usr/lib/ruby/$(RUBY_API_VERSION)/rdoc/generator/template/darkfish/js/jquery.js

debian/sanity_check

@@ -9,12 +9,7 @@ archlibdir=usr/lib/${arch}
 
 # files that should NOT exist
 test '!' -f  debian/tmp/${libdir}/libruby-${RUBY_VERSION}.so.${RUBY_VERSION}
-
-# only run if this is not a symbolic link
-# https://github.com/ruby/ruby/commit/120c291fafd438e2bc58f098023c669dadc64b08
-if [ ! -L "debian/tmp/${libdir}/pkgconfig/ruby-${RUBY_VERSION}.pc" ]; then
-  test '!' -f "debian/tmp/${libdir}/pkgconfig/ruby-${RUBY_VERSION}.pc"
-fi
+test '!' -f "debian/tmp/${libdir}/pkgconfig/ruby-${RUBY_VERSION}.pc"
 
 # files that should exist
 ls -1 debian/tmp/${archlibdir}/libruby-${RUBY_VERSION}.so.${RUBY_VERSION}