SF.net SVN: gar:[24236] csw/mgar/pkg/ruby21/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24236
          http://sourceforge.net/p/gar/code/24236
Author:   dmichelsen
Date:     2014-11-02 14:04:07 +0000 (Sun, 02 Nov 2014)
Log Message:
-----------
ruby21/trunk: Add workaround for objcopy issue

Modified Paths:
--------------
    csw/mgar/pkg/ruby21/trunk/Makefile
    csw/mgar/pkg/ruby21/trunk/checksums

Modified: csw/mgar/pkg/ruby21/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby21/trunk/Makefile	2014-11-01 16:09:09 UTC (rev 24235)
+++ csw/mgar/pkg/ruby21/trunk/Makefile	2014-11-02 14:04:07 UTC (rev 24236)
@@ -3,7 +3,7 @@
 #
 NAME = ruby
 SHORTVER = 2.1
-VERSION = $(SHORTVER).2
+VERSION = $(SHORTVER).3
 API_VERSION = $(VERSION)
 
 DESCRIPTION = An object-oriented language for quick and easy programming.
@@ -35,18 +35,32 @@
 RUNTIME_DEP_PKGS_CSWruby21 += CSWlibffi5
 RUNTIME_DEP_PKGS_CSWruby21 += CSWlibreadline5
 
-#GARCOMPILER = SOS12U2
-GARCOMPILER = GNU
+GARCOMPILER = SOS12U2
+#GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS)
+# Using binutils 2.24 objcopy leads to this funny corruption:
+#/home/dam/mgar/pkg/ruby21/trunk/work/solaris11-i386/build-isa-pentium_pro/ruby-2.1.3
+#unstable11x% /opt/solstudio12.2/bin/cc  -G -h libruby2.1.3.so.2 -R/opt/csw/lib  -m32 dln.o localeinit.o loadpath.o array.o bignum.o class.o compar.o complex.o dir.o dln_find.o encoding.o enum.o enumerator.o error.o eval.o load.o proc.o file.o gc.o hash.o inits.o io.o marshal.o math.o node.o numeric.o object.o pack.o parse.o process.o random.o range.o rational.o re.o regcomp.o regenc.o regerror.o regexec.o regparse.o regsyntax.o ruby.o safe.o signal.o sprintf.o st.o strftime.o string.o struct.o time.o transcode.o util.o variable.o version.o compile.o debug.o iseq.o vm.o vm_dump.o vm_backtrace.o vm_trace.o thread.o cont.o ascii.o us_ascii.o unicode.o utf_8.o newline.o flock.o isinf.o setproctitle.o  prelude.o dmyext.o  -lpthread -lgmp -lsocket -ldl -lcrypt -lm    -o libruby2.1.3.so.2
+#unstable11x% /usr/gnu/bin/objcopy libruby2.1.3.so.2
+#unstable11x% elfdump libruby2.1.3.so.2 >/dev/null
+#libruby2.1.3.so.2: .SUNW_ldynsym: invalid sh_link: 0
+#libruby2.1.3.so.2: .SUNW_dynsymsort: invalid sh_link: 0
+#libruby2.1.3.so.2: .SUNW_ldynsym: invalid sh_link: 0
+#libruby2.1.3.so.2: .SUNW_ldynsym: invalid sh_link: 0
 
+# There is no fix for objcopy available yet and both Oracle /usr/gnu/bin/objcopy and also our own
+# /opt/csw/gnu/objcopy is affected, so disable objcopy completely for now:
+EXTRA_CONFIGURE_ENV += OBJCOPY=/bin/true
+
+CONFIGURE_ARGS += $(DIRPATHS)
+
 # Enabled DTrace support has problems during linking
 CONFIGURE_ARGS += --disable-dtrace
 
 CONFIGURE_ARGS += --program-suffix=21
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --with-soname=ruby$(API_VERSION)
-CONFIGURE_ARGS += --with-out-ext=tk
+#CONFIGURE_ARGS += --with-out-ext=tk
 
 
 # There are tests failing

Modified: csw/mgar/pkg/ruby21/trunk/checksums
===================================================================
--- csw/mgar/pkg/ruby21/trunk/checksums	2014-11-01 16:09:09 UTC (rev 24235)
+++ csw/mgar/pkg/ruby21/trunk/checksums	2014-11-02 14:04:07 UTC (rev 24236)
@@ -1 +1 @@
-a5b5c83565f8bd954ee522bd287d2ca1  ruby-2.1.2.tar.gz
+74a37b9ad90e4ea63c0eed32b9d5b18f  ruby-2.1.3.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.