notmuch: clean up ruby cross

Author: rookiejet

srcpkgs/notmuch/patches/0008-fix-cross-for-ruby-bindings.patch

@@ -26,11 +26,11 @@ index d914537c..aae1d2fd 100644
 +# Fix makefile definitions for cross compile
 +if ENV['_TARGET_PLATFORM']
 +  system("sed -i 's|^V =.*|V = 1|' Makefile")
-+  system("sed -i 's|^CFLAGS.*|CFLAGS = \$(CCDLFLAGS) $(VOID_TARGET_CFLAGS) \$(ARCH_FLAG)|' Makefile")
-+  system("sed -i 's|^topdir.*|topdir = $(XBPS_CROSS_BASE)/usr/include/ruby-\$(ruby_version)|' Makefile")
-+  system("sed -i 's|^hdrdir.*|hdrdir = $(XBPS_CROSS_BASE)/usr/include/ruby-\$(ruby_version)|' Makefile")
-+  system("sed -i 's|^arch_hdrdir.*|arch_hdrdir = $(XBPS_CROSS_BASE)/usr/include/ruby-\$(ruby_version)/\$(arch)|' Makefile")
-+  system("sed -i 's|^arch =.*|arch = $(_TARGET_PLATFORM)|' Makefile")
++  system("sed -i 's|^CFLAGS.*|CFLAGS = \$(CCDLFLAGS) #{ENV['VOID_TARGET_CFLAGS']} \$(ARCH_FLAG)|' Makefile")
++  system("sed -i 's|^topdir.*|topdir = #{ENV['XBPS_CROSS_BASE']}/usr/include/ruby-\$(ruby_version)|' Makefile")
++  system("sed -i 's|^hdrdir.*|hdrdir = #{ENV['XBPS_CROSS_BASE']}/usr/include/ruby-\$(ruby_version)|' Makefile")
++  system("sed -i 's|^arch_hdrdir.*|arch_hdrdir = #{ENV['XBPS_CROSS_BASE']}/usr/include/ruby-\$(ruby_version)/\$(arch)|' Makefile")
++  system("sed -i 's|^arch =.*|arch = #{ENV['_TARGET_PLATFORM']}|' Makefile")
 +  system("sed -i 's|^dldflags =.*|dldflags = $(LDFLAGS)|' Makefile")
-+  system("sed -i 's|^libdir =.*|libdir = $(exec_prefix)/lib$(XBPS_TARGET_WORDSIZE)|' Makefile")
++  system("sed -i 's|^libdir =.*|libdir = $(exec_prefix)/lib#{ENV['XBPS_TARGET_WORDSIZE']}|' Makefile")
 +end

srcpkgs/notmuch/template

@@ -123,14 +123,6 @@ python3-notmuch2_package() {
 notmuch-ruby_package() {
 	short_desc+=" - Ruby bindings"
 	pkg_install() {
-		if [ "$CROSS_BUILD" ]; then
-			_TARGET_PLATFORM="$(ruby -r \
-				$(find ${XBPS_CROSS_BASE}/usr/lib/ruby -iname rbconfig.rb) \
-				-e 'puts RbConfig::CONFIG["arch"]' 2>/dev/null)"
-			VOID_TARGET_CFLAGS="$CFLAGS"
-			export _TARGET_PLATFORM XBPS_CROSS_BASE VOID_TARGET_CFLAGS \
-			       XBPS_TARGET_WORDSIZE
-		fi
 		make DESTDIR=${PKGDESTDIR} -C bindings/ruby install
 	}
 }