Commit Graph
542 Commits
Author SHA1 Message Date
Oliver Smith 7e4ddbdc55 cross/crossdirect: tweak package() variables
* make arches and compilers diff friendly
* order arches alphabetically
* rename _bin to _bin_compilers in preparation for _bin_archivers

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6763
2025-07-13 12:25:58 +02:00
Oliver Smith 4070cdc539 cross/busybox-static: upgrade to 1.37.0-r19
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6759
2025-07-09 20:32:53 +02:00
Oliver Smith b636909bed cross/gcc-*: upgrade to 14.3.0-r5
Done with pmbootstrap MR 2521.

Related: https://gitlab.alpinelinux.org/alpine/aports/-/commit/d59b0fafdf18e18e816f5aa706f54e823d2d2701

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6722
[ci:skip-build]: already built successfully in CI
2025-06-30 00:25:22 +02:00
Oliver Smith 9342e5f003 cross/musl-*: upgrade to 1.2.5-r13
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6730

[ci:skip-build]: already built successfully in CI
2025-06-29 22:37:16 +02:00
fossdd 537d07e241 cross/systemd-boot-x86: upgrade to 257.7
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6721

[ci:skip-build]: already built successfully in CI
2025-06-26 23:55:25 +02:00
Oliver Smith afa8c187a9 cross/gcc-*: upgrade to 14.3.0-r4
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6689

[ci:skip-build]: already built successfully in CI
2025-06-22 20:45:06 +02:00
Oliver Smith 35dcc9e730 cross/grub-efi-x86: upgrade to 2.12-r8
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6688

[ci:skip-build]: already built successfully in CI
2025-06-22 18:58:14 +02:00
Oliver Smith 879be2b85c cross/musl-*: upgrade to 1.2.5-r12
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6651

[ci:skip-build]: already built successfully in CI
2025-06-12 19:04:24 +02:00
Oliver Smith c2b9218453 cross/musl-*: upgrade to 1.2.5-r11
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6647

[ci:skip-build]: already built successfully in CI
2025-06-12 09:43:17 +02:00
Oliver Smith 5bc86711b1 cross/gcc-*: upgrade to 14.3.0-r3
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6619

[ci:skip-build]: already built successfully in CI
2025-06-12 09:42:07 +02:00
Oliver Smith d4c110d809 cross/gcc-*: upgrade to 14.3.0-r1
Done with pmb MR 2521. I've verified that gcc-aarch64 builds and the
following packages can be cross compiled from aarch64 to x86_64:

* hello-world
* iskey
* pbsplash
* gcc-x86_64

Related: https://gitlab.postmarketos.org/postmarketOS/continuous-testing/upstream-compat/-/blob/master/docs/how-to-fix-upstream-compat-errors.md#gcc-

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6587
[ci:skip-build]: already built successfully in CI
2025-06-01 15:09:21 +02:00
Oliver Smith 9358db8346 cross/systemd-boot-x86: upgrade to 257.6
Related: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/84963

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6574
[ci:skip-build]: already built successfully in CI
2025-05-30 14:39:22 -07:00
Clayton Craft fd96e65267 cross/busybox-static-*: upgrade to 1.37.0-r18 2025-05-29 14:18:10 -07:00
Clayton Craft f80528b498 cross/systemd-boot-x86: new aport
fixes #3711

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6506
2025-05-15 22:48:30 +02:00
Oliver Smith 3c58ddae78 cross/gcc-x86_64: fix depends line for aarch64
The gcc-x86_64 is only built for aarch64. Set the depends line to
so:libc.musl-aarch64.so.1 as we had it before 42a50731 ("cross/gcc-*:
upgrade to 14.2.0-r6"). I had set it to so:libc.musl-x86_64.so.1 like
the other cross gccs by accident.

[ci:skip-build]: I'll verify it builds locally before merge.
[ci:skip-vercheck]: version not bumped intentionally.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6501
2025-05-12 07:20:13 +02:00
Oliver Smith baadc8f89a cross/gcc-*: add depends again
Bring back manually listed soname depends that were removed in 42a50731
("cross/gcc-*: upgrade to 14.2.0-r6 "). Without these we get various
cross compiler errors (issue 3705).

How these were removed: the cross/gcc-* packages are generated from
"pmbootstrap aportgen", and the code in master currently removes those.
There was a WIP MR that adds the depends again, but it was not finished
(pmbootstrap MR 2521). This needs to be fixed in pmbootstrap and we need
a better process that ensures we can't push broken cross compilers to
master anymore if followed correctly. I'll look into all of that, but
first let's get the cross compilers working again in edge.

[ci:skip-vercheck]: for generated gccs we keep the same pkgrel as in
                    alpine. I'll force a rebuild in BPO after merge (not
                    ideal, but fixing this is rather urgent as cross
                    compilation is otherwise broken in pmOS edge)
