Package: ruby1.8
Version: 1.8.6.111-2
Severity: normal
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch



In Ubuntu, we've applied the attached patch to achieve the following:

    - add -g when building with noopt
    - add --with-extra-site-search-path when DEB_BUILD_GNU_CPU is
      i586 or i686 (just like its done with i486)

We thought you might be interested in doing the same. 

Cheers,
 Michael

-- System Information:
Debian Release: lenny/sid
  APT prefers gutsy-updates
  APT policy: (500, 'gutsy-updates'), (500, 'gutsy'), (500, 'feisty')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
diff -u ruby1.8-1.8.6.111/debian/rules ruby1.8-1.8.6.111/debian/rules
--- ruby1.8-1.8.6.111/debian/rules
+++ ruby1.8-1.8.6.111/debian/rules
@@ -29,15 +29,15 @@
 CFLAGS := -fno-strict-aliasing -g
 CXXFLAGS := -fno-strict-aliasing -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	CFLAGS += -g -O0
 else
-	CFLAGS += -O2
+	CFLAGS += -g -O2
 endif
 
 ifeq ($(DEB_BUILD_GNU_CPU),i386)
 	DEB_CONFIGURE_USER_FLAGS += --enable-frame-address
 endif
-ifeq ($(DEB_BUILD_GNU_CPU),i486)
+ifneq (,$(filter $(DEB_BUILD_GNU_CPU),i486 i586 i686))
 	DEB_CONFIGURE_USER_FLAGS += --enable-frame-address
 	DEB_CONFIGURE_USER_FLAGS += --with-extra-site-search-path='/usr/local/lib/site_ruby/$(ruby_ver)/i386-linux'
 	DEB_CONFIGURE_USER_FLAGS += --with-extra-search-path='/usr/lib/ruby/$(ruby_ver)/i386-linux'

Reply via email to