[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: IPv6 ready ruby
> pkgsrc/lang/rubyのIPv6 ready化diffです。
> どうしてもext/socket/socket.cをstatic linkしないとうまくいかないん
> ですが、直せたひとは教えて下さい。patches/patch-adの後半で
> static linkにしています。
もとのpkgsrc/lang/rubyのELF対応に抜けがありました。以下をあてると
直ります。以下にはIPv6対応部分は含んでいません。
というわけで、さかもとさんcommitしちゃっていいですか?
itojun
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby/files/patch-sum,v
retrieving revision 1.2
diff -c -r1.2 patch-sum
*** patch-sum 1999/12/14 07:16:05 1.2
--- patch-sum 2000/01/21 09:05:21
***************
*** 1,5 ****
$NetBSD: patch-sum,v 1.2 1999/12/14 07:16:05 sakamoto Exp $
MD5 (patch-aa) = 63413152889269cdc5c2cb9f64e537e2
! MD5 (patch-ab) = e132c46af84d0969cf0e00f6ffb95bac
! MD5 (patch-ac) = b7598f85460293ac502d0d9c81260e2b
--- 1,5 ----
$NetBSD: patch-sum,v 1.2 1999/12/14 07:16:05 sakamoto Exp $
MD5 (patch-aa) = 63413152889269cdc5c2cb9f64e537e2
! MD5 (patch-ab) = 54a21b3f994f075cf30391018551c8a5
! MD5 (patch-ac) = f7371976ef7f29dddc1b625c057926d8
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby/patches/patch-ab,v
retrieving revision 1.1
diff -c -r1.1 patch-ab
*** patch-ab 1999/09/22 12:33:30 1.1
--- patch-ab 2000/01/21 09:05:21
***************
*** 1,8 ****
! $NetBSD: patch-ab,v 1.1 1999/09/22 12:33:30 sakamoto Exp $
! --- ./configure.in.orig Mon Aug 30 16:00:47 1999
! +++ ./configure.in Wed Sep 22 19:51:42 1999
! @@ -680,9 +680,11 @@
netbsd*)
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
- case "$host_cpu" in
--- 1,33 ----
! $NetBSD$
! --- configure.in.orig Tue Dec 7 16:01:00 1999
! +++ configure.in Fri Jan 21 00:56:42 2000
! @@ -355,6 +355,9 @@
! else
! LDFLAGS="-rdynamic"
! fi;;
! +netbsd*)
! + rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__`
! + ;;
! esac
!
! AC_SUBST(DLDFLAGS)dnl
! @@ -430,10 +433,9 @@
! fi
! rb_cv_dlopen=yes ;;
! netbsd*) LDSHARED="ld -shared"
! - case "$host_cpu" in
! - alpha)
! - LDFLAGS="-export-dynamic" ;;
! - esac
! + if test "x$rb_cv_netbsd_elf" != "x" ; then
! + LDFLAGS="-export-dynamic"
! + fi
! rb_cv_dlopen=yes ;;
! openbsd*) LDSHARED="ld -Bforcearchive -Bshareable"
! rb_cv_dlopen=yes ;;
! @@ -684,11 +686,12 @@
! ;;
netbsd*)
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
- case "$host_cpu" in
***************
*** 10,16 ****
- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' ;;
- *) LIBRUBY_ALIASES= ;; # a.out platforms
- esac
- + rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__`
+ if test "x$rb_cv_netbsd_elf" != "x" ; then
+ LIBRUBYARG='$(LIBRUBY_SO)'
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so'
--- 35,40 ----
***************
*** 19,21 ****
--- 43,46 ----
+ fi
;;
solaris*)
+ XLDFLAGS='-R${prefix}/lib'
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby/patches/patch-ac,v
retrieving revision 1.1
diff -c -r1.1 patch-ac
*** patch-ac 1999/09/22 12:33:30 1.1
--- patch-ac 2000/01/21 09:05:22
***************
*** 1,8 ****
! $NetBSD: patch-ac,v 1.1 1999/09/22 12:33:30 sakamoto Exp $
! --- ./configure.orig Mon Aug 30 23:14:28 1999
! +++ ./configure Wed Sep 22 19:53:16 1999
! @@ -4581,9 +4581,11 @@
netbsd*)
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
- case "$host_cpu" in
--- 1,207 ----
! $NetBSD$
! --- configure.orig Tue Dec 7 16:38:00 1999
! +++ configure Fri Jan 21 00:56:47 2000
! @@ -3641,7 +3641,7 @@
! int main() {
!
! /* Ultrix mips cc rejects this. */
! -typedef int charset[2]; const charset x = {0,0};
! +typedef int charset[2]; const charset x;
! /* SunOS 4.1.1 cc rejects this. */
! char const *const *ccp;
! char **p;
! @@ -4015,6 +4015,9 @@
! else
! LDFLAGS="-rdynamic"
! fi;;
! +netbsd*)
! + rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__`
! + ;;
! esac
!
!
! @@ -4024,7 +4027,7 @@
! if test "$with_dln_a_out" != yes; then
! rb_cv_dlopen=unknown
! echo $ac_n "checking whether OS depend dynamic link works""... $ac_c" 1>&6
! -echo "configure:4028: checking whether OS depend dynamic link works" >&5
! +echo "configure:4031: checking whether OS depend dynamic link works" >&5
! if test "$GCC" = yes; then
! case "$host_os" in
! nextstep*) ;;
! @@ -4086,10 +4089,9 @@
! fi
! rb_cv_dlopen=yes ;;
! netbsd*) LDSHARED="ld -shared"
! - case "$host_cpu" in
! - alpha)
! - LDFLAGS="-export-dynamic" ;;
! - esac
! + if test "x$rb_cv_netbsd_elf" != "x" ; then
! + LDFLAGS="-export-dynamic"
! + fi
! rb_cv_dlopen=yes ;;
! openbsd*) LDSHARED="ld -Bforcearchive -Bshareable"
! rb_cv_dlopen=yes ;;
! @@ -4146,12 +4148,12 @@
! if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
! cat confdefs.h > config.h
! echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6
! -echo "configure:4150: checking whether matz's dln works" >&5
! +echo "configure:4152: checking whether matz's dln works" >&5
! if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
! else
! cat > conftest.$ac_ext <<EOF
! -#line 4155 "configure"
! +#line 4157 "configure"
! #include "confdefs.h"
!
! #define USE_DLN_A_OUT
! @@ -4161,7 +4163,7 @@
!
! ; return 0; }
! EOF
! -if { (eval echo configure:4165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
! +if { (eval echo configure:4167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
! rm -rf conftest*
! rb_cv_dln_a_out=yes
! else
! @@ -4268,7 +4270,7 @@
! case "$host_os" in
! human*)
! echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6
! -echo "configure:4272: checking for _harderr in -lsignal" >&5
! +echo "configure:4274: checking for _harderr in -lsignal" >&5
! ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'`
! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
! @@ -4276,7 +4278,7 @@
! ac_save_LIBS="$LIBS"
! LIBS="-lsignal $LIBS"
! cat > conftest.$ac_ext <<EOF
! -#line 4280 "configure"
! +#line 4282 "configure"
! #include "confdefs.h"
! /* Override any gcc2 internal prototype to avoid an error. */
! /* We use char because int might match the return type of a gcc2
! @@ -4287,7 +4289,7 @@
! _harderr()
! ; return 0; }
! EOF
! -if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! +if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
! else
! @@ -4315,7 +4317,7 @@
! fi
!
! echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6
! -echo "configure:4319: checking for hmemset in -lhmem" >&5
! +echo "configure:4321: checking for hmemset in -lhmem" >&5
! ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'`
! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
! @@ -4323,7 +4325,7 @@
! ac_save_LIBS="$LIBS"
! LIBS="-lhmem $LIBS"
! cat > conftest.$ac_ext <<EOF
! -#line 4327 "configure"
! +#line 4329 "configure"
! #include "confdefs.h"
! /* Override any gcc2 internal prototype to avoid an error. */
! /* We use char because int might match the return type of a gcc2
! @@ -4334,7 +4336,7 @@
! hmemset()
! ; return 0; }
! EOF
! -if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! +if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
! else
! @@ -4364,12 +4366,12 @@
! for ac_func in select
! do
! echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! -echo "configure:4368: checking for $ac_func" >&5
! +echo "configure:4370: checking for $ac_func" >&5
! if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
! else
! cat > conftest.$ac_ext <<EOF
! -#line 4373 "configure"
! +#line 4375 "configure"
! #include "confdefs.h"
! /* System header to define __stub macros and hopefully few prototypes,
! which can conflict with char $ac_func(); below. */
! @@ -4392,7 +4394,7 @@
!
! ; return 0; }
! EOF
! -if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! +if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
! rm -rf conftest*
! eval "ac_cv_func_$ac_func=yes"
! else
! @@ -4417,7 +4419,7 @@
! done
!
! echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6
! -echo "configure:4421: checking whether PD libc _dtos18 fail to convert big number" >&5
! +echo "configure:4423: checking whether PD libc _dtos18 fail to convert big number" >&5
! if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
! else
! @@ -4425,7 +4427,7 @@
! rb_cv_missing__dtos18=no
! else
! cat > conftest.$ac_ext <<EOF
! -#line 4429 "configure"
! +#line 4431 "configure"
! #include "confdefs.h"
!
! #include <stdio.h>
! @@ -4437,7 +4439,7 @@
! }
!
! EOF
! -if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
! +if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
! then
! rb_cv_missing__dtos18=yes
! else
! @@ -4459,7 +4461,7 @@
!
! fi
! echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6
! -echo "configure:4463: checking whether PD libc fconvert fail to round" >&5
! +echo "configure:4465: checking whether PD libc fconvert fail to round" >&5
! if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
! else
! @@ -4467,7 +4469,7 @@
! rb_cv_missing_fconvert=no
! else
! cat > conftest.$ac_ext <<EOF
! -#line 4471 "configure"
! +#line 4473 "configure"
! #include "confdefs.h"
!
! #include <stdio.h>
! @@ -4480,7 +4482,7 @@
! }
!
! EOF
! -if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
! +if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
! then
! rb_cv_missing_fconvert=yes
! else
! @@ -4585,11 +4587,12 @@
! ;;
netbsd*)
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
- case "$host_cpu" in
***************
*** 10,16 ****
- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' ;;
- *) LIBRUBY_ALIASES= ;; # a.out platforms
- esac
- + rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__`
+ if test "x$rb_cv_netbsd_elf" != "x" ; then
+ LIBRUBYARG='$(LIBRUBY_SO)'
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so'
--- 209,214 ----
***************
*** 19,21 ****
--- 217,220 ----
+ fi
;;
solaris*)
+ XLDFLAGS='-R${prefix}/lib'