d244ed1d1f
conflict with outside gem. * Fix shared library's name on FreeBSD (tested with 8.2-STABLE). Bump PKGREVISION.
75 lines
2.1 KiB
Text
75 lines
2.1 KiB
Text
$NetBSD: patch-configure,v 1.2 2011/12/04 02:31:54 taca Exp $
|
|
|
|
* Adding Interix support.
|
|
* Ignore doxygen.
|
|
|
|
--- configure.orig 2011-10-30 09:55:52.000000000 +0000
|
|
+++ configure
|
|
@@ -10464,6 +10464,9 @@ esac
|
|
superux*) :
|
|
ac_cv_func_setitimer=no
|
|
;; #(
|
|
+ interix*) LIBS="-lm $LIBS"
|
|
+ ac_cv_func_getpgrp_void=yes
|
|
+ ;; #(
|
|
*) :
|
|
LIBS="-lm $LIBS" ;;
|
|
esac
|
|
@@ -16021,8 +16024,12 @@ esac ;; #(
|
|
rb_cv_dlopen=yes ;; #(
|
|
interix*) :
|
|
: ${LDSHARED='$(CC) -shared'}
|
|
+ LDFLAGS="$LDFLAGS -Wl,-E"
|
|
XLDFLAGS="$XLDFLAGS -Wl,-E"
|
|
+ # use special random-slot linkage in 0x[56]XXXXXXX
|
|
LIBPATHFLAG=" -L%1\$-s"
|
|
+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
|
|
+ RPATHFLAG=' -Wl,-R%1$-s'
|
|
rb_cv_dlopen=yes ;; #(
|
|
freebsd*|dragonfly*) :
|
|
|
|
@@ -16548,7 +16555,7 @@ case "$enable_shared" in #(
|
|
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=''
|
|
@@ -16626,7 +16633,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,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
|
|
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
|
|
;; #(
|
|
*) :
|
|
;;
|
|
@@ -16689,11 +16701,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"
|
|
@@ -17593,7 +17601,7 @@ ac_config_files="$ac_config_files $FIRST
|
|
ac_config_files="$ac_config_files Makefile"
|
|
|
|
|
|
-ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"
|
|
+ruby_pc="${RUBY_BASE_NAME}-${RUBY_PROGRAM_VERSION}.pc"
|
|
|
|
exec=exec
|
|
|