From 3fa3f9abb9a187a12089c2c5a650a62dbd82a3dd Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 16 May 2012 05:39:06 +0000 Subject: Supports static linking of extensions and encodings again. Fixes --with-static-linked-ext. Patch by Google Inc. [ruby-core:45073]. * Makefile.in (ENCOBJS, EXTOBJS): New variables to specify static linked libraries. Also reintroduces extinit.o, introduces encinit.o introduces encinit.o * common.mk: Builds static libraries rather than shared objects if specified. * configure.in (LD): new substitution. Avoids PIE if s * enc/depend: Supports static linked libraries (libencs, libenc, libtrans): New target. * enc/encinit.c.erb: new template to generate the initialization of statically linked encodings. * enc/make_encmake.rb (--module): new flag to specify whether static or dynamic. * transcode_data.h (TRANS_INIT): New macro to get rid of the name collision of encoding initializers and transcoder initializers. * ext/extmk.rb: Fixes the behavior on $extstatic is true. * lib/mkmf.rb (clean-static): new target to clean up static linked libraries. * ruby.c (process_options): New initializes statically linked encodings here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/trans/japanese_sjis.trans | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'enc/trans/japanese_sjis.trans') diff --git a/enc/trans/japanese_sjis.trans b/enc/trans/japanese_sjis.trans index 00eace27a3..8e1e13056d 100644 --- a/enc/trans/japanese_sjis.trans +++ b/enc/trans/japanese_sjis.trans @@ -27,8 +27,7 @@ <%= transcode_generated_code %> -void -Init_japanese_sjis(void) +TRANS_INIT(japanese_sjis) { <%= transcode_register_code %> } -- cgit v1.2.3