c/pve-kernel-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove gcc check completely, we have build dependencies for that

Browse Source 
RETPOLINE is now for sure included, further as this is build through
buildpackage the build dependencies are checked

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-05-22 14:01:09 +02:00
parent b8e09c3c69
commit 2135c72329
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -29,12 +29,6 @@ GITVERSION:=$(shell git rev-parse HEAD)
SKIPABI=0 SKIPABI=0
ifeq ($(CC), cc)
GCC=gcc
else
GCC=$(CC)
endif
BUILD_DIR=build BUILD_DIR=build
KERNEL_SRC=ubuntu-disco KERNEL_SRC=ubuntu-disco
@ -57,17 +51,9 @@ LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB} DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}
all: check_gcc deb all: deb
deb: ${DEBS} deb: ${DEBS}
check_gcc:
$(GCC) --version|grep "8\.3" || false
@$(GCC) -Werror -mindirect-branch=thunk-extern -mindirect-branch-register -c -x c /dev/null -o check_gcc.o \
|| ( rm -f check_gcc.o; \
echo "Please install gcc-6 packages with indirect thunk / RETPOLINE support"; \
false)
@rm -f check_gcc.o
${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB} ${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB}
${DST_DEB}: ${BUILD_DIR}.prepared ${DST_DEB}: ${BUILD_DIR}.prepared
cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us

2
debian/control.in vendored
View File

@ -10,7 +10,7 @@ Build-Depends: asciidoc-base,
debhelper (>= 10~), debhelper (>= 10~),
file, file,
flex, flex,
gcc (>= 6.3.0-18+deb9u1), gcc (>= 8.3.0-6),
git, git,
kmod, kmod,
libdw-dev, libdw-dev,