!51 [sync] PR-48: Support build with clang

From: @openeuler-sync-bot 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu

subversion.spec

@@ -10,7 +10,7 @@
 Summary: Subversion, a version control system.
 Name: subversion
 Version: 1.14.3
-Release: 3
+Release: 4
 License: ASL 2.0
 URL: https://subversion.apache.org/
 
@@ -22,6 +22,9 @@ 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
+%if "%{?toolchain}" == "clang"
+Patch6: support-clang-build.patch
+%endif
 
 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
@@ -118,10 +121,6 @@ export svn_cv_ruby_sitedir_archsuffix=""
 
 export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
 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 \
@@ -319,6 +318,12 @@ make check-javahl
 %endif
 
 %changelog
+* Mon Apr 1 2024 luofeng <luofeng13@huawei.com> - 1.14.3-4
+- Type:enhencement
+- CVE:NA
+- SUG:NA
+- DESC: support clang build
+
 * Fri Mar 29 2024 liyuzhe <liyuzhe@cqsoftware.com.cn> - 1.14.3-3
 - Remove non-standard requires from the help subpackage
 

support-clang-build.patch

@@ -0,0 +1,25 @@
+From 3ccb72b8139788450e779576ad19741180adda39 Mon Sep 17 00:00:00 2001
+From: luofeng <luofeng13@huawei.com>
+Date: Wed, 3 Apr 2024 10:20:33 +0800
+Subject: [PATCH] support clang build
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e6996a6..56c2361 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -223,7 +223,7 @@ COMPILE_SHARED_ONLY_CXX_LIB = $(LT_COMPILE_CXX) -o $@ -c -shared
+ # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
+ COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
+ COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
+-COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
++COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c
+ 
+ # special compilation for files destined for javahl (i.e. C++)
+ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
+-- 
+2.19.1
+