| @@ -1,115 +1,137 @@ | | | @@ -1,115 +1,137 @@ |
| 1 | $NetBSD: patch-configure,v 1.2 2017/06/27 15:25:19 jperkin Exp $ | | 1 | $NetBSD: patch-configure,v 1.2.8.1 2018/03/02 20:36:36 spz 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. |
| | | 7 | * Put -std= in CFLAGS not CPPFLAGS. |
| 6 | | | 8 | |
| 7 | --- configure.orig 2017-03-22 05:56:10.000000000 +0000 | | 9 | --- configure.orig 2017-12-14 14:36:11.000000000 +0000 |
| 8 | +++ configure | | 10 | +++ configure |
| 9 | @@ -5727,7 +5727,7 @@ esac | | 11 | @@ -5727,7 +5727,7 @@ esac |
| 10 | else | | 12 | else |
| 11 | if test x"$target_alias" = x; then | | 13 | if test x"$target_alias" = x; then |
| 12 | case "$target_os" in #( | | 14 | case "$target_os" in #( |
| 13 | - darwin*) : | | 15 | - darwin*) : |
| 14 | + notdarwin*) : | | 16 | + notdarwin*) : |
| 15 | | | 17 | |
| 16 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 | | 18 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 |
| 17 | $as_echo_n "checking for real target cpu... " >&6; } | | 19 | $as_echo_n "checking for real target cpu... " >&6; } |
| 18 | @@ -9234,7 +9234,7 @@ rm -f core conftest.err conftest.$ac_obj | | 20 | @@ -8112,6 +8112,7 @@ esac |
| | | 21 | stack_protector=no |
| | | 22 | ;; #( |
| | | 23 | *) : |
| | | 24 | + stack_protector=no |
| | | 25 | ;; |
| | | 26 | esac |
| | | 27 | if test -z "${stack_protector+set}"; then |
| | | 28 | @@ -9325,7 +9326,7 @@ rm -f core conftest.err conftest.$ac_obj |
| 19 | # is often also needed in CPPFLAGS, because some feature | | 29 | # is often also needed in CPPFLAGS, because some feature |
| 20 | # definitions vary depending on such standards options. | | 30 | # definitions vary depending on such standards options. |
| 21 | case "${ansi_options}" in #( | | 31 | case "${ansi_options}" in #( |
| 22 | - *-std=iso9899:1999*) : | | 32 | - *-std=iso9899:1999*) : |
| 23 | + *-std=iso9899:1999*|*-std=gnu99*) : | | 33 | + *-std=iso9899:1999*|*-std=gnu99*) : |
| 24 | | | 34 | |
| 25 | # RUBY_APPEND_OPTIONS(CPPFLAGS) | | 35 | # RUBY_APPEND_OPTIONS(CPPFLAGS) |
| 26 | for rb_opt in ${ansi_options}; do | | 36 | for rb_opt in ${ansi_options}; do |
| 27 | @@ -9464,6 +9464,10 @@ esac | | 37 | @@ -9333,9 +9334,9 @@ rm -f core conftest.err conftest.$ac_obj |
| | | 38 | *" ${rb_opt} "*) : |
| | | 39 | ;; #( |
| | | 40 | ' ') : |
| | | 41 | - CPPFLAGS="${rb_opt}" ;; #( |
| | | 42 | + CFLAGS="${rb_opt}" ;; #( |
| | | 43 | *) : |
| | | 44 | - CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; |
| | | 45 | + CFLAGS="$CFLAGS ${rb_opt}" ;; |
| | | 46 | esac |
| | | 47 | done |
| | | 48 | ;; #( |
| | | 49 | @@ -9555,6 +9556,10 @@ esac |
| 28 | LIBS="-lm $LIBS" | | 50 | LIBS="-lm $LIBS" |
| 29 | ac_cv_func_round=no | | 51 | ac_cv_func_round=no |
| 30 | ;; #( | | 52 | ;; #( |
| 31 | + interix*) : | | 53 | + interix*) : |
| 32 | + LIBS="-lm $LIBS" | | 54 | + LIBS="-lm $LIBS" |
| 33 | + ac_cv_func_getpgrp_void=yes | | 55 | + ac_cv_func_getpgrp_void=yes |
| 34 | + ;; #( | | 56 | + ;; #( |
| 35 | nacl) : | | 57 | nacl) : |
| 36 | | | 58 | |
| 37 | LIBS="-lm $LIBS" | | 59 | LIBS="-lm $LIBS" |
| 38 | @@ -19697,6 +19701,8 @@ else | | 60 | @@ -19808,6 +19813,8 @@ else |
| 39 | # ifdef _MSC_VER | | 61 | # ifdef _MSC_VER |
| 40 | # include <malloc.h> | | 62 | # include <malloc.h> |
| 41 | # define alloca _alloca | | 63 | # define alloca _alloca |
| 42 | +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) | | 64 | +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) |
| 43 | +# include <stdlib.h> | | 65 | +# include <stdlib.h> |
| 44 | # else | | 66 | # else |
| 45 | # ifdef HAVE_ALLOCA_H | | 67 | # ifdef HAVE_ALLOCA_H |
| 46 | # include <alloca.h> | | 68 | # include <alloca.h> |
| 47 | @@ -24383,7 +24389,9 @@ esac ;; #( | | 69 | @@ -24490,7 +24497,9 @@ esac ;; #( |
| 48 | interix*) : | | 70 | interix*) : |
| 49 | : ${LDSHARED='$(CC) -shared'} | | 71 | : ${LDSHARED='$(CC) -shared'} |
| 50 | XLDFLAGS="$XLDFLAGS -Wl,-E" | | 72 | XLDFLAGS="$XLDFLAGS -Wl,-E" |
| 51 | + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' | | 73 | + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' |
| 52 | LIBPATHFLAG=" -L%1\$-s" | | 74 | LIBPATHFLAG=" -L%1\$-s" |
| 53 | + RPATHFLAG=' -Wl,-R%1$-s' | | 75 | + RPATHFLAG=' -Wl,-R%1$-s' |
| 54 | rb_cv_dlopen=yes ;; #( | | 76 | rb_cv_dlopen=yes ;; #( |
| 55 | freebsd*|dragonfly*) : | | 77 | freebsd*|dragonfly*) : |
| 56 | | | 78 | |
| 57 | @@ -25571,7 +25579,7 @@ esac | | 79 | @@ -25617,7 +25626,7 @@ esac |
| 58 | freebsd*|dragonfly*) : | | 80 | freebsd*|dragonfly*) : |
| 59 | | | 81 | |
| 60 | SOLIBS='$(LIBS)' | | 82 | SOLIBS='$(LIBS)' |
| 61 | - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' | | 83 | - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' |
| 62 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' | | 84 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' |
| 63 | if test "$rb_cv_binary_elf" != "yes" ; then | | 85 | if test "$rb_cv_binary_elf" != "yes" ; then |
| 64 | LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" | | 86 | LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" |
| 65 | LIBRUBY_ALIASES='' | | 87 | LIBRUBY_ALIASES='' |
| 66 | @@ -25660,7 +25668,12 @@ esac | | 88 | @@ -25706,7 +25715,12 @@ esac |
| 67 | ;; #( | | 89 | ;; #( |
| 68 | interix*) : | | 90 | interix*) : |
| 69 | | | 91 | |
| 70 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' | | 92 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' |
| 71 | + SOLIBS='$(LIBS)' | | 93 | + SOLIBS='$(LIBS)' |
| 72 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' | | 94 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' |
| 73 | + # link explicitly to 0x48000000 | | 95 | + # link explicitly to 0x48000000 |
| 74 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' | | 96 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' |
| 75 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' | | 97 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' |
| 76 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' | | 98 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' |
| 77 | ;; #( | | 99 | ;; #( |
| 78 | mingw*|cygwin*|mswin*) : | | 100 | mingw*|cygwin*|mswin*) : |
| 79 | | | 101 | |
| 80 | @@ -25828,7 +25841,7 @@ if test "$enable_rpath" = yes; then | | 102 | @@ -25874,7 +25888,7 @@ if test "$enable_rpath" = yes; then |
| 81 | esac | | 103 | esac |
| 82 | rpathflag=`IFS="$PATH_SEPARATOR" | | 104 | rpathflag=`IFS="$PATH_SEPARATOR" |
| 83 | echo x "$rpathflag" | | | 105 | echo x "$rpathflag" | |
| 84 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" | | 106 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" |
| 85 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" | | 107 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" |
| 86 | ` | | 108 | ` |
| 87 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" | | 109 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" |
| 88 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" | | 110 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" |
| 89 | @@ -26324,11 +26337,7 @@ if test "$install_doc" != no; then | | 111 | @@ -26370,11 +26384,7 @@ if test "$install_doc" != no; then |
| 90 | else | | 112 | else |
| 91 | RDOCTARGET="nodoc" | | 113 | RDOCTARGET="nodoc" |
| 92 | fi | | 114 | fi |
| 93 | - if test "$install_capi" != no -a -n "$DOXYGEN"; then | | 115 | - if test "$install_capi" != no -a -n "$DOXYGEN"; then |
| 94 | - CAPITARGET="capi" | | 116 | - CAPITARGET="capi" |
| 95 | - else | | 117 | - else |
| 96 | - CAPITARGET="nodoc" | | 118 | - CAPITARGET="nodoc" |
| 97 | - fi | | 119 | - fi |
| 98 | + CAPITARGET="nodoc" | | 120 | + CAPITARGET="nodoc" |
| 99 | else | | 121 | else |
| 100 | RDOCTARGET="nodoc" | | 122 | RDOCTARGET="nodoc" |
| 101 | CAPITARGET="nodoc" | | 123 | CAPITARGET="nodoc" |
| 102 | @@ -28372,19 +28383,7 @@ which seems to be undefined. Please mak | | 124 | @@ -28404,19 +28414,7 @@ which seems to be undefined. Please mak |
| 103 | "Makefile":F) | | 125 | "Makefile":F) |
| 104 | tmpmk=confmk$$.tmp | | 126 | tmpmk=confmk$$.tmp |
| 105 | { | | 127 | { |
| 106 | - if test ${VCS+set}; then | | 128 | - if test ${VCS+set}; then |
| 107 | - : | | 129 | - : |
| 108 | - elif svn info "$srcdir" > /dev/null 2>&1; then | | 130 | - elif svn info "$srcdir" > /dev/null 2>&1; then |
| 109 | - VCS='svn' | | 131 | - VCS='svn' |
| 110 | - elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then | | 132 | - elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then |
| 111 | - if test -d "$git_dir/svn"; then | | 133 | - if test -d "$git_dir/svn"; then |
| 112 | - VCS='git svn' | | 134 | - VCS='git svn' |
| 113 | - else | | 135 | - else |
| 114 | - VCS='git' | | 136 | - VCS='git' |
| 115 | - fi | | 137 | - fi |