diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-03-30 23:45:57 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-03-30 23:45:57 +0000 |
| commit | 8da0459bafc1f9337ccab0b456b0a00578f6203e (patch) | |
| tree | 06f4b51ad098831831db3b2fd253fb0bdb682520 | |
| parent | 13f2e6e807373eb86feadb0567d64eeee629fb01 (diff) | |
| download | pkgsrc-8da0459bafc1f9337ccab0b456b0a00578f6203e.tar.gz | |
Make this find all shlibs on Linux by passing the necessary -Wl,-rpath
flags.
| -rw-r--r-- | lang/ruby-base/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby-base/patches/patch-ab | 18 |
3 files changed, 18 insertions, 7 deletions
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile index 9cbe0f1ff37..e58d36eb96e 100644 --- a/lang/ruby-base/Makefile +++ b/lang/ruby-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:31 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2003/03/30 23:45:57 jschauma Exp $ # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp DISTNAME= ${RUBY_DISTNAME} @@ -21,6 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1 TEST_TARGET= test +CONFIGURE_ENV+= PREFIX="${PREFIX}" DOCS= ChangeLog README README.EXT README.EXT.ja README.ja ToDo \ doc/NEWS doc/forwardable.rd doc/forwardable.rd.ja \ diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo index 1e9cb64fe9b..757770922c1 100644 --- a/lang/ruby-base/distinfo +++ b/lang/ruby-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2003/03/24 14:49:37 taca Exp $ +$NetBSD: distinfo,v 1.9 2003/03/30 23:45:57 jschauma Exp $ SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes SHA1 (patch-aa) = 654efb008caadf7973c78cabc70f76c8eab09266 -SHA1 (patch-ab) = 909ab681b64bfcc49e5592c38b34049f67211993 +SHA1 (patch-ab) = e5760150aaa1f186bcc9a47fea3c12c8702ac6c3 SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884 SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab index 41f4e66798d..ffe3282f703 100644 --- a/lang/ruby-base/patches/patch-ab +++ b/lang/ruby-base/patches/patch-ab @@ -1,8 +1,18 @@ -$NetBSD: patch-ab,v 1.5 2003/03/24 14:49:38 taca Exp $ +$NetBSD: patch-ab,v 1.6 2003/03/30 23:45:58 jschauma Exp $ ---- configure.orig 2002-11-19 20:49:26.000000000 +0900 -+++ configure -@@ -5516,6 +5516,7 @@ s%@EXTSTATIC@%$EXTSTATIC%g +--- configure.orig Tue Nov 19 06:49:26 2002 ++++ configure Sun Mar 30 18:31:40 2003 +@@ -4550,6 +4550,9 @@ + osf*) LDSHARED="$CC -shared" + rb_cv_dlopen=yes ;; + linux*) LDSHARED="$CC -shared" ++ if test "$rb_cv_binary_elf" = yes; then ++ LDFLAGS="-Wl,-rpath,${PREFIX}/lib" ++ fi + rb_cv_dlopen=yes ;; + freebsd*) LDSHARED="$CC -shared" + if test "$rb_cv_binary_elf" = yes; then +@@ -5516,6 +5519,7 @@ s%@setup@%$setup%g s%@MINIRUBY@%$MINIRUBY%g s%@PREP@%$PREP%g |