From 5b4bf4a28c30094d50d82de887d996ab0ac722eb Mon Sep 17 00:00:00 2001
From: zhangchao13 <chaozhangm@isoftstone.com>
Date: Mon, 24 Apr 2023 14:38:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20issue:=E6=BA=90=E4=BB=A3=E7=A0=81=20Makef?=
 =?UTF-8?q?ile=20=E6=96=87=E4=BB=B6=E6=8C=87=E5=AE=9A=E4=BA=86=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20gcc=20=E7=BC=96=E8=AF=91=E5=99=A8=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 0001-java-service-wrapper-fix-cc.patch | 41 ++++++++++++++++++++++++++
 java-service-wrapper.spec              |  7 ++++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 0001-java-service-wrapper-fix-cc.patch

diff --git a/0001-java-service-wrapper-fix-cc.patch b/0001-java-service-wrapper-fix-cc.patch
new file mode 100644
index 0000000..5ee2479
--- /dev/null
+++ b/0001-java-service-wrapper-fix-cc.patch
@@ -0,0 +1,41 @@
+From 71552069ff74d83aa8483b70867f3a1a2259152a Mon Sep 17 00:00:00 2001
+From: zhangchao13 <chaozhangm@isoftstone.com>
+Date: Mon, 24 Apr 2023 16:26:52 +0800
+Subject: [PATCH] java-service-wrapper-fix-cc
+
+---
+ src/c/Makefile-linux-arm-32.make     | 3 ++-
+ src/c/Makefile-linux-ppc64le-64.make | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/c/Makefile-linux-arm-32.make b/src/c/Makefile-linux-arm-32.make
+index 08c097f..b10d542 100644
+--- a/src/c/Makefile-linux-arm-32.make
++++ b/src/c/Makefile-linux-arm-32.make
+@@ -23,7 +23,8 @@
+ 
+ # This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
+ # If you know how to fix it then please help out.
+-COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC --pedantic
++CC ?= gcc
++COMPILE = $(CC) ${RPM_OPT_FLAGS} -fPIC --pedantic
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+diff --git a/src/c/Makefile-linux-ppc64le-64.make b/src/c/Makefile-linux-ppc64le-64.make
+index 557423a..10fcc1b 100644
+--- a/src/c/Makefile-linux-ppc64le-64.make
++++ b/src/c/Makefile-linux-ppc64le-64.make
+@@ -23,7 +23,8 @@
+ 
+ # This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
+ # If you know how to fix it then please help out.
+-COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC --pedantic
++CC ?= gcc
++COMPILE = $(CC) ${RPM_OPT_FLAGS} -fPIC --pedantic
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+-- 
+2.33.0
+
diff --git a/java-service-wrapper.spec b/java-service-wrapper.spec
index 92474dd..133f171 100644
--- a/java-service-wrapper.spec
+++ b/java-service-wrapper.spec
@@ -13,7 +13,7 @@
 %global cocoon  cocoon-2.0.4
 Name:                java-service-wrapper
 Version:             3.2.5
-Release:             2
+Release:             3
 Summary:             Java service wrapper
 License:             MIT
 URL:                 https://bitbucket.org/ivertex/yaja-wrapper
@@ -31,6 +31,7 @@ Patch3:              %{name}-3.2.5-rhbz1037144.patch
 Patch98:             Use-RPM_OPT_FLAGS-on-s390x.patch
 Patch99:             ppc64le-support.patch
 Patch100:            add-riscv64-support.patch
+Patch101:            0001-%{name}-fix-cc.patch
 BuildRequires:       ant javapackages-local gcc make
 %description
 The Java Service Wrapper enables a Java application to be run as a
@@ -53,6 +54,7 @@ sed -e 's|@LIBPATH@|%{_libdir}/%{name}|' %{PATCH1} | %{__patch} -p1 -F 0
 %patch98 -p1
 %patch99 -p1
 %patch100 -p1
+%patch101 -p1
 %if %{with docs}
 mkdir tools ; cd tools
 tar xf %{SOURCE3}
@@ -90,6 +92,9 @@ install -pm 755 lib/libwrapper.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %license doc/license.txt
 
 %changelog
+* Mon Apr 24 2023 Zhang Chao <chaozhangm@isoftstone.com> - 3.2.5-3
+- Fix CC compiler support
+
 * Wed Feb 22 2023 misaka00251 <liuxin@iscas.ac.cn> - 3.2.5-2
 - Fix riscv64 support.
 
-- 
Gitee