support clang build

Signed-off-by: luofeng14 <luofeng13@huawei.com>

subversion-1.14.3-fix-build-errors.patch

@@ -0,0 +1,34 @@
+From 628738a55d5ce1d585011d919ab0b5f5ea25d095 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 16 Nov 2023 19:35:54 +0800
+Subject: [PATCH] support clang build
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7d65f01..e94472d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -156,7 +156,7 @@ SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
+ SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
+ SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
+ SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
+-SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
++SWIG_RB_COMPILE = @CC@
+ SWIG_RB_LINK = @SWIG_RB_LINK@
+ SWIG_RB_LIBS = @SWIG_RB_LIBS@
+ SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@
+@@ -306,7 +306,7 @@ LINK_SHARED_ONLY_CXX_LIB = $(LINK_CXX_LIB) $(shared_only_LDFLAGS) -shared
+ 
+ # Compilation of SWIG-generated C source code
+ COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
+-COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@
++COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@
+ 
+ # these commands link the wrapper objects into an extension library/module
+ LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
+-- 
+2.19.1
+

subversion.spec

@@ -10,7 +10,7 @@
 Summary: Subversion, a version control system.
 Name: subversion
 Version: 1.14.3
-Release: 1
+Release: 2
 License: ASL 2.0
 URL: https://subversion.apache.org/
 
@@ -21,6 +21,7 @@ Patch1: subversion-1.14.0-testwarn.patch
 Patch2: subversion-1.14.0-soversion.patch
 Patch3: subversion-1.8.0-rubybind.patch
 Patch4: subversion-1.8.5-swigplWall.patch
+Patch5: subversion-1.14.3-fix-build-errors.patch
 
 BuildRequires: autoconf libtool texinfo which swig gettext apr-devel apr-util-devel libserf-devel cyrus-sasl-devel sqlite-devel file-devel utf8proc-devel lz4-devel apr-util-openssl dbus-devel, libsecret-devel httpd-devel 
 Requires: httpd
@@ -116,7 +117,11 @@ export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
 
 export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
-export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
+export CC=%{__cc} CXX=%{__cxx} JAVA_HOME=%{jdk_path}
+ 
+%if "%{?toolchain}" == "clang"
+    CFLAGS="${CFLAGS:-%{?build_cflags}} -Wno-error=int-conversion"; export CFLAGS;
+%endif
 
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --disable-debug \
@@ -314,6 +319,12 @@ make check-javahl
 %endif
 
 %changelog
+* Thu Feb 22 2024 luofeng <luofeng13@huawei.com> - 1.14.3-2
+- Type:enhencement
+- CVE:NA
+- SUG:NA
+- DESC: support clang build
+
 * Wed Jan 03 2024 fuanan <fuanan3@h-partners.com> - 1.14.3-1
 - update version to 1.14.3