Author: julianfoad
Date: Fri Sep 28 09:28:38 2018
New Revision: 1842226
URL: http://svn.apache.org/viewvc?rev=1842226&view=rev
Log:
Merge r1842090 from trunk:
* r1842090
Warn on the combination of swig-3.0.8 --with-ruby due to a known issue.
Justification:
Help users identify a known-broken configuration.
Votes:
+1: danielsh, julianfoad, jamessan
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/build/ac-macros/swig.m4
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 28 09:28:38 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1842226&r1=1842225&r2=1842226&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 28 09:28:38 2018
@@ -28,10 +28,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1842090
- Warn on the combination of swig-3.0.8 --with-ruby due to a known issue.
- Justification:
- Help users identify a known-broken configuration.
- Votes:
- +1: danielsh, julianfoad, jamessan
Modified: subversion/branches/1.11.x/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/build/ac-macros/swig.m4?rev=1842226&r1=1842225&r2=1842226&view=diff
==============================================================================
--- subversion/branches/1.11.x/build/ac-macros/swig.m4 (original)
+++ subversion/branches/1.11.x/build/ac-macros/swig.m4 Fri Sep 28 09:28:38 2018
@@ -183,6 +183,11 @@ AC_DEFUN(SVN_FIND_SWIG,
SWIG_RB_COMPILE="none"
SWIG_RB_LINK="none"
if test "$RUBY" != "none"; then
+ if test x"$SWIG_VERSION" = x"3""00""008"; then
+ # Use a local variable to escape the '#' sign.
+
ruby_swig_issue_602='https://subversion.apache.org/docs/release-notes/1.11#ruby-swig-issue-602'
+ AC_MSG_WARN([Ruby bindings are known not to support swig 3.0.8; see
$ruby_swig_issue_602])
+ fi
rbconfig="$RUBY -rrbconfig -e "
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
