Thu Mar 14 09:57:54 2019 UTC ()
ruby26-base: Fix install on Darwin.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/lang/ruby26-base/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ruby26-base/patches/patch-configure
cvs diff -r1.2 -r1.3 pkgsrc/lang/ruby26-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby26-base/Attic/distinfo 2019/03/12 04:19:09 1.2
+++ pkgsrc/lang/ruby26-base/Attic/distinfo 2019/03/14 09:57:54 1.3
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.2 2019/03/12 04:19:09 taca Exp $ 1$NetBSD: distinfo,v 1.3 2019/03/14 09:57:54 jperkin Exp $
2 2
3SHA1 (ruby-2.6.1-rubygems.patch) = a12386ef79715b4693e02ad0c00034558b669181 3SHA1 (ruby-2.6.1-rubygems.patch) = a12386ef79715b4693e02ad0c00034558b669181
4RMD160 (ruby-2.6.1-rubygems.patch) = f733d14223b8e4270b1114524b0e33f634a822ab 4RMD160 (ruby-2.6.1-rubygems.patch) = f733d14223b8e4270b1114524b0e33f634a822ab
5SHA512 (ruby-2.6.1-rubygems.patch) = 2684ed9c326a989cc75ec25e976f7ffef107d10ccaa54cc83ad48b3fe6f36a1526e6f4bd3a45e29401908d2155e9c3f82b3be14a24ab8c7bef3431f1a0cbbd39 5SHA512 (ruby-2.6.1-rubygems.patch) = 2684ed9c326a989cc75ec25e976f7ffef107d10ccaa54cc83ad48b3fe6f36a1526e6f4bd3a45e29401908d2155e9c3f82b3be14a24ab8c7bef3431f1a0cbbd39
6Size (ruby-2.6.1-rubygems.patch) = 18026 bytes 6Size (ruby-2.6.1-rubygems.patch) = 18026 bytes
7SHA1 (ruby-2.6.1.tar.xz) = ba5f4338bb642e3836dd80b73a9df0d1b6e079ae 7SHA1 (ruby-2.6.1.tar.xz) = ba5f4338bb642e3836dd80b73a9df0d1b6e079ae
8RMD160 (ruby-2.6.1.tar.xz) = adccca8036dfc34d00ea71d5a59a2a968de5187b 8RMD160 (ruby-2.6.1.tar.xz) = adccca8036dfc34d00ea71d5a59a2a968de5187b
9SHA512 (ruby-2.6.1.tar.xz) = fb36289a955f0596c683cdadf1e4a9a9fd35222b1e1c6160c2e7cd82e5befd40a7aa4361e55f7a8f83c06ee899ec493821c7db34a60c4ac3bca0e874d33ef1a9 9SHA512 (ruby-2.6.1.tar.xz) = fb36289a955f0596c683cdadf1e4a9a9fd35222b1e1c6160c2e7cd82e5befd40a7aa4361e55f7a8f83c06ee899ec493821c7db34a60c4ac3bca0e874d33ef1a9
10Size (ruby-2.6.1.tar.xz) = 11872964 bytes 10Size (ruby-2.6.1.tar.xz) = 11872964 bytes
11SHA1 (patch-configure) = 428084d430a1dd0368ec457cad48333ca7d6975b 11SHA1 (patch-configure) = d66204877531fe147361adf843819c3db6d40919
12SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b 12SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
13SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e 13SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
14SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a 14SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
15SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 15SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
16SHA1 (patch-lib_rubygems.rb) = b38f58a852e920bed77a4be281d3703d26515ad0 16SHA1 (patch-lib_rubygems.rb) = b38f58a852e920bed77a4be281d3703d26515ad0
17SHA1 (patch-lib_rubygems_commands_build__command.rb) = be967c5335c7ce6b4e6466f93b4ef2e423fe9058 17SHA1 (patch-lib_rubygems_commands_build__command.rb) = be967c5335c7ce6b4e6466f93b4ef2e423fe9058
18SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad 18SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad
19SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d 19SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d
20SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 20SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
21SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3 21SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
22SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa 22SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa
23SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278 23SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278
24SHA1 (patch-test_rubygems_test__gem.rb) = 80d646b95df81bacca6d277d2801dba16df291f5 24SHA1 (patch-test_rubygems_test__gem.rb) = 80d646b95df81bacca6d277d2801dba16df291f5
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby26-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby26-base/patches/Attic/patch-configure 2019/02/03 13:41:33 1.1
+++ pkgsrc/lang/ruby26-base/patches/Attic/patch-configure 2019/03/14 09:57:54 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-configure,v 1.1 2019/02/03 13:41:33 taca Exp $ 1$NetBSD: patch-configure,v 1.2 2019/03/14 09:57:54 jperkin Exp $
2 2
3* Adding Interix support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5* Ignore VCS. 5* Ignore VCS.
6* Handle SSP in pkgsrc. 6* Handle SSP in pkgsrc.
7* Put -std= in CFLAGS not CPPFLAGS. 7* Put -std= in CFLAGS not CPPFLAGS.
8* Fix argument for pthread_self() on NetBSD. 8* Fix argument for pthread_self() on NetBSD.
9 9
10--- configure.orig 2018-12-25 06:28:23.000000000 +0000 10--- configure.orig 2019-01-30 10:41:14.000000000 +0000
11+++ configure 11+++ configure
12@@ -6048,7 +6048,7 @@ else 12@@ -6048,7 +6048,7 @@ else
13 if test x"$target_alias" = x; then : 13 if test x"$target_alias" = x; then :
14  14
15 case "$target_os" in #( 15 case "$target_os" in #(
16- darwin*) : 16- darwin*) :
17+ nodarwin*) : 17+ nodarwin*) :
18  18
19 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 19 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
20 $as_echo_n "checking for real target cpu... " >&6; } 20 $as_echo_n "checking for real target cpu... " >&6; }
21@@ -8393,6 +8393,7 @@ fi 21@@ -8393,6 +8393,7 @@ fi
22 stack_protector=no 22 stack_protector=no
23 ;; #( 23 ;; #(
@@ -27,117 +27,122 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 @@ -27,117 +27,122 @@ $NetBSD: patch-configure,v 1.1 2019/02/0
27 esac 27 esac
28 if test -z "${stack_protector+set}"; then : 28 if test -z "${stack_protector+set}"; then :
29@@ -10239,6 +10240,10 @@ esac 29@@ -10239,6 +10240,10 @@ esac
30  30
31 ac_cv_func___builtin_setjmp=no 31 ac_cv_func___builtin_setjmp=no
32 ;; #( 32 ;; #(
33+ interix*) : 33+ interix*) :
34+ LIBS="-lm $LIBS" 34+ LIBS="-lm $LIBS"
35+ ac_cv_func_getpgrp_void=yes 35+ ac_cv_func_getpgrp_void=yes
36+ ;; #( 36+ ;; #(
37 *) : 37 *) :
38 ;; 38 ;;
39 esac 39 esac
40@@ -21598,6 +21603,8 @@ else 40@@ -21600,6 +21605,8 @@ else
41 # ifdef _MSC_VER 41 # ifdef _MSC_VER
42 # include <malloc.h> 42 # include <malloc.h>
43 # define alloca _alloca 43 # define alloca _alloca
44+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 44+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
45+# include <stdlib.h> 45+# include <stdlib.h>
46 # else 46 # else
47 # ifdef HAVE_ALLOCA_H 47 # ifdef HAVE_ALLOCA_H
48 # include <alloca.h> 48 # include <alloca.h>
49@@ -26149,11 +26156,11 @@ if ${rb_cv_func_pthread_setname_np_argum 49@@ -26151,11 +26158,11 @@ if ${rb_cv_func_pthread_setname_np_argum
50 else 50 else
51 rb_cv_func_pthread_setname_np_arguments= 51 rb_cv_func_pthread_setname_np_arguments=
52 # Linux,AIX, (pthread_self(), name) 52 # Linux,AIX, (pthread_self(), name)
53- # NetBSD (pthread_self(), name, \"%s\") 53- # NetBSD (pthread_self(), name, \"%s\")
54+ # NetBSD (pthread_self(), \"%s\", name) 54+ # NetBSD (pthread_self(), \"%s\", name)
55 # Darwin (name) 55 # Darwin (name)
56 for mac in \ 56 for mac in \
57 "(pthread_self(), name)" \ 57 "(pthread_self(), name)" \
58- "(pthread_self(), name, \"%s\")" \ 58- "(pthread_self(), name, \"%s\")" \
59+ "(pthread_self(), \"%s\", name)" \ 59+ "(pthread_self(), \"%s\", name)" \
60 "(name)" \ 60 "(name)" \
61 ; do 61 ; do
62 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 62 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
63@@ -26747,7 +26754,9 @@ fi 63@@ -26749,7 +26756,9 @@ fi
64 interix*) : 64 interix*) :
65 : ${LDSHARED='$(CC) -shared'} 65 : ${LDSHARED='$(CC) -shared'}
66 XLDFLAGS="$XLDFLAGS -Wl,-E" 66 XLDFLAGS="$XLDFLAGS -Wl,-E"
67+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 67+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
68 LIBPATHFLAG=" -L%1\$-s" 68 LIBPATHFLAG=" -L%1\$-s"
69+ RPATHFLAG=' -Wl,-R%1$-s' 69+ RPATHFLAG=' -Wl,-R%1$-s'
70 rb_cv_dlopen=yes ;; #( 70 rb_cv_dlopen=yes ;; #(
71 freebsd*|dragonfly*) : 71 freebsd*|dragonfly*) :
72  72
73@@ -27989,7 +27998,7 @@ fi 73@@ -27991,7 +28000,7 @@ fi
74 ;; #( 74 ;; #(
75 freebsd*|dragonfly*) : 75 freebsd*|dragonfly*) :
76  76
77- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' 77- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
78+ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' 78+ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)'
79 LIBRUBY_SONAME='$(LIBRUBY_SO)' 79 LIBRUBY_SONAME='$(LIBRUBY_SO)'
80 if test "$rb_cv_binary_elf" != "yes" ; then : 80 if test "$rb_cv_binary_elf" != "yes" ; then :
81  81
82@@ -28068,6 +28077,7 @@ esac 82@@ -28070,9 +28079,10 @@ esac
83 ;; #( 83 ;; #(
84 darwin*) : 84 darwin*) :
85  85
86+ RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' 86+ RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
87 LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' 87 LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
88 LIBRUBY_SONAME='$(LIBRUBY_SO)' 88- LIBRUBY_SONAME='$(LIBRUBY_SO)'
89 LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' 89- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
90@@ -28091,7 +28101,12 @@ fi 90+ LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
 91+ LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
 92 if test "$load_relative" = yes; then :
 93
 94 libprefix="@executable_path/../${libdir_basename}"
 95@@ -28093,7 +28103,12 @@ fi
