Skip to content

Commit

Permalink
re-order patches to make platform-distinction easier
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Jul 25, 2024
1 parent c6214c7 commit 1484ff4
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 17 deletions.
13 changes: 6 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ source:
sha256: 3a2b10cab86e32358fdac871546d57e2700e9bdb5875ef33fff5b601265b9e32 # [gcc_version == "13.3.0"]
sha256: 5a30de2be740062bb3ddd3fd13c9b1bb4584d8f85616d33f23a713439d714148 # [gcc_version == "12.4.0"]
patches:
- patches/0001-cross-compile-older-glibc.patch # [cross_target_stdlib_version == "2.12" and target_platform != "linux-64"]
- patches/0002-allow-commands-in-main-specfile.patch
- patches/0003-patch-zoneinfo_dir_override-to-point-to-our-tzdata.patch # [gcc_maj_ver == 14]
{% if cross_target_platform.startswith("linux-") %}
- patches/0001-Hardcode-HAVE_ALIGNED_ALLOC-1-in-libstdc-v3-configur.patch
{% endif %}
- patches/0002-cross-compile-older-glibc.patch # [cross_target_stdlib_version == "2.12" and target_platform != "linux-64"]
- patches/0003-allow-commands-in-main-specfile.patch
- patches/0004-patch-zoneinfo_dir_override-to-point-to-our-tzdata.patch # [gcc_maj_ver == 14]
- patches/0005-add-ldl-to-libstdc___la_LDFLAGS.patch # [gcc_maj_ver == 14 and not win]
{% if cross_target_platform.startswith("win-") %}
- patches/0004-add-ldl-to-libstdc___la_LDFLAGS.patch # [gcc_maj_ver == 14]
- patches/0005-Hardcode-HAVE_ALIGNED_ALLOC-1-in-libstdc-v3-configur.patch
{% else %}
# for GCC 13: https://github.com/msys2/MINGW-packages/tree/4f1262b4e1072632eccf0958764f90d890b832ac/mingw-w64-gcc
# for GCC 14: https://github.com/msys2/MINGW-packages/tree/331bf945d21af562d228ed46bda21c8272d1e76e/mingw-w64-gcc
- patches/mingw/{{ gcc_maj_ver }}/0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch # [gcc_maj_ver == 14]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 50ad6bc09ecaa3143faac20b6ad571fe6659e548 Mon Sep 17 00:00:00 2001
From be1d364e55ba4c44b8f6ead05810b28fcb66d173 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Thu, 15 Jul 2021 07:58:14 +0000
Subject: [PATCH 2/5] cross-compile older glibc
Subject: [PATCH 1/5] cross-compile older glibc

---
libgomp/secure_getenv.h | 2 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e63de7d363c14624c50b8c84148540fca96db9e5 Mon Sep 17 00:00:00 2001
From 77615b55353865222794500487ae0b4b70888efd Mon Sep 17 00:00:00 2001
From: Tim Snyder <snyder.tim@gmail.com>
Date: Tue, 29 Mar 2022 22:33:27 +0000
Subject: [PATCH 3/5] allow % commands in main specfile
Subject: [PATCH 2/5] allow % commands in main specfile

---
gcc/gcc.cc | 3 ++-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d5b1a26d4cdd2100bd68b62eddf7894fb5f237bd Mon Sep 17 00:00:00 2001
From 364f9fd8505a162a6cacd0223c3b55927804981c Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 21 Jun 2024 12:41:07 +1100
Subject: [PATCH 4/5] patch zoneinfo_dir_override to point to our tzdata
Subject: [PATCH 3/5] patch zoneinfo_dir_override to point to our tzdata

---
libstdc++-v3/src/c++20/tzdb.cc | 78 ++++++++++++++++++++++++++++------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c0390ef9288385583502c2bfc76cce560d032320 Mon Sep 17 00:00:00 2001
From 47b93186270f8f72a8a0229c08871b7a613484a4 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Mon, 15 Jul 2024 19:16:05 +1100
Subject: [PATCH 5/5] add `-ldl` to libstdc___la_LDFLAGS
Subject: [PATCH 4/5] add `-ldl` to libstdc___la_LDFLAGS

we want to link static-only here, to avoid having to add
`-ldl` everytime something links against libstdc++.so
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From be731c6d9ebcf6d3951a51f57e1c30665403b982 Mon Sep 17 00:00:00 2001
From bdc5db51bf810074d4301f41b88add71945fbabd Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Tue, 12 Jun 2018 05:26:24 +0000
Subject: [PATCH 1/5] Hardcode HAVE_ALIGNED_ALLOC=1 in libstdc++-v3/configure
Subject: [PATCH 5/5] Hardcode HAVE_ALIGNED_ALLOC=1 in libstdc++-v3/configure

---
libstdc++-v3/configure | 16 ++++++++++++++++
Expand Down

0 comments on commit 1484ff4

Please sign in to comment.