On Sun, Jan 08 2023, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:

[...]

>> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/devel/subversion.txt
> subversion/bindings/swig/ruby/svn_client.c:6473:17: error: incompatible 
> pointer to integer conversion passing 'apr_hash_t *' (aka 'struct apr_hash_t 
> *') to parameter of type 'VALUE' (aka 'unsigned long') [-Wint-conversion]
>       if (NIL_P(arg2)) {
>                 ^~~~

Lots of similar failures in here.  I didn't try to fix it, but an
alternate way to handle it would be to drop the ruby bindings for the
time being (they're not used elsewhere in the tree).  Something like the
diff below.  Thoughts?


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.197
diff -u -p -r1.197 Makefile
--- Makefile    13 Nov 2022 15:28:25 -0000      1.197
+++ Makefile    15 Jan 2023 00:27:27 -0000
@@ -45,7 +45,7 @@ EXTRACT_SUFX= .tar.bz2
 
 PSEUDO_FLAVORS=        no_bindings no_ap2 no_perl no_python no_ruby 
no_gnome-keyring
 FLAVORS=       maintainer_mode
-FLAVOR?=
+FLAVOR?=       no_ruby
 .if ${FLAVOR:Mno_bindings}
 FLAVOR += no_perl no_python no_ruby
 .endif
@@ -163,6 +163,8 @@ CONFIGURE_ARGS+=--without-swig
 .if ${BUILD_PACKAGES:M-ruby}
 MODULES+=      lang/ruby
 CONFIGURE_ENV+=        RUBY=ruby${MODRUBY_BINREV} RDOC=rdoc${MODRUBY_BINREV}
+.else
+CONFIGURE_ENV+=        RUBY=false RDOC=false
 .endif
 
 .if ${BUILD_PACKAGES:M-ap2}
@@ -191,9 +193,11 @@ pre-patch:
 post-patch:
        @${SUBST_CMD} ${WRKSRC}/Makefile.in \
                ${WRKSRC}/subversion/libsvn_subr/auth.c
+.if ${BUILD_PACKAGES:M-ruby}
        mv 
${WRKSRC}/subversion/bindings/swig/ruby/libsvn_swig_ruby{,${MODRUBY_BINREV}}
        sed -i 's/libsvn_swig_ruby/libsvn_swig_ruby${MODRUBY_BINREV}/g' \
                `fgrep -lr libsvn_swig_ruby ${WRKSRC}`
+.endif
 
 .if ${BUILD_PACKAGES:M-python}
 TEST_DEPENDS+= ${FULLPKGNAME-python}:${BUILD_PKGPATH},-python

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Attachment: signature.asc
Description: PGP signature

Reply via email to