[ci:skip-build]: tested locally

Related: issue 3705

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6500
2025-05-11 22:38:20 +02:00
Oliver Smith 7337f3d698 cross/gcc-*: fix conflict with native gcc
Run aportgen again with pmbootstrap MR 2597 to fix the conflict when
installing cross gcc and native gcc at the same time:

  (52/53) Installing gcc-armv7 (14.2.0-r6)
  ERROR: gcc-armv7-14.2.0-r6: trying to overwrite usr/lib/libgcc_s.so.1 owned by libgcc-14.2.0-r6.

[ci:skip-vercheck]: for generated gccs we keep the same pkgrel as in
                    alpine. I'll force a rebuild in BPO after merge (not
		    ideal, but fixing this is rather urgent as cross
		    compilation is otherwise broken in pmOS edge)
[ci:skip-build]: tested locally with gcc-armv7

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6497
2025-05-11 18:21:59 +02:00
Robert Eckelmann 97dbb45a3d cross/gcc-*: fix building
this reverts the change of removing !tracedeps from 42a507315b

With that the building of these packages should work again

Signed-off-by: Robert Eckelmann <longnoserob@postmarketos.org>

[ci:skip-vercheck]

Signed-off-by: Robert Eckelmann <longnoserob@postmarketos.org>
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6489
2025-05-11 16:06:44 +09:00
Clayton Craft 42a507315b cross/gcc-*: upgrade to 14.2.0-r6 2025-05-09 13:38:36 -07:00
Clayton Craft 5d4ff3b1be cross/busybox-static-*: upgrade to 1.37.0-r17 2025-05-08 16:34:02 -07:00
Oliver Smith 15465008dc cross/busybox-static-*: upgrade to 1.37.0-r16 2025-04-24 20:39:28 +02:00
Oliver Smith a9209f909f cross/musl-*: upgrade to 1.2.5-r10 2025-02-13 21:57:28 +01:00
Oliver Smith c5a9a7f67f cross/busybox-static-*: upgrade to 1.37.0-r14 2025-02-12 22:52:03 +01:00
Oliver Smith 03c4ff5cad cross/busybox-static-*: upgrade to 1.37.0-r13 2025-02-04 07:10:45 +01:00
Clayton Craft bf162e8603 cross/ccache-cross-symlinks: support riscv64 (MR 6054)
[ci:skip-build]: already built successfully in CI
2025-01-15 10:39:57 -08:00
Clayton Craft 6de44c7911 cross/crossdirect: support riscv64 (MR 6054) 2025-01-15 10:39:48 -08:00
Oliver Smith 6c18dcae18 cross/busybox-static-*: upgrade to 1.37.0-r11 2025-01-13 20:15:23 +01:00
Oliver Smith 5c1d76962b cross/grub-efi-x86: upgrade to 2.12-r7 (MR 5986)
[ci:ignore-count]
[ci:skip-build]: does not pass in CI, known in pmb issue 2467. I'll
build all of them locally before merging.
2025-01-06 15:35:01 +03:00
Oliver Smith ada84d65b8 cross/musl-*: upgrade to 1.2.5-r9 (MR 5986) 2025-01-06 15:35:01 +03:00
Oliver Smith e59a0ad98f cross/gcc-*: upgrade to 14.2.0-r5 (MR 5986)
Done with pmbootstrap MR 2521.
2025-01-06 15:34:57 +03:00
Oliver Smith da9d2f95e5 cross/busybox-static-*: upgrade to 1.37.0-r10 2024-12-15 12:36:04 +01:00
Oliver Smith 0420dc57f2 cross/musl-*: upgrade to 1.2.5-r8 2024-12-04 22:06:13 +01:00
Oliver Smith 8423a52017 cross/busybox-static-*: upgrade to 1.37.0-r8 2024-11-24 12:08:59 +01:00
Oliver Smith 9028e0cf0c cross/musl-*: upgrade to 1.2.5-r7 2024-11-24 12:08:55 +01:00
Oliver Smith 305a7bb18f cross/busybox-static-*: upgrade to 1.37.0-r7 2024-11-14 23:16:50 +01:00
Oliver Smith 51cbd7cedb cross/busybox-static-*: upgrade to 1.37.0-r6 2024-11-06 22:05:40 +01:00
Oliver Smith c45d7ec0a5 cross/crossdirect: fakeroot: add helpful error msg (MR 5744)
Alpine's abuild runs build() without fakeroot, and package() with
fakeroot. From the APKBUILD reference page in the Alpine wiki:

> Note: Building in fakeroot will reduce performance for parallel
> builds dramatically. It is for this reason that we split the build
> and package process into two separate functions.

