mirror of
https://git.freebsd.org/ports.git
synced 2025-06-04 12:26:27 -04:00
85 lines
3.4 KiB
Text
85 lines
3.4 KiB
Text
--- configure.in.orig 2015-02-22 17:12:34.000000000 +0900
|
|
+++ configure.in 2015-03-06 07:24:47.938830390 +0900
|
|
@@ -616,7 +616,7 @@
|
|
[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
|
|
[
|
|
echo "provider conftest{ probe fire(); };" > conftest_provider.d
|
|
- if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
|
|
+ if $DTRACE -xnolibs -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
|
|
# DTrace is available on the system
|
|
rb_cv_dtrace_available=yes
|
|
else
|
|
@@ -637,14 +637,14 @@
|
|
probe fire();
|
|
};
|
|
_PROBES
|
|
- $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
|
|
+ $DTRACE -xnolibs -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
|
|
cat >conftest.c <<_CONF &&
|
|
@%:@include "conftest_provider.h"
|
|
int main(void){ CONFTEST_FIRE(); return 0; }
|
|
_CONF
|
|
$CC $CFLAGS $CPPFLAGS -c -o conftest.o conftest.c &&
|
|
cp -p conftest.o conftest.oo &&
|
|
- $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null
|
|
+ $DTRACE -xnolibs -G -s conftest_provider.d conftest.o 2>/dev/null
|
|
}; then
|
|
rb_cv_prog_dtrace_g=yes
|
|
cmp -b conftest.o conftest.oo || rb_cv_prog_dtrace_g=rebuild
|
|
@@ -1141,10 +1141,10 @@
|
|
],
|
|
[ LIBS="-lm $LIBS"])
|
|
|
|
-AC_CHECK_LIB(crypt, crypt) # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
|
|
-AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
|
|
-AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
|
|
-AC_CHECK_LIB(socket, shutdown) # SunOS/Solaris
|
|
+AC_SEARCH_LIBS(crypt, crypt) # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
|
|
+AC_SEARCH_LIBS(dlopen, dl) # Dynamic linking for SunOS/Solaris and SYSV
|
|
+AC_SEARCH_LIBS(shl_load, dld) # Dynamic linking for HP-UX
|
|
+AC_SEARCH_LIBS(shutdown, socket) # SunOS/Solaris
|
|
|
|
dnl Checks for header files.
|
|
AC_HEADER_DIRENT
|
|
@@ -2236,7 +2236,7 @@
|
|
if test x"$ac_cv_func_clock_gettime" != xyes; then
|
|
# glibc 2.17 moves clock_* functions from librt to the main C library.
|
|
# http://sourceware.org/ml/libc-announce/2012/msg00001.html
|
|
- AC_CHECK_LIB(rt, clock_gettime)
|
|
+ AC_SEARCH_LIBS(clock_gettime, rt)
|
|
if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
|
|
AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
|
|
fi
|
|
@@ -2638,7 +2638,7 @@
|
|
fi
|
|
|
|
if test x"$enable_pthread" = xyes; then
|
|
- for pthread_lib in thr pthread pthreads c c_r root; do
|
|
+ for pthread_lib in pthread thr pthreads c c_r root; do
|
|
AC_CHECK_LIB($pthread_lib, pthread_kill,
|
|
rb_with_pthread=yes, rb_with_pthread=no)
|
|
if test "$rb_with_pthread" = "yes"; then break; fi
|
|
@@ -2652,6 +2652,7 @@
|
|
[c], [],
|
|
[root], [],
|
|
[c_r], [MAINLIBS="-pthread $MAINLIBS"],
|
|
+ [pthread], [MAINLIBS="-pthread $MAINLIBS"],
|
|
[AS_CASE(["$target_os"],
|
|
[openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
|
|
[LIBS="-l$pthread_lib $LIBS"])])
|
|
@@ -2936,7 +2937,6 @@
|
|
: ${LDSHARED='$(CC) -shared'}
|
|
if test "$rb_cv_binary_elf" = yes; then
|
|
LDFLAGS="$LDFLAGS -rdynamic"
|
|
- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
|
|
else
|
|
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
|
|
fi
|
|
@@ -3446,6 +3446,7 @@
|
|
[freebsd*|dragonfly*], [
|
|
SOLIBS='$(LIBS)'
|
|
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
|
|
+ LIBRUBY_DLDFLAGS='-Wl,-soname,$(LIBRUBY_SO)'
|
|
if test "$rb_cv_binary_elf" != "yes" ; then
|
|
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
|
|
LIBRUBY_ALIASES=''
|