* [PR PATCH] Remain task for gcc 12
@ 2022-12-17 6:36 sgn
2022-12-17 21:57 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2022-12-17 6:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages remain-task-for-gcc-12
https://github.com/void-linux/void-packages/pull/41139
Remain task for gcc 12
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]
[skip ci]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41139.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remain-task-for-gcc-12-41139.patch --]
[-- Type: text/x-diff, Size: 11118 bytes --]
From e1e6a79f5da2096e114d3f5c8a7a45f1380b03f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 17 Dec 2022 10:46:27 +0700
Subject: [PATCH 1/4] glibc+gcc+binutils: cross-compile
---
srcpkgs/PopCorn/template | 2 --
srcpkgs/binutils/template | 1 -
srcpkgs/gcc/template | 1 -
srcpkgs/glibc/template | 1 -
srcpkgs/libiberty-devel/template | 1 -
srcpkgs/libtool/template | 2 --
srcpkgs/mk-configure/template | 1 -
7 files changed, 9 deletions(-)
diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index dcd312fa760f..38d9e46a353e 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -23,8 +23,6 @@ make_dirs="
/var/lib/popcorn 0755 _popcorn _popcorn
/etc/popcorn 0755 _popcorn _popcorn"
-nocross=temporarily
-
post_install() {
vlicense LICENSE
vsv popcorn
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 9b0b3e5473ef..c355a5fc8016 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -20,7 +20,6 @@ if [ "$CHROOT_READY" ]; then
depends="binutils-doc"
subpackages+=" binutils-devel"
fi
-nocross=temporarily
_get_triplet() {
if [ -z "$XBPS_TRIPLET" ]; then
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index b5e8cef7e3a5..a20af7c0ef2e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -29,7 +29,6 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0"
-nocross=temporarily
nopie=yes
lib32disabled=yes
bootstrap=yes
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 99f4d41de3fc..452b55c12762 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -58,7 +58,6 @@ archs="~*-musl"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
broken="no point in building this for musl"
fi
-nocross=temporarily
do_configure() {
mkdir build
diff --git a/srcpkgs/libiberty-devel/template b/srcpkgs/libiberty-devel/template
index dfcc569fe3db..d9618e3806ba 100644
--- a/srcpkgs/libiberty-devel/template
+++ b/srcpkgs/libiberty-devel/template
@@ -14,4 +14,3 @@ checksum=b59050f48c8a0f9c9e6fba5d17c7a4f11d1329de0c0dca7331b767a6d2bbe8d9
conflicts="binutils-devel<=2.35.1_3"
CFLAGS="-fPIC"
-nocross=temporarily
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 17e3a12c08a8..aebad9294eef 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -17,8 +17,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args="lt_cv_shlibpath_overrides_runpath=yes"
fi
-nocross=temporarily
-
pre_configure() {
touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in
./bootstrap --force
diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index d5aa1d5210f8..2fd1ad6f69ee 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -21,7 +21,6 @@ case "$XBPS_TARGET_MACHINE" in
*-musl)
checkdepends+=" musl-fts-devel"
esac
-nocross=temporarily
post_extract() {
rm -r tests/pkg_config_2 # different wording
From 062a097781f6765cc87975df18ec4cadbccf13ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 5 Nov 2022 11:33:11 -0700
Subject: [PATCH 2/4] gdb: resolve conflict with binutils 2.39
---
srcpkgs/gdb/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 9c5f17ffc519..b666348fea19 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
# Template file for 'gdb'
pkgname=gdb
version=12.1
-revision=2
+revision=3
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
configure_args="--disable-werror --disable-nls --with-system-readline
@@ -48,7 +48,8 @@ vopt_conflict debuginfod static
post_install() {
# resolve conflicts with binutils
- rm -r ${DESTDIR}/usr/{include,lib,share/info/bfd.info*}
+ rm -rf ${DESTDIR}/usr/{include,lib}
+ rm -rf ${DESTDIR}/usr/share/info/{bfd,ctf-spec}.info*
}
gdb-common_package() {
From 2cf44a1e521706d938b0c9a5d01ac51a6da7f106 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 5 Nov 2022 11:33:12 -0700
Subject: [PATCH 3/4] libgccjit: update to 12.2.0.
---
srcpkgs/libgccjit/files/libgccjit-musl.patch | 63 --------------------
srcpkgs/libgccjit/template | 24 +++-----
2 files changed, 9 insertions(+), 78 deletions(-)
delete mode 100644 srcpkgs/libgccjit/files/libgccjit-musl.patch
diff --git a/srcpkgs/libgccjit/files/libgccjit-musl.patch b/srcpkgs/libgccjit/files/libgccjit-musl.patch
deleted file mode 100644
index d2ed16928c82..000000000000
--- a/srcpkgs/libgccjit/files/libgccjit-musl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
-index 5bccf591a..35f5e35ef 100644
---- a/gcc/jit/jit-playback.c
-+++ b/gcc/jit/jit-playback.c
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
- #include "diagnostic.h"
- #include "stmt.h"
-
--#include <pthread.h>
--
- #include "jit-playback.h"
- #include "jit-result.h"
- #include "jit-builtins.h"
-diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
-index a237d574f..5785e3269 100644
---- a/gcc/jit/jit-recording.c
-+++ b/gcc/jit/jit-recording.c
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3. If not see
- #include "pretty-print.h"
- #include "toplev.h"
-
--#include <pthread.h>
--
- #include "jit-builtins.h"
- #include "jit-recording.h"
- #include "jit-playback.h"
-diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
-index f9c33c63c..75f21d275 100644
---- a/gcc/jit/libgccjit.c
-+++ b/gcc/jit/libgccjit.c
-@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
-+#include <pthread.h>
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
- #include "timevar.h"
- #include "typed-splay-tree.h"
- #include "cppbuiltin.h"
--#include <pthread.h>
-
- #include "libgccjit.h"
- #include "jit-recording.h"
diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
index 0b37c3ee9f8b..fde1affd54b7 100644
--- a/srcpkgs/libgccjit/template
+++ b/srcpkgs/libgccjit/template
@@ -3,18 +3,12 @@
# which use the version number.
pkgname=libgccjit
-# we are using a 10-stable git snapshot alpine is using in order
-# to get regression fixes not yet incorporate into a stable release
-# it should be possible to switch back to stable with 10.3 or 11
-version=10.2.1pre1
+version=12.2.0
revision=1
-_patchver="${version%pre*}"
-_minorver="${_patchver%.*}"
-_majorver="${_minorver%.*}"
-_gmp_version=6.2.0
+_gmp_version=6.2.1
_mpfr_version=4.1.0
-_mpc_version=1.1.0
-_isl_version=0.21
+_mpc_version=1.2.1
+_isl_version=0.24
create_wrksrc=yes
short_desc="Just-In-Time Compilation library for GCC"
maintainer="Lane Biocini <lane@mailbox.org>"
@@ -22,16 +16,16 @@ homepage="https://gcc.gnu.org"
license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
# *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
distfiles="
- https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz
+ ${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz
https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
-checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
+checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
- 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
- d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
+ 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
+ fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0"
nopie=yes
lib32disabled=yes
makedepends="zlib-devel"
From c628ab5c75b4ce3bd06f6fc84bb032492c3d415e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 5 Nov 2022 11:33:12 -0700
Subject: [PATCH 4/4] gcc-multilib: update to 12.2.0.
---
srcpkgs/gcc-multilib/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index f28eb237c287..ba9bafcadfd6 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -3,15 +3,15 @@ archs="x86_64"
_triplet="x86_64-unknown-linux-gnu"
pkgname=gcc-multilib
-version=10.2.1pre1
+version=12.2.0
revision=1
_majorver="${version%.*}"
short_desc="GNU Compiler Collection (multilib files)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://gcc.gnu.org"
license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
-distfiles="https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz"
-checksum=772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
+checksum=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
hostmakedepends="perl flex tar zip unzip"
makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel
@@ -70,7 +70,7 @@ do_build() {
make ${makejobs}
}
do_install() {
- local _pc_triplet=x86_64-pc-linux-gnu _version=${version%pre1}
+ local _pc_triplet=x86_64-pc-linux-gnu
# Install to a tempdir and then only copy relevant files.
cd ${wrksrc}
make DESTDIR=${wrksrc}/${pkgname}-build install
@@ -80,9 +80,9 @@ do_install() {
vmkdir usr/include/c++/${_majorver}/${_triplet}
vmkdir usr/lib/gcc/${_triplet}/${_majorver}
- cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${_version}/32 \
+ cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${version}/32 \
${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/
- cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${_version}/${_pc_triplet}/32 \
+ cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_pc_triplet}/32 \
${DESTDIR}/usr/include/c++/${_majorver}/${_triplet}
vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: Remain task for gcc 12
2022-12-17 6:36 [PR PATCH] Remain task for gcc 12 sgn
@ 2022-12-17 21:57 ` leahneukirchen
0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2022-12-17 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]
There's a merged pull request on the void-packages repository
Remain task for gcc 12
https://github.com/void-linux/void-packages/pull/41139
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]
[skip ci]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-17 21:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-17 6:36 [PR PATCH] Remain task for gcc 12 sgn
2022-12-17 21:57 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).