pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby18 Another Interix fix. Ruby 1.6 used printf...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1975b49bf194
branches:  trunk
changeset: 487867:1975b49bf194
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Jan 21 12:49:36 2005 +0000

description:
Another Interix fix.  Ruby 1.6 used printf to expand these variables, so %%
was needed.  1.8 doesn't, so that extra % is now noise.

diffstat:

 lang/ruby18/distinfo         |  6 +++---
 lang/ruby18/patches/patch-aa |  4 ++--
 lang/ruby18/patches/patch-ab |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 44d4fce78042 -r 1975b49bf194 lang/ruby18/distinfo
--- a/lang/ruby18/distinfo      Fri Jan 21 12:24:39 2005 +0000
+++ b/lang/ruby18/distinfo      Fri Jan 21 12:49:36 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/01/21 06:13:36 tv Exp $
+$NetBSD: distinfo,v 1.6 2005/01/21 12:49:36 tv Exp $
 
 SHA1 (ruby/ruby-1.8.1.tar.gz) = 894cb1e7624b74e699d127344ce5600fc3a7d515
 Size (ruby/ruby-1.8.1.tar.gz) = 2671875 bytes
-SHA1 (patch-aa) = 4c839205d4657605c4858c314d860cfea9c257d7
-SHA1 (patch-ab) = 2a5acc5b8d9b53eef036b958c2a80aae20e6e257
+SHA1 (patch-aa) = 696d4854798196e7c3f4986399271a3d2ac1e33d
+SHA1 (patch-ab) = 55d7e26f15aa472470974d69a3916ea2750ed6a4
 SHA1 (patch-ac) = ad9da65c2b09f0ee4b368989cb7b03fe3217c077
 SHA1 (patch-ad) = a9561d30dd9ba8506a2943d50e8e5abdfe359db2
 SHA1 (patch-af) = 163dbcb44bd8784ac3e90df1e39ec927f927300f
diff -r 44d4fce78042 -r 1975b49bf194 lang/ruby18/patches/patch-aa
--- a/lang/ruby18/patches/patch-aa      Fri Jan 21 12:24:39 2005 +0000
+++ b/lang/ruby18/patches/patch-aa      Fri Jan 21 12:49:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/01/21 06:13:36 tv Exp $
+$NetBSD: patch-aa,v 1.4 2005/01/21 12:49:37 tv Exp $
 
 --- configure.in.orig  2003-12-24 14:19:12.000000000 -0500
 +++ configure.in
@@ -45,7 +45,7 @@
 +      interix3*)      : ${LDSHARED='${CC} -shared'}
 +                      LDFLAGS="$LDFLAGS -Wl,-E"
 +                      # use special random-slot linkage in 0x[56]XXXXXXX
-+                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %%4096/2*262144+1342177280))'
++                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
 +                      LIBPATHFLAG=' -L%1$-s'
 +                      RPATHFLAG=' -Wl,-R%1$-s'
 +                      rb_cv_dlopen=yes ;;
diff -r 44d4fce78042 -r 1975b49bf194 lang/ruby18/patches/patch-ab
--- a/lang/ruby18/patches/patch-ab      Fri Jan 21 12:24:39 2005 +0000
+++ b/lang/ruby18/patches/patch-ab      Fri Jan 21 12:49:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2005/01/21 06:13:36 tv Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/21 12:49:37 tv Exp $
 
 --- configure.orig     2003-12-24 14:21:24.000000000 -0500
 +++ configure
@@ -45,7 +45,7 @@
 +      interix3*)      : ${LDSHARED='${CC} -shared'}
 +                      LDFLAGS="$LDFLAGS -Wl,-E"
 +                      # use special random-slot linkage in 0x[56]XXXXXXX
-+                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %%4096/2*262144+1342177280))'
++                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
 +                      LIBPATHFLAG=' -L%1$-s'
 +                      RPATHFLAG=' -Wl,-R%1$-s'
 +                      rb_cv_dlopen=yes ;;



Home | Main Index | Thread Index | Old Index