From 4a30bfb4108bca389bae4482de2d9f34900e03f0 Mon Sep 17 00:00:00 2001
From: zhangchao13 <chaozhangm@isoftstone.com>
Date: Fri, 21 Apr 2023 14:49:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=20issue:=E6=BA=90=E4=BB=A3=E7=A0=81=20MakeI?=
 =?UTF-8?q?nclude=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-vconfig-fix-cc.patch | 32 ++++++++++++++++++++++++++++++++
 vconfig.spec              |  6 +++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0001-vconfig-fix-cc.patch

diff --git a/0001-vconfig-fix-cc.patch b/0001-vconfig-fix-cc.patch
new file mode 100644
index 0000000..1aee330
--- /dev/null
+++ b/0001-vconfig-fix-cc.patch
@@ -0,0 +1,32 @@
+From 9596594bf3d7d12785e6e0233e20b8d697557c00 Mon Sep 17 00:00:00 2001
+From: zhangchao13 <chaozhangm@isoftstone.com>
+Date: Fri, 21 Apr 2023 14:44:49 +0800
+Subject: [PATCH] vconfig-fix-cc
+
+---
+ MakeInclude | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/MakeInclude b/MakeInclude
+index f518572..0d83ea3 100644
+--- a/MakeInclude
++++ b/MakeInclude
+@@ -25,11 +25,11 @@ ARM_TC_LIB = ${HOME}/Intrinsyc/lib
+ ifeq "${PLATFORM}" "ARM"
+    #echo "Building for ARM platform."
+    STRIP=${ARM_TC_BIN}/arm-linux-strip
+-   CC = ${ARM_TC_BIN}/arm-linux-gcc       # this is generally the c compiler, unused AFAIK
+-   CCC = ${ARM_TC_BIN}/arm-linux-g++      # this is generally the c++ compiler
++   CC ?= ${ARM_TC_BIN}/arm-linux-gcc       # this is generally the c compiler, unused AFAIK
++   CCC ?= ${ARM_TC_BIN}/arm-linux-g++      # this is generally the c++ compiler
+ else
+    #echo "Building for x86 platform."
+    STRIP=strip
+-   CC = gcc       # this is generally the c compiler, unused AFAIK
+-   CCC = g++      # this is generally the c++ compiler
++   CC ?= gcc       # this is generally the c compiler, unused AFAIK
++   CCC ?= g++      # this is generally the c++ compiler
+ endif
+-- 
+2.33.0
+
diff --git a/vconfig.spec b/vconfig.spec
index d46facf..c7cecb2 100644
--- a/vconfig.spec
+++ b/vconfig.spec
@@ -1,6 +1,6 @@
 Name:       	vconfig
 Version:    	1.9
-Release:    	26
+Release:    	27
 Summary:    	802.1Q VLAN implementation for Linux
 License:    	GPLv2+
 
@@ -8,6 +8,7 @@ URL:        	https://www.candelatech.com/~greear/vlan.html
 Source0:     	https://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz
 
 Patch0:     	%{name}-1.9-Pass-compilation-with-Werror-format-security.patch
+Patch1:         0001-vconfig-fix-cc.patch
 BuildRequires:  coreutils gcc make
 
 %description 
@@ -39,5 +40,8 @@ install -D -m644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Fri Apr 21 2023 Zhang Chao <chaozhangm@isoftstone.com> - 1.9-27
+- Fix CC compiler support
+
 * Fri Oct 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.9-26
 - Package init