mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-04 02:08:49 -04:00
111 lines
3.3 KiB
Plaintext
111 lines
3.3 KiB
Plaintext
$NetBSD: patch-configure,v 1.1 2014/03/14 19:40:47 taca Exp $
|
|
|
|
* Adding Interix and MirBSD support.
|
|
* Ignore doxygen.
|
|
|
|
--- configure.orig 2013-12-20 12:22:22.000000000 +0000
|
|
+++ configure
|
|
@@ -8430,6 +8430,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"
|
|
@@ -16063,6 +16067,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>
|
|
@@ -19811,7 +19817,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*) :
|
|
|
|
@@ -20797,7 +20805,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=''
|
|
@@ -20876,7 +20884,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*) :
|
|
|
|
@@ -21034,7 +21047,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"
|
|
@@ -21210,11 +21223,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"
|
|
@@ -21799,7 +21808,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
|
|
|
|
|
|
@@ -23305,17 +23314,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)' ;; #(
|