diff options
| author | taca <taca@pkgsrc.org> | 2004-11-29 08:20:05 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2004-11-29 08:20:05 +0000 |
| commit | b59325d8a5ad1158750408c71e802df8af2a4171 (patch) | |
| tree | 2d6d30b246aa80386ce8e1d055869f9171d1bb4d | |
| parent | 74aabfa151370b16d5eebb771ba3a6e220975c9a (diff) | |
| download | pkgsrc-b59325d8a5ad1158750408c71e802df8af2a4171.tar.gz | |
Make it works on Solaris. Not tested well.
- generate proper libruby shared library.
- make it sure link extention libraries with RPATH to libruby.so.
| -rw-r--r-- | lang/ruby18/distinfo | 6 | ||||
| -rw-r--r-- | lang/ruby18/patches/patch-aa | 16 | ||||
| -rw-r--r-- | lang/ruby18/patches/patch-ab | 16 |
3 files changed, 33 insertions, 5 deletions
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo index 8a0df2837b7..3f1a1c5f072 100644 --- a/lang/ruby18/distinfo +++ b/lang/ruby18/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $ +$NetBSD: distinfo,v 1.2 2004/11/29 08:20:05 taca Exp $ SHA1 (ruby/ruby-1.8.1.tar.gz) = 894cb1e7624b74e699d127344ce5600fc3a7d515 Size (ruby/ruby-1.8.1.tar.gz) = 2671875 bytes -SHA1 (patch-aa) = 07fca086d2eb3d520be8d969c064f0ff7ad8819a -SHA1 (patch-ab) = 2c7f81d0481b02af67815affcb9e274abcaa3fa2 +SHA1 (patch-aa) = a04ac9081daa0e98e95ff53be6d9a5b031e8f39d +SHA1 (patch-ab) = 81e2719822f5c9c3a2ace92d9315e6188ebe0396 SHA1 (patch-ac) = ad9da65c2b09f0ee4b368989cb7b03fe3217c077 SHA1 (patch-ad) = a9561d30dd9ba8506a2943d50e8e5abdfe359db2 SHA1 (patch-ae) = 09d5d24b6d8d56776b6dbefd98d5ac361d986516 diff --git a/lang/ruby18/patches/patch-aa b/lang/ruby18/patches/patch-aa index 755730854df..85cdf4f3c3f 100644 --- a/lang/ruby18/patches/patch-aa +++ b/lang/ruby18/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/29 08:20:06 taca Exp $ --- configure.in.orig 2003-12-25 04:19:12.000000000 +0900 +++ configure.in @@ -31,3 +31,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ;; gnu*) +@@ -1187,6 +1195,13 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` + ;; + solaris*) ++ SOLIBS='$(LIBS)' ++ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)' ++ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so' ++ if test "$GCC" = yes; then ++ LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET)' ++ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' ++ fi + XLDFLAGS="$XLDFLAGS "'-R${libdir}' + ;; + hpux*) diff --git a/lang/ruby18/patches/patch-ab b/lang/ruby18/patches/patch-ab index ab4c5d679b1..047bb619a2d 100644 --- a/lang/ruby18/patches/patch-ab +++ b/lang/ruby18/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $ +$NetBSD: patch-ab,v 1.2 2004/11/29 08:20:06 taca Exp $ --- configure.orig 2003-12-25 04:21:24.000000000 +0900 +++ configure @@ -31,3 +31,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ;; gnu*) +@@ -14468,6 +14476,13 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` + ;; + solaris*) ++ SOLIBS='$(LIBS)' ++ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)' ++ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so' ++ if test "$GCC" = yes; then ++ LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET)' ++ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' ++ fi + XLDFLAGS="$XLDFLAGS "'-R${libdir}' + ;; + hpux*) |