mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

lang/ruby19: switch to USES=execinfo

Browse Source 
PR:		193411
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
This commit is contained in:
Steve Wills 2014-09-14 15:50:46 +00:00
parent 56fd72023a
commit cc25da86ea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=368194
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/ruby19/Makefile
View File

@ -17,8 +17,7 @@ COMMENT?= Object-oriented interpreted scripting language
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libyaml.so:${PORTSDIR}/textproc/libyaml
LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
@ -69,7 +68,7 @@ RDOC_CONFIGURE_OFF= --disable-install-rdoc
.include <bsd.port.options.mk>
USES= tar:bzip2 cpe
USES= cpe execinfo tar:bzip2
CPE_VENDOR= ruby-lang
CPE_VERSION= ${RUBY_RELVERSION}

28
lang/ruby19/files/patch-configure.in
View File

@ -1,6 +1,6 @@
--- configure.in.orig 2014-03-20 05:49:55.847385089 +0000
+++ configure.in 2014-03-20 05:50:09.238383528 +0000
@@ -1139,11 +1139,11 @@
--- configure.in.orig 2014-02-14 20:52:53.000000000 +0900
+++ configure.in 2014-09-07 15:25:14.000000000 +0900
@@ -1184,11 +1184,11 @@
[superux*], [ ac_cv_func_setitimer=no
],
[ LIBS="-lm $LIBS"])
@ -17,7 +17,7 @@
if test "${enable_win95}" = maybe; then
AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
fi
@@ -1789,7 +1789,7 @@
@@ -1834,7 +1834,7 @@
fi
if test x"$enable_pthread" = xyes; then
@ -26,7 +26,7 @@
AC_CHECK_LIB($pthread_lib, pthread_kill,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then break; fi
@@ -1803,6 +1803,7 @@
@@ -1848,6 +1848,7 @@
[c], [],
[root], [],
[c_r], [MAINLIBS="-pthread $MAINLIBS"],
@ -34,7 +34,21 @@
[AS_CASE(["$target_os"],
[openbsd*], [LIBS="-pthread $LIBS"],
[LIBS="-l$pthread_lib $LIBS"])])
@@ -2041,7 +2042,6 @@
@@ -1933,11 +1934,8 @@
AS_CASE(["$target_os"],
[freebsd*], [
- AC_CHECK_HEADERS([/usr/local/include/execinfo.h])
- if test "x$ac_cv_header__usr_local_include_execinfo_h" = xyes; then :
- RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
- LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
- DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }-L/usr/local/lib"
+ AC_CHECK_HEADERS([execinfo.h])
+ if test "x$ac_cv_header_execinfo_h" = xyes; then :
AC_CHECK_LIB([execinfo], [backtrace])
fi])
AC_CHECK_FUNCS(backtrace)
@@ -2086,7 +2084,6 @@
: ${LDSHARED='$(CC) -shared'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -rdynamic"
@ -42,7 +56,7 @@
else
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
@@ -2348,6 +2348,7 @@
@@ -2393,6 +2390,7 @@
[freebsd*|dragonfly*], [
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'