mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
154 lines
4.5 KiB
Plaintext
154 lines
4.5 KiB
Plaintext
$NetBSD: patch-configure,v 1.4 2013/11/24 14:22:03 taca Exp $
|
|
|
|
* Adding Interix and MirBSD support.
|
|
* Ignore doxygen.
|
|
|
|
--- configure.orig 2013-11-22 04:23:39.000000000 +0000
|
|
+++ configure
|
|
@@ -8260,6 +8260,10 @@ esac
|
|
superux*) :
|
|
ac_cv_func_setitimer=no
|
|
;; #(
|
|
+ interix*) :
|
|
+ LIBS="-lm $LIBS"
|
|
+ ac_cv_func_getpgrp_void=yes
|
|
+ ;; #(
|
|
nacl) :
|
|
|
|
LIBS="-lm $LIBS"
|
|
@@ -14794,7 +14798,7 @@ _ACEOF
|
|
fi
|
|
|
|
case "$target_os" in #(
|
|
- openbsd*) :
|
|
+ openbsd*|mirbsd*) :
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for heap align log on openbsd" >&5
|
|
$as_echo_n "checking for heap align log on openbsd... " >&6; }
|
|
@@ -15068,6 +15072,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>
|
|
@@ -17074,7 +17080,7 @@ done
|
|
MAINLIBS="-pthread $MAINLIBS" ;; #(
|
|
*) :
|
|
case "$target_os" in #(
|
|
- openbsd*) :
|
|
+ openbsd*|mirbsd*) :
|
|
LIBS="-pthread $LIBS" ;; #(
|
|
*) :
|
|
LIBS="-l$pthread_lib $LIBS" ;;
|
|
@@ -17447,7 +17453,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*) :
|
|
|
|
@@ -18270,7 +18278,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=''
|
|
@@ -18287,7 +18295,7 @@ esac
|
|
LIBRUBY_ALIASES=""
|
|
fi
|
|
;; #(
|
|
- openbsd*) :
|
|
+ openbsd*|mirbsd*) :
|
|
|
|
SOLIBS='$(LIBS)'
|
|
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
|
|
@@ -18348,7 +18356,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*) :
|
|
|
|
@@ -18506,7 +18519,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} -L\$(libdir)"
|
|
+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib -L\$(libdir)"
|
|
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
|
|
LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
|
|
fi
|
|
@@ -18677,11 +18690,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"
|
|
@@ -19232,9 +19241,13 @@ unexpand_shvar() {
|
|
test "$#" -eq 0 && return
|
|
for n do
|
|
eval v='"$'$n'"'
|
|
- v="`echo \"$v\" | sed -e 's/${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`"
|
|
+ v="`echo \"$v\" | sed -e 's/\${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`"
|
|
if test -n "$v"; then
|
|
- expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"
|
|
+ if test -n "$expr"; then
|
|
+ expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"
|
|
+ else
|
|
+ expr="s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"
|
|
+ fi
|
|
case "$v" in #(
|
|
*'${'*'}'*) :
|
|
expr="$expr;s|$v|\"\${$n}\"|g" ;; #(
|
|
@@ -19243,7 +19256,7 @@ unexpand_shvar() {
|
|
esac
|
|
fi
|
|
done
|
|
- expr='s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g'
|
|
+ expr='s/\${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g'
|
|
eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"'
|
|
}
|
|
|
|
@@ -20906,17 +20919,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)' ;; #(
|