Date: Tue, 11 Jul 2017 21:03:09 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445549 - in head: Mk lang/ruby22 lang/ruby23 lang/ruby24 Message-ID: <201707112103.v6BL39Sn085764@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Jul 11 21:03:09 2017 New Revision: 445549 URL: https://svnweb.freebsd.org/changeset/ports/445549 Log: lang/ruby2{2,3,4}: require libunwind Since ruby detects this if it's installed, and it's more often installed now due to other deps, and ruby provides no way to not depend on it if it's found, pull it in as a dependency unconditionally. While here, fix plist for ruby 2.4 with the CAPIDOCS option on, and restore the MAKE_JOBS_UNSAFE flag when using that build option since it's not fixed like I thought it was. PR: 219796 Reported by: Grzegorz Junka <list1@gjunka.com> Modified: head/Mk/bsd.ruby.mk head/lang/ruby22/Makefile head/lang/ruby23/Makefile head/lang/ruby24/Makefile head/lang/ruby24/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Tue Jul 11 20:03:10 2017 (r445548) +++ head/Mk/bsd.ruby.mk Tue Jul 11 21:03:09 2017 (r445549) @@ -155,7 +155,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} # Ruby 2.2 # RUBY_RELVERSION= 2.2.7 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY22= "" # PLIST_SUB helpers @@ -165,7 +165,7 @@ RUBY22= "" # PLIST_SUB helpers # Ruby 2.3 # RUBY_RELVERSION= 2.3.4 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY23= "" # PLIST_SUB helpers @@ -175,7 +175,7 @@ RUBY23= "" # PLIST_SUB helpers # Ruby 2.4 # RUBY_RELVERSION= 2.4.1 -RUBY_PORTREVISION= 1 +RUBY_PORTREVISION= 2 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY24= "" # PLIST_SUB helpers Modified: head/lang/ruby22/Makefile ============================================================================== --- head/lang/ruby22/Makefile Tue Jul 11 20:03:10 2017 (r445548) +++ head/lang/ruby22/Makefile Tue Jul 11 21:03:09 2017 (r445549) @@ -93,6 +93,11 @@ CONFIGURE_ARGS+= --disable-dtrace .endif .endif +# keep in sync with all platforms where libunwind is available +.if (${ARCH} == "amd64" || ${ARCH} == "i386") +LIB_DEPENDS+= libunwind.so:devel/libunwind +.endif + .if ${ARCH} == "powerpc64" USE_GCC= yes .endif Modified: head/lang/ruby23/Makefile ============================================================================== --- head/lang/ruby23/Makefile Tue Jul 11 20:03:10 2017 (r445548) +++ head/lang/ruby23/Makefile Tue Jul 11 21:03:09 2017 (r445549) @@ -93,6 +93,11 @@ CONFIGURE_ARGS+=--disable-dtrace .endif .endif +# keep in sync with all platforms where libunwind is available +.if (${ARCH} == "amd64" || ${ARCH} == "i386") +LIB_DEPENDS+= libunwind.so:devel/libunwind +.endif + .if ${ARCH} == "powerpc64" USE_GCC= yes .endif Modified: head/lang/ruby24/Makefile ============================================================================== --- head/lang/ruby24/Makefile Tue Jul 11 20:03:10 2017 (r445548) +++ head/lang/ruby24/Makefile Tue Jul 11 21:03:09 2017 (r445549) @@ -94,6 +94,11 @@ CONFIGURE_ARGS+=--disable-dtrace .endif .endif +# keep in sync with all platforms where libunwind is available +.if (${ARCH} == "amd64" || ${ARCH} == "i386") +LIB_DEPENDS+= libunwind.so:devel/libunwind +.endif + .if (${ARCH} == "powerpc64" || ${ARCH} == "powerpc") USE_GCC= yes .endif @@ -101,6 +106,10 @@ USE_GCC= yes .if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" CONFIGURE_ARGS+=--with-setjmp-type=_setjmp CONFIGURE_ENV+= ac_cv_func__setjmp=yes +.endif + +.if ${PORT_OPTIONS:MCAPIDOCS} +MAKE_JOBS_UNSAFE= yes .endif .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} Modified: head/lang/ruby24/pkg-plist ============================================================================== --- head/lang/ruby24/pkg-plist Tue Jul 11 20:03:10 2017 (r445548) +++ head/lang/ruby24/pkg-plist Tue Jul 11 21:03:09 2017 (r445549) @@ -1862,6 +1862,8 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d48/nkf_8h__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d48/nkf_8h__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d48/nkf_8h__incl.png +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d49/etc_2constdefs_8h.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d49/etc_2constdefs_8h_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d49/return__sc_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d49/return__sc_8c_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/d4f/structtest__structure__4.html @@ -1946,8 +1948,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db4/fiddle_8c__incl.png %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc0/closure__simple_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc0/closure__simple_8c_source.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc4/constdefs_8h.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc4/constdefs_8h_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc5/continuation_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc5/continuation_8c__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/dc5/continuation_8c__incl.png @@ -2191,6 +2191,8 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dca/strscan_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dca/strscan_8c__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dca/strscan_8c__incl.png +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dd1/socket_2constdefs_8h.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dd1/socket_2constdefs_8h_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dd7/ossl__config_8h.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dd7/ossl__config_8h_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d5/dd9/reader_8c.html @@ -2332,6 +2334,9 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d60/nkf_2nkf-utf8_2config_8h__dep__incl.png %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d61/float3_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d61/float3_8c_source.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d64/etc_2constdefs_8h__dep__incl.map +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d64/etc_2constdefs_8h__dep__incl.md5 +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d64/etc_2constdefs_8h__dep__incl.png %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d69/structstruct__108byte.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d6a/proc_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d6/d6a/proc_8c__incl.md5 @@ -3006,6 +3011,9 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d32/tcpserver_8c_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d34/resolv_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d34/resolv_8c_source.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d34/socket_2constdefs_8h__dep__incl.map +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d34/socket_2constdefs_8h__dep__incl.md5 +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d34/socket_2constdefs_8h__dep__incl.png %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d3a/cls__12byte_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d3a/cls__12byte_8c__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d9/d3a/cls__12byte_8c__incl.png @@ -3366,9 +3374,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/dda/generator_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/dda/generator_8c__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/dda/generator_8c__incl.png -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/ddc/constdefs_8h__dep__incl.map -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/ddc/constdefs_8h__dep__incl.md5 -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/ddc/constdefs_8h__dep__incl.png %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/dde/id__table_8h__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/dde/id__table_8h__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/dde/id__table_8h__incl.png @@ -3439,8 +3444,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d31/structfpreg.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3a/tgamma_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3a/tgamma_8c_source.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/conftest_8c.html -%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/conftest_8c_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/ossl__pkey_8h.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/ossl__pkey_8h_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3f/cls__pointer_8c.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707112103.v6BL39Sn085764>