.gitlab-ci/testcases/test_kernel.py

@@ -15,9 +15,21 @@ def test_aports_kernel(args):
     """
     Various tests performed on the /**/linux-* aports.
     """
-    for path in glob.iglob(args.aports + "**/linux-*/APKBUILD", recursive=True):
+
+    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
         apkbuild = pmb.parse.apkbuild(args, path)
+        aport_name = os.path.basename(os.path.dirname(path))
 
         if "pmb:cross-native" not in apkbuild["options"]:
-            raise RuntimeError("\"pmb:cross-native\" missing in"
-                               f" options= line: {path}")
+            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
+                               " options= line")
+
+        # cross-compilers should not be in makedepends
+        for ccc in ["gcc-armv7", "gcc-armhf", "gcc-aarch64",
+                    "gcc4-armv7", "gcc4-armhf", "gcc4-aarch64",
+                    "gcc6-armv7", "gcc6-armhf", "gcc6-aarch64"]:
+            if ccc in apkbuild["makedepends"]:
+                raise RuntimeError(f"{aport_name}: Cross-compiler ({ccc}) should"
+                                   " not be explicitly specified in makedepends!"
+                                   " pmbootstrap installs cross-compiler"
+                                   " automatically.")

cross/gcc-aarch64/0001-posix_memalign.patch

-From 00951a574e9698d8549cc5ea1793059849cab47f Mon Sep 17 00:00:00 2001
+From 0f6c64b962bb3bf75f15aec350a9d6f8997fa814 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH] posix_memalign
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
    else
      return NULL;
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0002-gcc-poison-system-directories.patch

-From 0cd08ecfaf79062115dd12744068970502b99c01 Mon Sep 17 00:00:00 2001
+From 2f5ca6e3850401c628c5cc18cd606134e8b29113 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
 Subject: [PATCH] gcc: poison-system-directories
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch

-From f0338445838d12a82c803c1579653332e2710157 Mon Sep 17 00:00:00 2001
+From ef512b8fcf9c7628267ff2dbb127aa094f6754f3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
@@ -35,5 +35,5 @@ index b2200c5185a..625c9ab7902 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch

-From 6aa52d7bf25389177c389ea77eb477e7952d1154 Mon Sep 17 00:00:00 2001
+From 3c848f2fbde81db336ec97d9be7a5a4a05015eef Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -42,5 +42,5 @@ index 17d371ef432..fe793ac08db 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch

-From 7b624ee24d9299889c35c84303811012f8b8f1d2 Mon Sep 17 00:00:00 2001
+From 3a2f4efa70110f6d11fd4c6a8e11559c6ef720f1 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch

-From 7eed1ed7399593864a097360f778e2409deb663c Mon Sep 17 00:00:00 2001
+From 44b1a01cbe3932122112f38e06a21b1c9efad568 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
  
  Wformat-overflow=
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch

-From 63c5bf27194fbc27c6630f325b5d976aad87c5d5 Mon Sep 17 00:00:00 2001
+From 5679adc04a200e3a1a8dd77466eb79d03da8bf8a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH] Enable -Wtrampolines by default.
@@ -21,5 +21,5 @@ index ca942863064..0a0ab6195ee 100644
  
  Wtype-limits
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch

-From c28375576bd7ab89389c9208447a490596aa759f Mon Sep 17 00:00:00 2001
+From 0bff64690e937297abc75eee5a2916fdd314b054 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch

-From 85baea39858509dacfc235396f6fbd79ac23d50d Mon Sep 17 00:00:00 2001
+From 27863679bde671cdd354cba398ef71a956873e6a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch

-From fb7d03c7ea97fc785327fd00b302c7ac17779837 Mon Sep 17 00:00:00 2001
+From 953779008f2caa78c55f80c2d6096bf627080016 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch

-From 07467a2a24bd15a6a28154a33441adc1291789d6 Mon Sep 17 00:00:00 2001
+From b43185f44ed438267db101fbe41361001c4e8a94 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
  	else true; fi
  
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch

-From 07517ed455bf3f03b1be7a5c72d3705b22780a15 Mon Sep 17 00:00:00 2001
+From 10f38bef9af2e3d6a32253ca18d5ae0123e25e1b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:36 +0000
 Subject: [PATCH] libitm: disable FORTIFY
@@ -29,5 +29,5 @@ index d1beb5c9ec8..c2b50b95c01 100644
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0013-libgcc_s.patch

-From b74afde10094923279a408ff56ea99cff6c259ae Mon Sep 17 00:00:00 2001
+From 3614b3586d4a0f75e454943895977a9df1b734d5 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0014-nopie.patch

-From e73096ae33c1ebf2833deab647ca825229c533f1 Mon Sep 17 00:00:00 2001
+From 8e58f9aa5b86dc92e5a1fa71e40e499739473894 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie
@@ -71,5 +71,5 @@ index bf64ffbe46f..9c2571de709 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch

-From d56bf713ed0d248fccb445ac475ad69d9430bb96 Mon Sep 17 00:00:00 2001
+From c5ee6bb497f640877be668428292487eb026d79e Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:09 +0000
 Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
@@ -21,5 +21,5 @@ index 721ff00ea43..22a699c6340 100644
     with both write and execute permission.  Code compiled when this
     option is defined will attempt to map such pages once, but if it
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch

-From 6175b540b25a9d899772a7354a6ac2ae77c311ae Mon Sep 17 00:00:00 2001
+From b2e1bf216169f470ced86f1f3e95c89debf606cd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:51 +0000
 Subject: [PATCH] dlang: update zlib binding
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
  }
  
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch

-From 578f3d719c1154a38a5cf84217e3cb124da45ad8 Mon Sep 17 00:00:00 2001
+From 76c7eb27b9dfe96f2f1db4fa6f29ce28715ad2a4 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:58:22 +0000
 Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
@@ -47,5 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0018-ada-fix-shared-linking.patch

-From b3bcc4fc43170f9914772c543778560c5e473fae Mon Sep 17 00:00:00 2001
+From 95fee2cfb1a6a32b7e671861b58ee93978ba16b8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.31.0
+2.31.1
 

cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

-From e85513f5bb1884b60d0e261e23366c3291b50d67 Mon Sep 17 00:00:00 2001
+From aa0311c59892d7fbc4ffa9e2f0520391521cc4dd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.31.0
+2.31.1