9f29aeee99
Fixes build of eventmachine (which assumes the XPG4.2 "void *" type for iov_base), and mirrors settings of ruby 2.x. Bump PKGREVISION.
142 lines
4 KiB
Text
142 lines
4 KiB
Text
$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin 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-04-12 11:48:57.000000000 +0000
|
|
+++ configure
|
|
@@ -8381,7 +8381,7 @@ else
|
|
if test x"$target_alias" = x; then :
|
|
|
|
case "$target_os" in #(
|
|
- darwin*) :
|
|
+ nodarwin*) :
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
|
|
$as_echo_n "checking for real target cpu... " >&6; }
|
|
@@ -10094,6 +10094,7 @@ fi
|
|
stack_protector=no
|
|
;; #(
|
|
*) :
|
|
+ stack_protector=no
|
|
;;
|
|
esac
|
|
if test -z "${stack_protector+set}"; then :
|
|
@@ -11794,18 +11795,6 @@ fi
|
|
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
|
|
|
|
@@ -11970,6 +11959,10 @@ esac
|
|
|
|
ac_cv_func___builtin_setjmp=no
|
|
;; #(
|
|
+ interix*) :
|
|
+ LIBS="-lm $LIBS"
|
|
+ ac_cv_func_getpgrp_void=yes
|
|
+ ;; #(
|
|
*) :
|
|
;;
|
|
esac
|
|
@@ -23324,6 +23317,8 @@ else
|
|
# ifdef _MSC_VER
|
|
# include <malloc.h>
|
|
# define alloca _alloca
|
|
+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
|
|
+# include <stdlib.h>
|
|
# else
|
|
# ifdef HAVE_ALLOCA_H
|
|
# include <alloca.h>
|
|
@@ -28622,7 +28617,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*) :
|
|
|
|
@@ -29890,7 +29887,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 :
|
|
|
|
@@ -29969,9 +29966,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 :
|
|
|
|
libprefix="@executable_path/../${libdir_basename}"
|
|
@@ -29992,7 +29990,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*) :
|
|
|
|
@@ -30174,7 +30177,7 @@ if test "$enable_rpath" = yes; 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"
|
|
@@ -32906,19 +32909,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
|
|
-
|
|
VCS='echo cannot'
|
|
-
|
|
-fi
|
|
case "$VCS" in #(
|
|
'$(GIT)'|git) :
|
|
VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)' ;; #(
|