91 ;; #( 96 ;; #(
92 interix*) : 97 interix*) :
93  98
94- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 99- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
95+ SOLIBS='$(LIBS)' 100+ SOLIBS='$(LIBS)'
96+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 101+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
97+ # link explicitly to 0x48000000 102+ # link explicitly to 0x48000000
98+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 103+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
99+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 104+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
100+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 105+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
101 ;; #( 106 ;; #(
102 mingw*|cygwin*|mswin*) : 107 mingw*|cygwin*|mswin*) :
103  108
104@@ -28273,7 +28288,7 @@ if test "$enable_rpath" = yes; then : 109@@ -28275,7 +28290,7 @@ if test "$enable_rpath" = yes; then :
105 esac 110 esac
106 rpathflag=`IFS="$PATH_SEPARATOR" 111 rpathflag=`IFS="$PATH_SEPARATOR"
107 echo x "$rpathflag" | 112 echo x "$rpathflag" |
108- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" 113- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
109+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" 114+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
110 ` 115 `
111 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" 116 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
112 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 117 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
113@@ -28815,15 +28830,7 @@ fi 118@@ -28817,15 +28832,7 @@ fi
114  119
115 if test "$install_doc" != no; then : 120 if test "$install_doc" != no; then :
116  121
117- if test "$install_rdoc" != no; then : 122- if test "$install_rdoc" != no; then :
118- 123-
119- RDOCTARGET="rdoc" 124- RDOCTARGET="rdoc"
120- 125-
121-else 126-else
122- 127-
123- RDOCTARGET="nodoc" 128- RDOCTARGET="nodoc"
124- 129-
125-fi 130-fi
126+ RDOCTARGET="nodoc" 131+ RDOCTARGET="nodoc"
127 if test "$install_capi" != no -a -n "$DOXYGEN"; then : 132 if test "$install_capi" != no -a -n "$DOXYGEN"; then :
128  133
129 CAPITARGET="capi" 134 CAPITARGET="capi"
130@@ -30977,31 +30984,7 @@ which seems to be undefined. Please mak 135@@ -30979,31 +30988,7 @@ which seems to be undefined. Please mak
131 "Makefile":F) 136 "Makefile":F)
132 tmpmk=confmk$$.tmp 137 tmpmk=confmk$$.tmp
133 { 138 {
134- if test ${VCS+set}; then : 139- if test ${VCS+set}; then :
135- 140-
136- : 141- :
137- 142-
138-elif svn info "$srcdir" > /dev/null 2>&1; then : 143-elif svn info "$srcdir" > /dev/null 2>&1; then :
139- 144-
140- VCS='svn' 145- VCS='svn'
141- 146-
142-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : 147-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then :
143- 148-