Package: ruby1.8 Version: 1.8.7.358-7 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu ubuntu-patch raring
Bugs #698674 and #703421 request converting Tcl/Tk to multiarch. Unfortunately this breaks the ruby1.8 build. Fortunately this is relatively easy to fix, and the fix can be applied in advance of any change to Tcl/Tk as future-proofing. * Handle multiarch Tcl/Tk. diff -Nru ruby1.8-1.8.7.358/debian/patches/series ruby1.8-1.8.7.358/debian/patches/series --- ruby1.8-1.8.7.358/debian/patches/series 2013-03-12 07:32:40.000000000 +0000 +++ ruby1.8-1.8.7.358/debian/patches/series 2013-03-19 13:38:45.000000000 +0000 @@ -15,3 +15,4 @@ use-ldflags.patch CVE-2012-4481.patch CVE-2013-1821.patch +tcltk-multiarch.patch diff -Nru ruby1.8-1.8.7.358/debian/patches/tcltk-multiarch.patch ruby1.8-1.8.7.358/debian/patches/tcltk-multiarch.patch --- ruby1.8-1.8.7.358/debian/patches/tcltk-multiarch.patch 1970-01-01 01:00:00.000000000 +0100 +++ ruby1.8-1.8.7.358/debian/patches/tcltk-multiarch.patch 2013-03-14 14:42:38.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Handle multiarch Tcl/Tk +Author: Colin Watson <[email protected]> +Forwarded: no +Last-Update: 2013-03-14 + +Index: b/ext/tk/extconf.rb +=================================================================== +--- a/ext/tk/extconf.rb ++++ b/ext/tk/extconf.rb +@@ -477,6 +477,10 @@ + ] + } + ++ if ENV.has_key?('DEB_HOST_MULTIARCH') ++ config_dir.map!{|dir| [File.join(dir, ENV['DEB_HOST_MULTIARCH']), dir]}.flatten! ++ end ++ + config_dir.concat [ + '/opt', '/pkg', '/share', + '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local', Thanks, -- Colin Watson [[email protected]] -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
