diff --git a/0001-java-service-wrapper-fix-cc.patch b/0001-java-service-wrapper-fix-cc.patch new file mode 100644 index 0000000000000000000000000000000000000000..5ee24796656f97767c242b93e780f09787411c2d --- /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 +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 92474dd74aaf68d0491aa56214c9e574e12c2f3c..133f171988480c339de491b6c57feb5b77e6220b 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 - 3.2.5-3 +- Fix CC compiler support + * Wed Feb 22 2023 misaka00251 - 3.2.5-2 - Fix riscv64 support.