$NetBSD: patch-configure,v 1.3 2022/11/26 13:07:52 taca Exp $ * Adding Interix support. * Ignore doxygen. * Ignore VCS. * Handle SSP in pkgsrc. * Retain _XOPEN_SOURCE, fixes eventmachine. * Fix argument for pthread_self() on NetBSD. --- configure.orig 2022-11-24 11:04:58.000000000 +0000 +++ configure @@ -9270,7 +9270,7 @@ else $as_nop then : case "$target_os" in #( - darwin*) : + nodarwin*) : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 printf %s "checking for real target cpu... " >&6; } @@ -11095,6 +11095,7 @@ fi stack_protector=no ;; #( *) : + stack_protector=no ;; esac if test -z "${stack_protector+set}" @@ -12893,18 +12894,6 @@ then : CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; esac done - # _XOPEN_SOURCE should not be defined for C++ on Solaris. - # RUBY_APPEND_OPTIONS(CXXFLAGS) - for rb_opt in -U_XOPEN_SOURCE; do - case " ${CXXFLAGS-} " in #( - *" ${rb_opt} "*) : - ;; #( - ' ') : - CXXFLAGS="${rb_opt}" ;; #( - *) : - CXXFLAGS="$CXXFLAGS ${rb_opt}" ;; -esac - done fi @@ -13060,6 +13049,10 @@ esac ac_cv_func___builtin_setjmp=no ;; #( + interix*) : + LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes + ;; #( *) : ;; esac @@ -24715,7 +24708,9 @@ else #include #include #ifndef alloca -# ifdef __GNUC__ +# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include +# elif defined __GNUC__ # define alloca __builtin_alloca # elif defined _MSC_VER # include @@ -29662,7 +29657,9 @@ fi 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*) : @@ -29833,7 +29830,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5 printf %s "checking whether $flag is accepted for bundle... " >&6; } : > conftest.c - if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && + if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && test ! -s conftest.err then : @@ -30991,7 +30988,7 @@ fi ;; #( freebsd*|dragonfly*) : - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' LIBRUBY_SONAME='$(LIBRUBY_SO)' if test "$rb_cv_binary_elf" != "yes" then : @@ -31072,9 +31069,10 @@ esac ;; #( darwin*) : + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' if test "$load_relative" = yes then : @@ -31097,7 +31095,12 @@ fi ;; #( 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*) : @@ -31290,7 +31293,7 @@ then : esac rpathflag=`IFS="$PATH_SEPARATOR" echo x "$rpathflag" | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" ` LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" @@ -34101,21 +34104,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { - if test ${VCS+set} -then : - - : - -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` -then : - - VCS='$(GIT)' - -else $as_nop - VCS='echo cannot' - -fi case "$VCS" in #( '$(GIT)'|git) : VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)' ;; #(