From: Maria Matejka <mq@ucw.cz>
Date: Mon, 15 Feb 2021 17:23:15 +0000 (+0100)
Subject: Multithreaded BIRD needs reasonably new software to compile
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5acb082acf829c174c6f4524dff8d1f66a088f17;p=thirdparty%2Fbird.git

Multithreaded BIRD needs reasonably new software to compile
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c54b61bc4..28ec8e6f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,21 +134,11 @@ docker_fedora-34-amd64:
     IMG_NAME: "fedora-34-amd64"
   <<: *docker_build
 
-docker_centos-7-amd64:
-  variables:
-    IMG_NAME: "centos-7-amd64"
-  <<: *docker_build
-
 docker_centos-8-amd64:
   variables:
     IMG_NAME: "centos-8-amd64"
   <<: *docker_build
 
-docker_ubuntu-14_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-14.04-amd64"
-  <<: *docker_build
-
 docker_ubuntu-16_04-amd64:
   variables:
     IMG_NAME: "ubuntu-16.04-amd64"
@@ -312,18 +302,10 @@ build-fedora-34-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
 
-build-centos-7-amd64:
-  <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
-
 build-centos-8-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:centos-8-amd64
 
-build-ubuntu-14_04-amd64:
-  <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64
-
 build-ubuntu-16_04-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
@@ -468,13 +450,6 @@ pkg-fedora-34-amd64:
   needs: [build-fedora-34-amd64]
   image: registry.labs.nic.cz/labs/bird:fedora-34-amd64
 
-pkg-centos-7-amd64:
-  <<: *pkg-rpm-wa
-  variables:
-    LC_ALL: en_US.UTF-8
-  needs: [build-centos-7-amd64]
-  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
-
 pkg-centos-8-amd64:
   <<: *pkg-rpm-wa
   needs: [build-centos-8-amd64]
diff --git a/INSTALL b/INSTALL
index 7a1792844..c1094ee59 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,9 +27,9 @@ Requirements
 
 For compiling BIRD you need these programs and libraries:
 
- - GNU C Compiler (or LLVM Clang)
+ - GNU C Compiler (or LLVM Clang) capable of compiling C11 code
  - GNU Make
- - GNU Bison
+ - GNU Bison (at least 3.0)
  - GNU M4
  - Flex