fix issue:源代码 MakeInclude 文件指定了使用 gcc 编译器进行编译,导致编译失败。

This commit is contained in:
zhangchao13 2023-04-21 14:49:33 +08:00
parent f289d0f18a
commit 4a30bfb410
2 changed files with 37 additions and 1 deletions

32
0001-vconfig-fix-cc.patch Normal file
View File

@ -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

View File

@ -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