diff options
| author | taca <taca@pkgsrc.org> | 2006-03-22 23:05:39 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2006-03-22 23:05:39 +0000 |
| commit | 44e2139ad55a6d954845ff1c3eab3f33558de795 (patch) | |
| tree | 3b4956cf942f7456747dce6c5d764e737c3fccac /lang/ruby18-base/patches | |
| parent | ffdd8527822b1ab0190178a08fca124c0169f05c (diff) | |
| download | pkgsrc-44e2139ad55a6d954845ff1c3eab3f33558de795.tar.gz | |
- Fix rpath problem with SunPro Compiler on Solaris. No other platform
should not be affected by this change.
- Some white space clean up.
Bump PKGREVISION.
Diffstat (limited to 'lang/ruby18-base/patches')
| -rw-r--r-- | lang/ruby18-base/patches/patch-aa | 26 | ||||
| -rw-r--r-- | lang/ruby18-base/patches/patch-ab | 26 |
2 files changed, 48 insertions, 4 deletions
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa index 47d4fafeeb0..facf5cfa465 100644 --- a/lang/ruby18-base/patches/patch-aa +++ b/lang/ruby18-base/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $ +$NetBSD: patch-aa,v 1.5 2006/03/22 23:05:39 taca Exp $ --- configure.in.orig 2005-11-24 21:07:18.000000000 +0900 +++ configure.in @@ -26,7 +26,16 @@ $NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -1266,6 +1276,14 @@ if test "$enable_shared" = 'yes'; then +@@ -1232,8 +1242,6 @@ if test "$enable_shared" = 'yes'; then + 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,$(@F)' +- else +- enable_rpath=no + fi + XLDFLAGS="$XLDFLAGS "'-R${libdir}' + ;; +@@ -1266,6 +1274,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib' ;; @@ -41,3 +50,16 @@ $NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $ interix*) LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)' ;; +@@ -1274,7 +1290,11 @@ if test "$enable_shared" = 'yes'; then + esac + fi + if test "$enable_rpath" = yes; then +- LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" ++ if test "$GCC" = yes; then ++ LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" ++ else ++ LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" ++ fi + fi + + XLDFLAGS="$XLDFLAGS -L." diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab index a5215f03b30..342053bcfaf 100644 --- a/lang/ruby18-base/patches/patch-ab +++ b/lang/ruby18-base/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $ +$NetBSD: patch-ab,v 1.5 2006/03/22 23:05:39 taca Exp $ --- configure.orig 2005-12-24 21:36:33.000000000 +0900 +++ configure @@ -26,7 +26,16 @@ $NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -15155,6 +15165,14 @@ if test "$enable_shared" = 'yes'; then +@@ -15121,8 +15131,6 @@ if test "$enable_shared" = 'yes'; then + 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,$(@F)' +- else +- enable_rpath=no + fi + XLDFLAGS="$XLDFLAGS "'-R${libdir}' + ;; +@@ -15155,6 +15163,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib' ;; @@ -41,3 +50,16 @@ $NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $ interix*) LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)' ;; +@@ -15163,7 +15179,11 @@ if test "$enable_shared" = 'yes'; then + esac + fi + if test "$enable_rpath" = yes; then +- LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" ++ if test "$GCC" = yes; then ++ LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" ++ else ++ LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" ++ fi + fi + + XLDFLAGS="$XLDFLAGS -L." |