* [PR PATCH] gcc6: remove python 2 scripts
@ 2023-10-06 14:48 classabbyamp
2023-10-09 23:34 ` [PR PATCH] [Updated] gcc6: remove python 2 scripts, move to bootstrap classabbyamp
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-06 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages gcc6
https://github.com/void-linux/void-packages/pull/46484
gcc6: remove python 2 scripts
- gcc6: remove python2 scripts, move to bootstrap
- pdftk: fix build
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (built revdeps)
A patch file from https://github.com/void-linux/void-packages/pull/46484.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc6-46484.patch --]
[-- Type: text/x-diff, Size: 2978 bytes --]
From f8e62bd01535fa159611f90c42e16f104d7c617e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 6 Oct 2023 10:31:59 -0400
Subject: [PATCH 1/2] gcc6: remove python2 scripts, move to bootstrap
---
srcpkgs/gcc6/template | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index d8134b25b21ed..5811f522e5d94 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -3,7 +3,7 @@
_isl_version=0.16
pkgname=gcc6
version=6.5.0
-revision=1
+revision=2
_majorver="${version%%.*}"
_minorver="${version%.*}"
create_wrksrc=yes
@@ -26,7 +26,7 @@ skip_extraction="ecj-4.9.jar"
nopie=yes
lib32disabled=yes
nocross=yes
-python_version=2 #unverified
+repository=bootstrap
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
@@ -206,6 +206,9 @@ do_install() {
# Remove python stuff
rm -rf ${DESTDIR}/usr/share/gcc-${version}/python
+ rm -f ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/*.py
+ rm -f ${DESTDIR}/usr/bin/aot-compile-6
+ rm -f ${DESTDIR}/usr/share/man/man1/aot-compile-6.1
# Avoid conflict with gcc
mv ${DESTDIR}/usr/lib/libcc1* ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}
@@ -251,13 +254,13 @@ gcc6-gcj_package() {
for f in gcj jv-convert gjarsigner gjar grmic jcf-dump \
gtnameserv gcjh gnative2ascii gserialver gkeytool \
gij grmiregistry grmid gorbd gcj-dbtool gjavah \
- gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+ gc-analyze gappletviewer rebuild-gcj-db; do
vmove usr/bin/${f}-${_majorver}
done
for f in gcj jv-convert gjarsigner gjar grmic jcf-dump gjdoc \
gtnameserv gcjh gnative2ascii gserialver gkeytool \
gij grmiregistry grmid gorbd gcj-dbtool gjavah \
- gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+ gc-analyze gappletviewer rebuild-gcj-db; do
if [ -f ${DESTDIR}/usr/share/man/man1/${f}-${_majorver}.1 ]; then
vmove usr/share/man/man1/${f}-${_majorver}.1
fi
From 707360933516cfb63d29fb8e7d7d445e9e2a358a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 6 Oct 2023 10:40:11 -0400
Subject: [PATCH 2/2] pdftk: fix build
---
srcpkgs/pdftk/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pdftk/template b/srcpkgs/pdftk/template
index f86efeae10e09..56af9ba6965f5 100644
--- a/srcpkgs/pdftk/template
+++ b/srcpkgs/pdftk/template
@@ -14,9 +14,11 @@ checksum=118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1
nocross=yes
do_build() {
+ _cxxflags="${CXXFLAGS//-fstack-clash-protection}"
+ _cxxflags="${_cxxflags//-ffile-prefix-map=\/builddir\/${pkgname}-${version}\/${build_wrksrc}=.}"
sed -e "s;@CXX@;g++-6;" \
-e "s;@AR@;$AR;" \
- -e "s;@CXXFLAGS@;${CXXFLAGS//-fstack-clash-protection};" \
+ -e "s;@CXXFLAGS@;${_cxxflags};" \
-e "s;@LDFLAGS@;$LDFLAGS;" \
${FILESDIR}/Makefile > Makefile
make ${makejobs} || make ${makjobs}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] gcc6: remove python 2 scripts, move to bootstrap
2023-10-06 14:48 [PR PATCH] gcc6: remove python 2 scripts classabbyamp
@ 2023-10-09 23:34 ` classabbyamp
2023-10-14 5:42 ` classabbyamp
2023-10-14 6:05 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-09 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages gcc6
https://github.com/void-linux/void-packages/pull/46484
gcc6: remove python 2 scripts, move to bootstrap
#### Testing the changes
- I tested the changes in this PR: **YES** (built revdeps)
this will require removing `*gcc6*` from the main repos after merge
A patch file from https://github.com/void-linux/void-packages/pull/46484.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc6-46484.patch --]
[-- Type: text/x-diff, Size: 2978 bytes --]
From 887f857441dfe93a5eab7e9964f0b10cf448d0d7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 6 Oct 2023 10:31:59 -0400
Subject: [PATCH 1/2] gcc6: remove python2 scripts, move to bootstrap
---
srcpkgs/gcc6/template | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index d8134b25b21ed..5811f522e5d94 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -3,7 +3,7 @@
_isl_version=0.16
pkgname=gcc6
version=6.5.0
-revision=1
+revision=2
_majorver="${version%%.*}"
_minorver="${version%.*}"
create_wrksrc=yes
@@ -26,7 +26,7 @@ skip_extraction="ecj-4.9.jar"
nopie=yes
lib32disabled=yes
nocross=yes
-python_version=2 #unverified
+repository=bootstrap
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
@@ -206,6 +206,9 @@ do_install() {
# Remove python stuff
rm -rf ${DESTDIR}/usr/share/gcc-${version}/python
+ rm -f ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/*.py
+ rm -f ${DESTDIR}/usr/bin/aot-compile-6
+ rm -f ${DESTDIR}/usr/share/man/man1/aot-compile-6.1
# Avoid conflict with gcc
mv ${DESTDIR}/usr/lib/libcc1* ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}
@@ -251,13 +254,13 @@ gcc6-gcj_package() {
for f in gcj jv-convert gjarsigner gjar grmic jcf-dump \
gtnameserv gcjh gnative2ascii gserialver gkeytool \
gij grmiregistry grmid gorbd gcj-dbtool gjavah \
- gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+ gc-analyze gappletviewer rebuild-gcj-db; do
vmove usr/bin/${f}-${_majorver}
done
for f in gcj jv-convert gjarsigner gjar grmic jcf-dump gjdoc \
gtnameserv gcjh gnative2ascii gserialver gkeytool \
gij grmiregistry grmid gorbd gcj-dbtool gjavah \
- gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+ gc-analyze gappletviewer rebuild-gcj-db; do
if [ -f ${DESTDIR}/usr/share/man/man1/${f}-${_majorver}.1 ]; then
vmove usr/share/man/man1/${f}-${_majorver}.1
fi
From e6a96cc1723977ffc730e9ca5a2843f09894c838 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 6 Oct 2023 10:40:11 -0400
Subject: [PATCH 2/2] pdftk: fix build
---
srcpkgs/pdftk/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pdftk/template b/srcpkgs/pdftk/template
index f86efeae10e09..56af9ba6965f5 100644
--- a/srcpkgs/pdftk/template
+++ b/srcpkgs/pdftk/template
@@ -14,9 +14,11 @@ checksum=118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1
nocross=yes
do_build() {
+ _cxxflags="${CXXFLAGS//-fstack-clash-protection}"
+ _cxxflags="${_cxxflags//-ffile-prefix-map=\/builddir\/${pkgname}-${version}\/${build_wrksrc}=.}"
sed -e "s;@CXX@;g++-6;" \
-e "s;@AR@;$AR;" \
- -e "s;@CXXFLAGS@;${CXXFLAGS//-fstack-clash-protection};" \
+ -e "s;@CXXFLAGS@;${_cxxflags};" \
-e "s;@LDFLAGS@;$LDFLAGS;" \
${FILESDIR}/Makefile > Makefile
make ${makejobs} || make ${makjobs}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] gcc6: remove python 2 scripts, move to bootstrap
2023-10-06 14:48 [PR PATCH] gcc6: remove python 2 scripts classabbyamp
2023-10-09 23:34 ` [PR PATCH] [Updated] gcc6: remove python 2 scripts, move to bootstrap classabbyamp
@ 2023-10-14 5:42 ` classabbyamp
2023-10-14 6:05 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-14 5:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages gcc6
https://github.com/void-linux/void-packages/pull/46484
gcc6: remove python 2 scripts, move to bootstrap
#### Testing the changes
- I tested the changes in this PR: **YES** (built revdeps)
this will require removing `*gcc6*` from the main repos after merge
A patch file from https://github.com/void-linux/void-packages/pull/46484.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc6-46484.patch --]
[-- Type: text/x-diff, Size: 2978 bytes --]
From 49c4e864ff36b15106b9e7932f74dea788c61dc1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 6 Oct 2023 10:31:59 -0400
Subject: [PATCH 1/2] gcc6: remove python2 scripts, move to bootstrap
---
srcpkgs/gcc6/template | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index d8134b25b21ed..5811f522e5d94 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -3,7 +3,7 @@
_isl_version=0.16
pkgname=gcc6
version=6.5.0
-revision=1
+revision=2
_majorver="${version%%.*}"
_minorver="${version%.*}"
create_wrksrc=yes
@@ -26,7 +26,7 @@ skip_extraction="ecj-4.9.jar"
nopie=yes
lib32disabled=yes
nocross=yes
-python_version=2 #unverified
+repository=bootstrap
subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
@@ -206,6 +206,9 @@ do_install() {
# Remove python stuff
rm -rf ${DESTDIR}/usr/share/gcc-${version}/python
+ rm -f ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/*.py
+ rm -f ${DESTDIR}/usr/bin/aot-compile-6
+ rm -f ${DESTDIR}/usr/share/man/man1/aot-compile-6.1
# Avoid conflict with gcc
mv ${DESTDIR}/usr/lib/libcc1* ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}
@@ -251,13 +254,13 @@ gcc6-gcj_package() {
for f in gcj jv-convert gjarsigner gjar grmic jcf-dump \
gtnameserv gcjh gnative2ascii gserialver gkeytool \
gij grmiregistry grmid gorbd gcj-dbtool gjavah \
- gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+ gc-analyze gappletviewer rebuild-gcj-db; do
vmove usr/bin/${f}-${_majorver}
done
for f in gcj jv-convert gjarsigner gjar grmic jcf-dump gjdoc \
gtnameserv gcjh gnative2ascii gserialver gkeytool \
gij grmiregistry grmid gorbd gcj-dbtool gjavah \
- gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+ gc-analyze gappletviewer rebuild-gcj-db; do
if [ -f ${DESTDIR}/usr/share/man/man1/${f}-${_majorver}.1 ]; then
vmove usr/share/man/man1/${f}-${_majorver}.1
fi
From 71db8b105da6062ac33bb90a52876a8f9ef26c4a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 6 Oct 2023 10:40:11 -0400
Subject: [PATCH 2/2] pdftk: fix build
---
srcpkgs/pdftk/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pdftk/template b/srcpkgs/pdftk/template
index f86efeae10e09..56af9ba6965f5 100644
--- a/srcpkgs/pdftk/template
+++ b/srcpkgs/pdftk/template
@@ -14,9 +14,11 @@ checksum=118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1
nocross=yes
do_build() {
+ _cxxflags="${CXXFLAGS//-fstack-clash-protection}"
+ _cxxflags="${_cxxflags//-ffile-prefix-map=\/builddir\/${pkgname}-${version}\/${build_wrksrc}=.}"
sed -e "s;@CXX@;g++-6;" \
-e "s;@AR@;$AR;" \
- -e "s;@CXXFLAGS@;${CXXFLAGS//-fstack-clash-protection};" \
+ -e "s;@CXXFLAGS@;${_cxxflags};" \
-e "s;@LDFLAGS@;$LDFLAGS;" \
${FILESDIR}/Makefile > Makefile
make ${makejobs} || make ${makjobs}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: gcc6: remove python 2 scripts, move to bootstrap
2023-10-06 14:48 [PR PATCH] gcc6: remove python 2 scripts classabbyamp
2023-10-09 23:34 ` [PR PATCH] [Updated] gcc6: remove python 2 scripts, move to bootstrap classabbyamp
2023-10-14 5:42 ` classabbyamp
@ 2023-10-14 6:05 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-14 6:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
There's a merged pull request on the void-packages repository
gcc6: remove python 2 scripts, move to bootstrap
https://github.com/void-linux/void-packages/pull/46484
Description:
#### Testing the changes
- I tested the changes in this PR: **YES** (built revdeps)
this will require removing `*gcc6*` from the main repos after merge
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-14 6:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 14:48 [PR PATCH] gcc6: remove python 2 scripts classabbyamp
2023-10-09 23:34 ` [PR PATCH] [Updated] gcc6: remove python 2 scripts, move to bootstrap classabbyamp
2023-10-14 5:42 ` classabbyamp
2023-10-14 6:05 ` [PR PATCH] [Merged]: " classabbyamp
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).