Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24801
Modified Files:
ruby18.info ruby18.patch
Added Files:
ruby18-10.5.info
Log Message:
latest version to stable, at maintainer's request
--- NEW FILE: ruby18-10.5.info ---
Package: ruby18
Version: 1.8.6-p287
Revision: 101
Description: Interpreted, object-oriented language (binaries)
License: GPL
Homepage: http://www.ruby-lang.org/
Maintainer: Michal Suchanek <[email protected]>
Distribution: 10.5
# Dependencies.
Depends: %N-shlibs (= %v-%r), gdbm3-shlibs, libiconv, libncurses5-shlibs (>=
5.4-20041023-1006), readline5-shlibs (>= 5.0-1004)
BuildDepends: autoconf, bison, fink (>= 0.24.12), gdbm3, libncurses5 (>=
5.4-20041023-1006), libiconv-dev, readline5 (>= 5.0-1004), system-openssl-dev,
texinfo (>= 4.1-3)
Conflicts: %N-ssl (<< 1.8.3-4)
Replaces: %N-ssl (<< 1.8.3-4)
# Unpack Phase.
Source: ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-%v.tar.bz2
Source-MD5: 80b5f3db12531d36e6c81fac6d05dda9
Source2: http://rubyidentity.org/ruby-logo-kit.zip
Source2-MD5: c80f11569f8a841d4bb2ff5fd8a8ff95
SourceDirectory: ruby-%v
# Patch Phase.
PatchFile: %n.patch
PatchFile-MD5: 28ba660a0ed8f8ba97eb8d468f41462a
PatchScript: <<
#!/bin/sh -ex
sed 's|@PREFIX@|%p|g' < %{PatchFile} > ruby18.patch
patch -p0 < ruby18.patch
rm -r ruby18.patch ext/tk
#mv ext/etc ext/0etc
<<
# Compile Phase.
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetCFLAGS: -g -Os -fno-schedule-insns2
SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: --program-suffix=1.8 --mandir='${prefix}/share/man'
--enable-shared --with-default-kcode=none --with-dbm-type=gdbm_compat
--with-bundled-md5 --with-bundled-rmd160 --with-bundled-sha1
CompileScript: <<
#!/bin/sh -ex
autoconf
./configure %c
make
make test
<<
# Install Phase.
InstallScript: <<
make -j1 install DESTDIR=%d #MINIRUBY="DYLD_LIBRARY_PATH=. ./ruby1.8 -I."
make -j1 install-doc DESTDIR=%d #MINIRUBY="DYLD_LIBRARY_PATH=. ./ruby1.8 -I."
ln -s erb1.8 %i/bin/erb
ln -s irb1.8 %i/bin/irb
ln -s libruby-static.a %i/lib/libruby.a
ln -s rdoc1.8 %i/bin/rdoc
ln -s ri1.8 %i/bin/ri
ln -s ruby1.8 %i/bin/ruby
ln -s ruby1.8.1 %i/share/man/man1/ruby.1
ln -s testrb1.8 %i/bin/testrb
cp %i/bin/ruby1.8 %i/bin/ruby-aqua1.8
ln -s ruby-aqua1.8 %i/bin/rubyw1.8
ln -s ruby-aqua1.8 %i/bin/ruby-aqua
ln -s rubyw1.8 %i/bin/rubyw
mkdir -p %i/share/doc/%n
cp -r sample %i/share/doc/%n/sample
mkdir %i/share/doc/%n/logo
cp ../ruby-kit/ruby.png ../ruby-kit/LICENSE %i/share/doc/%n/logo
<<
PostInstScript: <<
/Developer/Tools/Rez -t APPL Carbon.r -o %p/bin/ruby-aqua1.8 || true
sips -i %p/share/doc/%n/logo/ruby.png || true
mv %p/bin/ruby-aqua1.8 %p/bin/ruby-aqua1.8_exe
/bin/cp %p/share/doc/%n/logo/ruby.png %p/bin/ruby-aqua1.8
/bin/cp -X %p/bin/ruby-aqua1.8_exe %p/bin/ruby-aqua1.8 || true
rm %p/bin/ruby-aqua1.8_exe
<<
DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
SplitOff: <<
Package: ruby
Depends: ri18 (= %v-%r), %N (= %v-%r)
Conflicts: ri
Replaces: ri
Provides: ri
Description: Interpreted, object-oriented language (symlinks)
DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
Files: <<
bin/erb
bin/irb
bin/rdoc
bin/ruby
bin/rubyw
bin/ruby-aqua
bin/testrb
bin/ri
share/man/man1/ruby.1
<<
<<
SplitOff2: <<
Package: %N-dev
Description: Interpreted, object-oriented language (mkmf.rb, *.h and *.dylib)
BuildDependsOnly: True
Depends: %N (= %v-%r)
Replaces: ruby16-dev
Conflicts: ruby16-dev, ruby (<= 1.6.6-1), ruby-dev (<< 1.8.0-1)
Files: <<
lib/libruby.dylib
lib/libruby-static.a
lib/libruby.a
lib/ruby/1.8/mkmf.rb
(%m = i386) lib/ruby/1.8/i686-darwin/*.h
(%m = powerpc) lib/ruby/1.8/powerpc-darwin/*.h
<<
DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
<<
SplitOff3: <<
Package: ri18
Description: Interpreted, object-oriented language (documentation)
Depends: %N (= %v-%r)
Conflicts: %N (<< 1.8.3-3)
Files: <<
bin/ri1.8
share/ri/1.8
<<
DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
<<
SplitOff4: <<
Package: %N-shlibs
Shlibs: %p/lib/libruby.1.8.dylib 1.8.0 %n (>= 1.8.0-1)
Description: Interpreted, object-oriented language (shared libraries)
Files: lib/libruby.*.dylib
DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
<<
DescDetail: <<
- It has many features to process text files and to do system
management tasks (as in Perl).
- It is simple, straight-forward, extensible, and portable, and free.
- It has simple syntax, partially inspired by Eiffel and Ada.
- All data in Ruby is an object, not in the sense of Python or Perl,
but in the sense of Smalltalk: no exceptions.
<<
DescPackaging: <<
The top level configure complains about extra parameters but it should pass them
to extensions anyway.
The Ruby tcltk extension is packaged separately and links against Fink's X11
version of tcltk. It could be replaced with a version linked against an Aqua
tcltk if someone packaged it.
The package now contains ruby-aqua which is able to run scripts that use the
aqua interface.
Packages should depend on ruby18 to run scripts. The shared library
does not provide many of the stdlib features, they are implemented in
the bundled extensions.
The extensions would link and probably run with Apple's libraries but
since Fink has its own version of ncurses, readline, etc. it should
always link with Fink's to get consistent results.
Move mkmf script into -dev to make extension configuration error out
instead of failing all tests.
To properly configure a ruby extension the interpreter of the right
version has to be executable as ruby, and the corresponding library
available as libruby (at least this is the easiest way). It is
possible to execute the extconf.rb script with an interpreter of
choice (i.e. ruby1.8) but extensions that use more complex
configuration scripts (i.e. autoconf) will usually try to execute just
ruby.
The config.guess script is modified so that extensions are installed
in %p/lib/ruby/r_maj.r_min/cpu-darwin (in contrast to
%p/lib/ruby/r_maj.r_min/cpu-darwin_os_maj.os_min which makes binary
extension packages useless when the interpreter package is recompiled
after a system upgrade).
With gcc 4.0.0 build 5026 from XCode 2.1 Ruby will randomly core dump
and with gcc 4.0.1 from XCode 2.2.1, Ruby will randomly have internal
errors. This appears to be ppc specific. --enable-pthread reportedly
fixes the problem.
The Debian ruby1.8_1.8.4-1 package was used as a source for this
package. Many of the same configure command line options and some
patches are used.
<<
Index: ruby18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/ruby18.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ruby18.info 29 Mar 2009 06:20:47 -0000 1.4
+++ ruby18.info 3 Apr 2009 14:08:10 -0000 1.5
@@ -1,81 +1,190 @@
Package: ruby18
-Version: 1.8.1
-Revision: 2
-BuildDepends: tcltk-dev, gdbm, readline (>= 4.3-5), texinfo (>= 4.1-3), fink
(>= 0.24.12)
-Depends: gdbm-shlibs, tcltk-shlibs, readline-shlibs, %N-shlibs (= %v-%r)
+Version: 1.8.6-p287
+Revision: 1
+Description: Interpreted, object-oriented language (binaries)
+License: GPL
+Homepage: http://www.ruby-lang.org/
+Maintainer: Michal Suchanek <[email protected]>
+
+Distribution: 10.4
+
+# Dependencies.
+Depends: %N-shlibs (= %v-%r), gdbm3-shlibs, libiconv, libncurses5-shlibs (>=
5.4-20041023-1006), readline5-shlibs (>= 5.0-1004)
+BuildDepends: autoconf, bison, fink (>= 0.24.12), gdbm3, libncurses5 (>=
5.4-20041023-1006), libiconv-dev, readline5 (>= 5.0-1004), system-openssl-dev,
texinfo (>= 4.1-3)
+Conflicts: %N-ssl (<< 1.8.3-4)
+Replaces: %N-ssl (<< 1.8.3-4)
+
+# Unpack Phase.
+Source: ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-%v.tar.bz2
+Source-MD5: 80b5f3db12531d36e6c81fac6d05dda9
+Source2: http://rubyidentity.org/ruby-logo-kit.zip
+Source2-MD5: c80f11569f8a841d4bb2ff5fd8a8ff95
+SourceDirectory: ruby-%v
+
+# Patch Phase.
PatchFile: %n.patch
-PatchFile-MD5: 1456a62178631f4f33371f41c0e4ff05
+PatchFile-MD5: 28ba660a0ed8f8ba97eb8d468f41462a
+PatchScript: <<
+ #!/bin/sh -ex
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} > ruby18.patch
+ patch -p0 < ruby18.patch
+ rm -r ruby18.patch ext/tk
+ #mv ext/etc ext/0etc
+<<
-Source: ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-%v.tar.gz
-Source-MD5: 5d52c7d0e6a6eb6e3bc68d77e794898e
-ConfigureParams: --enable-shared --mandir='${prefix}/share/man'
--program-suffix=1.8 --with-dbm-type=gdbm
-SetCFLAGS: -O2
+# Compile Phase.
+SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetCFLAGS: -g -Os -fno-schedule-insns2
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+ConfigureParams: --program-suffix=1.8 --mandir='${prefix}/share/man'
--enable-shared --with-default-kcode=none --with-dbm-type=gdbm_compat
--with-bundled-md5 --with-bundled-rmd160 --with-bundled-sha1
+CompileScript: <<
+ #!/bin/sh -ex
+ autoconf
+ ./configure %c
+ make
+ make test
+<<
+
+# Install Phase.
InstallScript: <<
- make -j1 install DESTDIR=%d
- ln -s ruby1.8 %i/bin/ruby
- ln -s irb1.8 %i/bin/irb
+ make -j1 install DESTDIR=%d #MINIRUBY="DYLD_LIBRARY_PATH=. ./ruby1.8 -I."
+ make -j1 install-doc DESTDIR=%d #MINIRUBY="DYLD_LIBRARY_PATH=. ./ruby1.8 -I."
ln -s erb1.8 %i/bin/erb
- ln -s ruby1.8.1 %i/share/man/man1/ruby.1
- rm -rf %i/share/man/man8
+ ln -s irb1.8 %i/bin/irb
ln -s libruby-static.a %i/lib/libruby.a
+ ln -s rdoc1.8 %i/bin/rdoc
+ ln -s ri1.8 %i/bin/ri
+ ln -s ruby1.8 %i/bin/ruby
+ ln -s ruby1.8.1 %i/share/man/man1/ruby.1
+ ln -s testrb1.8 %i/bin/testrb
+ cp %i/bin/ruby1.8 %i/bin/ruby-aqua1.8
+ ln -s ruby-aqua1.8 %i/bin/rubyw1.8
+ ln -s ruby-aqua1.8 %i/bin/ruby-aqua
+ ln -s rubyw1.8 %i/bin/rubyw
+ mkdir -p %i/share/doc/%n
+ cp -r sample %i/share/doc/%n/sample
+ mkdir %i/share/doc/%n/logo
+ cp ../ruby-kit/ruby.png ../ruby-kit/LICENSE %i/share/doc/%n/logo
<<
-# (cd %i/lib; /bin/rm -f libruby.1.6.dylib; /bin/rm -f libruby.dylib; ln -s
%p/lib/libruby.%v.dylib libruby.1.dylib; ln -s %p/lib/libruby.1.dylib
libruby.dylib; ln -s %p/lib/libruby.1.dylib libruby.1.6.dylib)
-#<<
+PostInstScript: <<
+# this sets the icon
+sips -i %p/share/doc/%n/logo/ruby.png || true
+cp %p/share/doc/%n/logo/ruby.png/rsrc %p/bin/ruby-aqua1.8/rsrc || true
+# this allows running Aqua applications with ruby
+/Developer/Tools/SetFile -a C -t APPL %p/bin/ruby-aqua1.8 || true
+<<
+DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
+
SplitOff: <<
Package: ruby
- Depends: %N (= %v-%r)
- Description: Symlinks to ruby1.8
- DocFiles: README README.EXT ChangeLog LEGAL COPYING
+ Depends: ri18 (= %v-%r), %N (= %v-%r)
+ Conflicts: ri
+ Replaces: ri
+ Provides: ri
+ Description: Interpreted, object-oriented language (symlinks)
+ DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
Files: <<
- bin/ruby
- bin/irb
- bin/erb
- share/man/man1/ruby.1
+ bin/erb
+ bin/irb
+ bin/rdoc
+ bin/ruby
+ bin/rubyw
+ bin/ruby-aqua
+ bin/testrb
+ bin/ri
+ share/man/man1/ruby.1
<<
<<
+
SplitOff2: <<
- Package: %N-shlibs
- Shlibs: %p/lib/libruby.1.8.dylib 1.8.0 %n (>= 1.8.0-0)
- Description: ruby shared libraries
- Files: lib/libruby.*.dylib
- DocFiles: README README.EXT ChangeLog LEGAL COPYING
-<<
-SplitOff3: <<
Package: %N-dev
- Description: ruby static library
+ Description: Interpreted, object-oriented language (mkmf.rb, *.h and *.dylib)
BuildDependsOnly: True
- Depends: ruby (= %v-%r)
- Replaces: ruby-dev (<< 1.8.0-0), ruby16-dev
- Conflicts: ruby (<= 1.6.6-1), ruby-dev (<< 1.8.0-0), ruby16-dev
+ Depends: %N (= %v-%r)
+ Replaces: ruby16-dev
+ Conflicts: ruby16-dev, ruby (<= 1.6.6-1), ruby-dev (<< 1.8.0-1)
Files: <<
lib/libruby.dylib
lib/libruby-static.a
lib/libruby.a
+ lib/ruby/1.8/mkmf.rb
+ (%m = i386) lib/ruby/1.8/i686-darwin/*.h
+ (%m = powerpc) lib/ruby/1.8/powerpc-darwin/*.h
<<
- DocFiles: README README.EXT ChangeLog LEGAL COPYING
+ DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
<<
-Maintainer: Michal Suchanek <[email protected]>
-Description: Interpreted, object-oriented script language
-License: GPL
-DocFiles: README README.EXT ChangeLog LEGAL COPYING
+
+SplitOff3: <<
+ Package: ri18
+ Description: Interpreted, object-oriented language (documentation)
+ Depends: %N (= %v-%r)
+ Conflicts: %N (<< 1.8.3-3)
+ Files: <<
+ bin/ri1.8
+ share/ri/1.8
+ <<
+ DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
+<<
+
+SplitOff4: <<
+ Package: %N-shlibs
+ Shlibs: %p/lib/libruby.1.8.dylib 1.8.0 %n (>= 1.8.0-1)
+ Description: Interpreted, object-oriented language (shared libraries)
+ Files: lib/libruby.*.dylib
+ DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT
README.EXT.ja README.ja ToDo
+<<
+
DescDetail: <<
-It has many features to process text files and
-to do system management tasks (as in Perl).
-It is simple, straight-forward, extensible, and portable, and free.
-It has simple syntax, partially inspired by Eiffel and Ada.
-All data in Ruby is an object, not in the sense of Python or Perl,
-but in the sense of Smalltalk: no exceptions.
+- It has many features to process text files and to do system
+ management tasks (as in Perl).
+- It is simple, straight-forward, extensible, and portable, and free.
+- It has simple syntax, partially inspired by Eiffel and Ada.
+- All data in Ruby is an object, not in the sense of Python or Perl,
+ but in the sense of Smalltalk: no exceptions.
<<
DescPackaging: <<
-installs binary into man8 :D
+
+The top level configure complains about extra parameters but it should pass
them
+to extensions anyway.
+
+The Ruby tcltk extension is packaged separately and links against Fink's X11
+version of tcltk. It could be replaced with a version linked against an Aqua
+tcltk if someone packaged it.
+
+The package now contains ruby-aqua which is able to run scripts that use the
+aqua interface.
+
+Packages should depend on ruby18 to run scripts. The shared library
+does not provide many of the stdlib features, they are implemented in
+the bundled extensions.
+
+The extensions would link and probably run with Apple's libraries but
+since Fink has its own version of ncurses, readline, etc. it should
+always link with Fink's to get consistent results.
+
+Move mkmf script into -dev to make extension configuration error out
+instead of failing all tests.
To properly configure a ruby extension the interpreter of the right
version has to be executable as ruby, and the corresponding library
-available as libruby (at least this is the easiest way).
+available as libruby (at least this is the easiest way). It is
+possible to execute the extconf.rb script with an interpreter of
+choice (i.e. ruby1.8) but extensions that use more complex
+configuration scripts (i.e. autoconf) will usually try to execute just
+ruby.
-The config guess is updated so that extensions are installed in
-%p/lib/ruby/r_maj.r_min/cpu-darwin (in contrast to .../cpu-darwin_maj.d_min
-which makes binary extension packages useless when the interpreter package
-is recompiled after a system upgrade).
+The config.guess script is modified so that extensions are installed
+in %p/lib/ruby/r_maj.r_min/cpu-darwin (in contrast to
+%p/lib/ruby/r_maj.r_min/cpu-darwin_os_maj.os_min which makes binary
+extension packages useless when the interpreter package is recompiled
+after a system upgrade).
+
+With gcc 4.0.0 build 5026 from XCode 2.1 Ruby will randomly core dump
+and with gcc 4.0.1 from XCode 2.2.1, Ruby will randomly have internal
+errors. This appears to be ppc specific. --enable-pthread reportedly
+fixes the problem.
+
+The Debian ruby1.8_1.8.4-1 package was used as a source for this
+package. Many of the same configure command line options and some
+patches are used.
<<
-Homepage: http://www.ruby-lang.org/
Index: ruby18.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/ruby18.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ruby18.patch 20 Jan 2006 20:12:54 -0000 1.1
+++ ruby18.patch 3 Apr 2009 14:08:10 -0000 1.2
@@ -1,28 +1,52 @@
-diff -ru ruby-1.8.1/Makefile.in ruby-1.8.1-patched/Makefile.in
---- ruby-1.8.1/Makefile.in Mon Dec 15 07:57:10 2003
-+++ ruby-1.8.1-patched/Makefile.in Tue May 4 01:00:37 2004
-@@ -119,7 +119,7 @@
-
- $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) miniruby$(EXEEXT)
- @rm -f $@
-- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ)
$(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-+ $(PURIFY) $(CC) $(XLDFLAGS) $(LDFLAGS) $(MAINLIBS) $(MAINOBJ)
$(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-
- # We must `rm' the library each time this rule is invoked because "updating" a
- # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
-diff -ru ruby-1.8.1/configure ruby-1.8.1-patched/configure
---- ruby-1.8.1/configure Wed Dec 24 20:21:24 2003
-+++ ruby-1.8.1-patched/configure Tue May 4 00:54:36 2004
-@@ -13769,7 +13769,7 @@
+## Basic build system fixes
+--- configure.in~ 2007-09-07 09:38:51.000000000 +0200
++++ configure.in 2007-11-08 13:36:39.000000000 +0100
+@@ -515,12 +515,12 @@
+ AC_TYPE_GETGROUPS
+ AC_TYPE_SIGNAL
+ case "${target_cpu}-${target_os}" in
+-powerpc-darwin*)
+- AC_LIBSOURCES(alloca.c)
+- AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+- AC_DEFINE(C_ALLOCA)
+- AC_DEFINE_UNQUOTED(alloca, alloca)
+- ;;
++dnl powerpc-darwin*)
++dnl AC_LIBSOURCES(alloca.c)
++dnl AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
++dnl AC_DEFINE(C_ALLOCA)
++dnl AC_DEFINE_UNQUOTED(alloca, alloca)
++dnl ;;
+ *)
+ AC_FUNC_ALLOCA
+ ;;
+
+##--- configure.in~ 2007-04-25 15:31:14.000000000 +0200
+##+++ configure.in 2007-04-25 15:58:49.000000000 +0200
+##@@ -1277,7 +1277,7 @@
+ PREP=fake.rb
+ RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+ else
+- MINIRUBY='./miniruby$(EXEEXT)'
++ MINIRUBY='./miniruby$(EXEEXT) -I.'
+ PREP='miniruby$(EXEEXT)'
+ RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+ fi
+
+
+## tune module and libruby link options
+--- configure.in 2007-04-18 12:49:43.000000000 +0200
++++ configure.in 2007-04-19 14:23:04.000000000 +0200
+@@ -1052,7 +1052,7 @@
rhapsody*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""}
rb_cv_dlopen=yes ;;
- darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress
-flat_namespace'}
-+ darwin*) : ${LDSHARED='cc -dynamic -bundle'}
++ darwin*) : ${LDSHARED='cc -dynamic -bundle
-Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress'}
: ${LDFLAGS=""}
+ : ${LIBPATHENV=DYLD_LIBRARY_PATH}
rb_cv_dlopen=yes ;;
- aix*) : ${LDSHARED='/usr/ccs/bin/ld'}
-@@ -14411,7 +14411,7 @@
+@@ -1302,7 +1302,7 @@
;;
esac
@@ -31,7 +55,7 @@
LIBRUBY_LDSHARED=$LDSHARED
LIBRUBY_DLDFLAGS=$DLDFLAGS
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
-@@ -14495,9 +14495,9 @@
+@@ -1384,9 +1384,9 @@
;;
darwin*)
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
@@ -42,46 +66,111 @@
+ LIBRUBY_DLDFLAGS='-install_name
$(libdir)/lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib -current_version
$(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib
lib$(RUBY_SO_NAME).dylib libruby.2.dylib'
;;
- atheos*)
- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-diff -ru ruby-1.8.1/ext/tcltklib/extconf.rb
ruby-1.8.1-patched/ext/tcltklib/extconf.rb
---- ruby-1.8.1/ext/tcltklib/extconf.rb Fri Jul 25 18:05:25 2003
-+++ ruby-1.8.1-patched/ext/tcltklib/extconf.rb Tue May 4 00:56:22 2004
-@@ -11,14 +11,14 @@
+ interix*)
+ LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
+## tune architecture (and binary extension directory name)
+--- config.guess 2007-04-19 14:41:42.000000000 +0200
++++ config.guess 2007-04-19 14:39:55.000000000 +0200
+@@ -1200,7 +1200,7 @@
+ *86) UNAME_PROCESSOR=i686 ;;
+ powerpc) UNAME_PROCESSOR=powerpc ;;
+ esac
+- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++ echo ${UNAME_PROCESSOR}-apple-darwin
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+
+## more miscellaneous tweaks
+diff -uNr ruby-1.8.4/lib/delegate.rb ruby-1.8.4-new/lib/delegate.rb
+--- lib/delegate.rb 2005-09-28 10:23:24.000000000 -0400
++++ lib/delegate.rb 2006-08-05 18:21:28.000000000 -0400
+@@ -290,7 +290,7 @@
+ }
+ for method in methods
+ begin
+- klass.module_eval <<-EOS
++ klass.module_eval <<-EOS, __FILE__, __LINE__+1
+ def #{method}(*args, &block)
+ begin
+ @_dc_obj.__send__(:#{method}, *args, &block)
+--- lib/rdoc/options.rb.orig 2007-10-23 17:36:41.000000000 +0200
++++ lib/rdoc/options.rb 2007-10-23 17:37:12.000000000 +0200
+@@ -544,7 +544,7 @@
+ # so we'll bypass the test under Windows
- dir_config("tk")
- dir_config("tcl")
--dir_config("X11")
-+dir_config("X11", "/usr/X11R6/include", "/usr/X11R6/lib")
+ def check_diagram
+- return if RUBY_PLATFORM =~ /win/
++ return if RUBY_PLATFORM =~ /mswin32|cygwin|mingw|bccwin/
- tklib = with_config("tklib")
- tcllib = with_config("tcllib")
- stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
+ ok = false
+ ver = nil
+--- dln.c.orig 2007-10-23 19:59:39.000000000 +0200
++++ dln.c 2007-10-23 20:06:45.000000000 +0200
+@@ -87,13 +87,21 @@
- def find_tcl(tcllib, stubs)
-- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-+ paths = ["@PREFIX@/lib", "/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
- func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable"
- if tcllib
- find_library(tcllib, func, *paths)
-@@ -33,7 +33,7 @@
- end
+ #ifndef NO_DLN_LOAD
+
+-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) &&
!defined(__APPLE__) && !defined(_UNICOSMP)
++#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) &&
!defined(_UNICOSMP)
+ /* dynamic load with dlopen() */
+ # define USE_DLN_DLOPEN
+ #endif
+
++#if defined(USE_DLN_DLOPEN) && defined(__APPLE__)
++/* Mac OS X system lesser than 10.4 should use the NSSymbol APIs instead of
dlopen/dlsym. */
++# include <AvailabilityMacros.h>
++# if MAC_OS_X_VERSION_MAX_ALLOWED < 1040
++# undef USE_DLN_DLOPEN
++# endif
++#endif
++
+ #ifndef FUNCNAME_PATTERN
+-# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) ||
defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) ||
(defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) ||
defined(__WATCOMC__) || defined(__APPLE__)
++# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) ||
defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) ||
(defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) ||
defined(__WATCOMC__) || (defined(__APPLE__) && !defined(USE_DLN_DLOPEN))
+ # define FUNCNAME_PATTERN "_Init_%s"
+ # else
+ # define FUNCNAME_PATTERN "Init_%s"
+@@ -1403,7 +1411,7 @@
+ }
+ #endif /* _AIX */
+
+-#if defined(NeXT) || defined(__APPLE__)
++#if defined(NeXT) || (defined(__APPLE__) && !defined(USE_DLN_DLOPEN))
+ #define DLN_DEFINED
+ /*----------------------------------------------------
+ By SHIROYAMA Takayuki [email protected]
+--- defines.h.orig 2007-10-23 19:48:41.000000000 +0200
++++ defines.h 2007-10-23 19:49:23.000000000 +0200
+@@ -102,6 +102,16 @@
+ #endif
+ #endif
+
++#if defined(__NeXT__) || defined(__APPLE__)
++/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
++ result in a different endian. Instead trust __BIG_ENDIAN__ and
++ __LITTLE_ENDIAN__ which are set correctly by -arch. */
++#undef WORDS_BIGENDIAN
++#ifdef __BIG_ENDIAN__
++#define WORDS_BIGENDIAN
++#endif
++#endif
++
+ #ifdef __NeXT__
+ /* NextStep, OpenStep, Rhapsody */
+ #ifndef S_IRUSR
+@@ -155,13 +165,6 @@
+ #ifndef S_ISREG
+ #define S_ISREG(mode) (((mode) & (0170000)) == (0100000))
+ #endif
+-/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
+- result in a different endian. Instead trust __BIG_ENDIAN__ and
+- __LITTLE_ENDIAN__ which are set correctly by -arch. */
+-#undef WORDS_BIGENDIAN
+-#ifdef __BIG_ENDIAN__
+-#define WORDS_BIGENDIAN
+-#endif
+ #ifndef __APPLE__
+ /* NextStep, OpenStep (but not Rhapsody) */
+ #ifndef GETPGRP_VOID
- def find_tk(tklib, stubs)
-- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-+ paths = ["@PREFIX@/lib", "/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
- func = stubs ? "Tk_InitStubs" : "Tk_Init"
- if tklib
- find_library(tklib, func, *paths)
-diff -ru ruby-1.8.1/lib/mkmf.rb ruby-1.8.1-patched/lib/mkmf.rb
---- ruby-1.8.1/lib/mkmf.rb Fri Dec 19 00:01:04 2003
-+++ ruby-1.8.1-patched/lib/mkmf.rb Tue May 4 00:58:54 2004
-@@ -1018,7 +1018,7 @@
- if CONFIG["DLEXT"] == $OBJEXT
- "ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)\n"
- else
-- "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB) " \
-+ "$(LDSHARED) $(LIBPATH) $(DLDFLAGS) #{OUTFLAG}$(DLLIB) " \
- "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
- end
- LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s'
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
