$NetBSD: patch-configure,v 1.4 2015/04/22 19:04:56 sevan Exp $ * Adding Interix support. * Ignore doxygen. --- configure.orig 2014-11-13 13:38:30.000000000 +0000 +++ configure @@ -5271,7 +5271,7 @@ esac else if test x"$target_alias" = x; then case "$target_os" in #( - darwin*) : + notdarwin*) : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 $as_echo_n "checking for real target cpu... " >&6; } @@ -8631,6 +8631,10 @@ esac ac_cv_func_isinf=yes ac_cv_func_isnan=yes ;; #( + interix*) : + LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes + ;; #( nacl) : LIBS="-lm $LIBS" @@ -16323,6 +16327,8 @@ else # ifdef _MSC_VER # include # define alloca _alloca +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include # else # ifdef HAVE_ALLOCA_H # include @@ -20040,7 +20046,9 @@ esac ;; #( interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" + 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 ;; #( freebsd*|dragonfly*) : @@ -21041,7 +21049,7 @@ esac freebsd*|dragonfly*) : SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' @@ -21120,7 +21128,12 @@ esac ;; #( interix*) : - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + # link explicitly to 0x48000000 + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' ;; #( mingw*|cygwin*|mswin*) : @@ -21278,7 +21291,7 @@ esac esac if test "$enable_rpath" = yes; then test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS " - LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}" + LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib" test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" @@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then else RDOCTARGET="nodoc" fi - if test "$install_capi" != no -a -n "$DOXYGEN"; then - CAPITARGET="capi" - else - CAPITARGET="nodoc" - fi + CAPITARGET="nodoc" else RDOCTARGET="nodoc" CAPITARGET="nodoc" @@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t elif test -z "${ruby_version}"; then as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5 else - RUBY_LIB_VERSION="\"${ruby_version}\"" + RUBY_LIB_VERSION="${ruby_version}" fi @@ -23686,17 +23695,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { - if test ${VCS+set}; then - : - elif svn info "$srcdir" > /dev/null 2>&1; then - VCS='svn' - elif test -d "$srcdir/.git/svn"; then - VCS='git svn' - elif test -d "$srcdir/.git"; then - VCS='git' - else - VCS='echo cannot' - fi + VCS='echo cannot' case "$VCS" in #( svn) : VCSUP='$(VCS) up $(SVNUPOPTIONS)' ;; #(