Every now and then we see a package that tries to run a compiler (gcc,
g++, clang, ...) during package() in the APKBUILD. This is a bug in the
APKBUILD / build system of the program we are packaging. All compiling
should be done during build().

Let crossdirect print the following when this happens:

  ============================================================================================
  ERROR: crossdirect was called with: LD_PRELOAD=libfakeroot.so
  This means your package tried to run a compiler during package().
  This is not supported by crossdirect, and usually not a good idea.
  * Try to fix your APKBUILD so it does not run the compiler during package(), only in build()
    * If you're using meson install, try to add '--no-rebuild'
  * If this is not possible, you can work around it by setting options="!pmb:crossdirect"
    (compilation will be slower!)
  ============================================================================================

Instead of:

  ERROR: crossdirect: can't handle LD_PRELOAD: libfakeroot.so
  Please report this at: https://gitlab.com/postmarketOS/pmaports/issues
  As a workaround, you can compile without crossdirect.

In the past I've also tried to add 'strcmp(ldPreload, "libfakeroot.so") == 0'
(pmaports MR 2231), and today I made the same patch. The current code
looks like it would then work by just using libfakeroot.so from the
native chroot, but it does not work. And as mentioned, if we hit this
then we are compiling in package() which is something we should not do
anyway!

Fixes: pmb issue 2039
Related: pma issue 2351, pma MR 5738
2024-10-30 22:24:57 +01:00
Luca Weiss a9ab9a3925 cross/busybox-static-*: upgrade to 1.37.0-r3 (MR 5727)
[ci:skip-build]: already built successfully in CI
2024-10-23 00:19:15 -07:00
Clayton Craft ad9a7874a5 cross/gcc-*: upgrade to 14.2.0-r4 (MR 5722)
Quite a messy upgrade due to changes in both abuild and in the upstream
gcc APKBUILD breaking various things. Pmbootstrap also seems to
misbehave in GitLab CI making it difficult to validate.

Manual fixups:
* Set !tracedeps - changed behavior in abuild
* Manually add "so:" dependencies to avoid issues with !tracedeps set
  (becomes obvious with crossdirect)
* Add back makedepends="$makedepends_build $makedepends_host"
* Disable move of some files into usr/lib to avoid
  ERROR: gcc-aarch64-14.2.0-r4: trying to overwrite usr/lib/libgcc_s.so.1 owned by libgcc-14.2.0-r4.

[ci:skip-build] # pmbootstrap bugs will prohibit this from building
                # anyways, don't even attempt

Co-developed-by: Luca Weiss <luca@lucaweiss.eu>
2024-10-21 13:25:53 +02:00
Luca Weiss 878e3d7bf7 cross/musl-*: upgrade to 1.2.5-r5 (MR 5720)
[ci:skip-build]: already built successfully in CI
2024-10-17 23:13:24 -07:00
Pablo Correa Gómez 8a14c77745 cross/crossdirect: rebuild to update references to gitlab.postmarketos.org (MR 5696) 2024-10-07 12:58:04 +02:00
Luca Weiss 31b39acf0b cross/musl-*: upgrade to 1.2.5-r3 (MR 5620)
The rest of the packages were already handled in 6a290d1c35.
2024-09-23 21:08:10 +02:00
Luca Weiss 51640b1322 cross/gcc-*: upgrade to 14.2.0-r3 (MR 5619)
The rest of the packages were already handled in 6a290d1c35.
2024-09-23 21:06:16 +02:00
Bart Ribbers 6a290d1c35 cross/gcc-*: upgrade to 14.2.0-r1 2024-09-23 20:04:54 +02:00
Oliver Smith 303596dc73 cross/busybox-static-*: upgrade to 1.36.1-r32 2024-09-19 02:15:00 +02:00
Oliver Smith 7720c5c767 cross/gcc-*: upgrade to 14.2.0-r2 2024-09-01 14:25:54 +02:00
Oliver Smith 699763cfb0 cross/musl-*: upgrade to 1.2.5-r2 2024-08-18 14:06:38 +02:00
knuxify 2b1a26bf25 cross/gcc-*: upgrade to 14.2.0-r1 (MR 5479)
[ci:skip-build]
2024-08-10 23:30:06 +09:00
Oliver Smith 5d1d7214a7 cross/grub-efi-x86: upgrade to 2.12-r6 2024-08-04 16:39:22 +02:00
Arnav Singh cebadbcf4c cross/gcc-*: upgrade to 14.2.0-r0 (MR 5455)
[ci:skip-build] CI fails because of an issue with pmb fetching build
deps on subsequent packages in the aggregated list of packages to build,
but bpo is expected to pass because it builds packages one at a time
2024-08-03 09:54:18 -07:00