As we discussed in the last meeting, we reset the ports tree and began from scratch, even though this change involves porting all the packages. Starting small and growing gradually, this approach will reduce build times and consequently lower energy consumption in a world affected by climate change. We will add new ports as users needs arise; ok h3artbl33d@
This commit is contained in:
parent
83a0aaf92c
commit
9a3af55370
59377 changed files with 98673 additions and 4712155 deletions
|
@ -18,14 +18,15 @@ USE_NOEXECONLY = Yes
|
|||
V = 11.2.0
|
||||
FULL_VERSION = $V
|
||||
FULL_PKGVERSION = $V
|
||||
REVISION = 9
|
||||
REVISION = 13
|
||||
REVISION-c++ = 14
|
||||
|
||||
ADASTRAP-amd64 = adastrap-amd64-$V-3.tar.xz
|
||||
ADASTRAP-amd64 = adastrap-amd64-$V-4.tar.xz
|
||||
ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
|
||||
ADASTRAP-hppa = adastrap-hppa-8.3.0-1.tar.xz
|
||||
ADASTRAP-i386 = adastrap-i386-$V-2.tar.xz
|
||||
ADASTRAP-mips64 = adastrap-mips64-8.4.0-0.tar.xz
|
||||
ADASTRAP-powerpc = adastrap-powerpc-$V-2.tar.xz
|
||||
ADASTRAP-powerpc = adastrap-powerpc-$V-3.tar.xz
|
||||
ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz
|
||||
|
||||
PKGNAME-main = gcc-${FULL_PKGVERSION}
|
||||
|
@ -132,6 +133,11 @@ MAKE_ENV += ${EXTRA_ENV}
|
|||
# .sdata.DW.ref.__gxx_personality_v0
|
||||
USE_LLD = No
|
||||
CONFIGURE_ENV += LDFLAGS="-Wl,--relax"
|
||||
.elif ${MACHINE_ARCH:Mi386}
|
||||
MODULES += lang/clang
|
||||
MODCLANG_VERSION = 13
|
||||
MODCLANG_COMPILER_LINKS = No
|
||||
USE_LLD = ports
|
||||
.endif
|
||||
|
||||
# Note: the configure target passes CFLAGS to the configure script anyways.
|
||||
|
@ -240,13 +246,6 @@ LIB_DEPENDS-libs =
|
|||
CONFIG = x86_64-unknown-openbsd${OSREV}
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} == "riscv64"
|
||||
# lld complains about .gcc_except_table referencing
|
||||
# symbols in discarded sections. Tell gcc to split .gcc_except_table
|
||||
# so that its unused parts can also be discarded.
|
||||
EXTRA_ENV += PORTS_FORCE_SPLIT_SECTIONS="-ffunction-sections -fdata-sections"
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
.for f in egcc eg++
|
||||
echo "#! /bin/sh" >${WRKDIR}/bin/$f
|
||||
|
@ -270,7 +269,7 @@ post-extract:
|
|||
${WRKDIR}/bootstrap/include/c++/*/*/bits/c++config.h
|
||||
.endif
|
||||
-chmod 644 ${WRKDIR}/bootstrap/system-libs/lib*.so* # XXX
|
||||
-cp /usr/lib/libc.so.96.1 ${WRKDIR}/bootstrap/system-libs/ # XXX
|
||||
-cp `ls /usr/lib/libc.so.* | sort -t . -V | tail -1` ${WRKDIR}/bootstrap/system-libs/libc.so.* # XXX
|
||||
|
||||
post-install:
|
||||
.if ${BUILD_PACKAGES:M-ada}
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
SHA256 (gcc/adastrap-amd64-11.2.0-3.tar.xz) = nsEGMh6z94ym3jhQlyEqSvKox1t84L/Ff5xPWO3E6N0=
|
||||
SHA256 (gcc/adastrap-amd64-11.2.0-4.tar.xz) = 1+RYgf8jrNtkivai+Tue4jKoYIBbR4kb9JUGOwP1h/I=
|
||||
SHA256 (gcc/adastrap-arm-4.9.4-0.tar.xz) = sadBk8tP/65RDDIHlWE1yo9MnSUP/44Ou9064RXonto=
|
||||
SHA256 (gcc/adastrap-hppa-8.3.0-1.tar.xz) = 4aNP/H4TDLZnQ6ul0LAvYBTB+VAGZ77X9+XrEPqVxqs=
|
||||
SHA256 (gcc/adastrap-i386-11.2.0-2.tar.xz) = WgWH2HrnlGQZ31KGExgEkY15+6EsNNTfUFuuvrjReyg=
|
||||
SHA256 (gcc/adastrap-mips64-8.4.0-0.tar.xz) = ELzjRW6d2VbHXid+cDW2C6eLwoU+KP3Jp4t6zXhYK2E=
|
||||
SHA256 (gcc/adastrap-powerpc-11.2.0-2.tar.xz) = UbWAcSXyKHiV0cbh5JAhaB/yJWs9aSagBPwXQl34Jgo=
|
||||
SHA256 (gcc/adastrap-powerpc-11.2.0-3.tar.xz) = acJtrhP/QyqtfDHrcXZjwI1LIBBN8C+SrTokVunndSQ=
|
||||
SHA256 (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = cqpGS2beYV+CFf7X+P4voVHHT78v6SCgtksHXjP/B4E=
|
||||
SHA256 (gcc/gcc-11.2.0.tar.xz) = 0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=
|
||||
SIZE (gcc/adastrap-amd64-11.2.0-3.tar.xz) = 78141172
|
||||
SIZE (gcc/adastrap-amd64-11.2.0-4.tar.xz) = 77695388
|
||||
SIZE (gcc/adastrap-arm-4.9.4-0.tar.xz) = 31142168
|
||||
SIZE (gcc/adastrap-hppa-8.3.0-1.tar.xz) = 48044496
|
||||
SIZE (gcc/adastrap-i386-11.2.0-2.tar.xz) = 72316224
|
||||
SIZE (gcc/adastrap-mips64-8.4.0-0.tar.xz) = 49751704
|
||||
SIZE (gcc/adastrap-powerpc-11.2.0-2.tar.xz) = 68404648
|
||||
SIZE (gcc/adastrap-powerpc-11.2.0-3.tar.xz) = 70134604
|
||||
SIZE (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = 38704976
|
||||
SIZE (gcc/gcc-11.2.0.tar.xz) = 80888824
|
||||
|
|
|
@ -1,19 +1,6 @@
|
|||
First hunk: lld complains about .gcc_except_table referencing
|
||||
symbols in discarded sections. Tell gcc to split .gcc_except_table
|
||||
so that its unused parts can also be discarded.
|
||||
|
||||
Index: libcc1/Makefile.in
|
||||
--- libcc1/Makefile.in.orig
|
||||
+++ libcc1/Makefile.in
|
||||
@@ -387,7 +387,7 @@ CPPFLAGS_FOR_C_FAMILY = -I $(srcdir)/../gcc/c-family \
|
||||
CPPFLAGS_FOR_C = $(CPPFLAGS_FOR_C_FAMILY) -I $(srcdir)/../gcc/c
|
||||
CPPFLAGS_FOR_CXX = $(CPPFLAGS_FOR_C_FAMILY) -I $(srcdir)/../gcc/cp
|
||||
AM_CXXFLAGS = $(WARN_FLAGS) $(WERROR) $(visibility) $(CET_HOST_FLAGS) \
|
||||
- $(am__append_1)
|
||||
+ $(am__append_1) $(PORTS_FORCE_SPLIT_SECTIONS)
|
||||
# Can be simplified when libiberty becomes a normal convenience library.
|
||||
libiberty_normal = ../libiberty/libiberty.a
|
||||
libiberty_noasan = ../libiberty/noasan/libiberty.a
|
||||
@@ -405,6 +405,8 @@ cc1libdir = $(libdir)/$(libsuffix)
|
||||
shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
|
||||
marshall.cc marshall.hh rpc.hh status.hh
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
Index: libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
|
||||
--- libstdc++-v3/config/os/bsd/openbsd/ctype_base.h.orig
|
||||
+++ libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
|
||||
@@ -42,6 +42,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
// on the mask type. Because of this, we don't use an enum.
|
||||
typedef char mask;
|
||||
|
||||
+#ifdef _CTYPE_U
|
||||
+ static const mask upper = _CTYPE_U;
|
||||
+ static const mask lower = _CTYPE_L;
|
||||
+ static const mask alpha = _CTYPE_U | _CTYPE_L;
|
||||
+ static const mask digit = _CTYPE_N;
|
||||
+ static const mask xdigit = _CTYPE_N | _CTYPE_X;
|
||||
+ static const mask space = _CTYPE_S;
|
||||
+ static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
|
||||
+ static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
|
||||
+ static const mask cntrl = _CTYPE_C;
|
||||
+ static const mask punct = _CTYPE_P;
|
||||
+ static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N;
|
||||
+# if __cplusplus >= 201103L
|
||||
+ static const mask blank = space;
|
||||
+# endif
|
||||
+#else
|
||||
static const mask upper = _U;
|
||||
static const mask lower = _L;
|
||||
static const mask alpha = _U | _L;
|
||||
@@ -53,8 +69,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
static const mask cntrl = _C;
|
||||
static const mask punct = _P;
|
||||
static const mask alnum = _U | _L | _N;
|
||||
-#if __cplusplus >= 201103L
|
||||
+# if __cplusplus >= 201103L
|
||||
static const mask blank = space;
|
||||
+# endif
|
||||
#endif
|
||||
};
|
||||
|
|
@ -9,6 +9,11 @@ ONLY_FOR_ARCHS-ada = amd64 hppa i386 mips64 powerpc
|
|||
# .sdata.DW.ref.__gxx_personality_v0
|
||||
.if ${MACHINE_ARCH:Mpowerpc}
|
||||
USE_LLD = No
|
||||
.elif ${MACHINE_ARCH:Mi386}
|
||||
MODULES += lang/clang
|
||||
MODCLANG_VERSION = 13
|
||||
MODCLANG_COMPILER_LINKS = No
|
||||
USE_LLD = ports
|
||||
.endif
|
||||
|
||||
DPB_PROPERTIES = parallel
|
||||
|
@ -18,14 +23,15 @@ USE_NOEXECONLY = Yes
|
|||
V = 8.4.0
|
||||
FULL_VERSION = $V
|
||||
FULL_PKGVERSION = $V
|
||||
REVISION = 18
|
||||
REVISION = 22
|
||||
REVISION-c++ = 23
|
||||
|
||||
ADASTRAP-amd64 = adastrap-amd64-$V-2.tar.xz
|
||||
ADASTRAP-amd64 = adastrap-amd64-$V-3.tar.xz
|
||||
ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
|
||||
ADASTRAP-hppa = adastrap-hppa-$V-0.tar.xz
|
||||
ADASTRAP-i386 = adastrap-i386-$V-1.tar.xz
|
||||
ADASTRAP-mips64 = adastrap-mips64-$V-2.tar.xz
|
||||
ADASTRAP-powerpc = adastrap-powerpc-$V-1.tar.xz
|
||||
ADASTRAP-mips64 = adastrap-mips64-$V-3.tar.xz
|
||||
ADASTRAP-powerpc = adastrap-powerpc-$V-2.tar.xz
|
||||
ADASTRAP-sparc64 = adastrap-sparc64-6.5.0-0.tar.xz
|
||||
|
||||
PKGNAME-main = gcc-${FULL_PKGVERSION}
|
||||
|
@ -211,13 +217,6 @@ LIB_DEPENDS-libs =
|
|||
CONFIG = x86_64-unknown-openbsd${OSREV}
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} == "riscv64"
|
||||
# lld complains about .gcc_except_table referencing
|
||||
# symbols in discarded sections. Tell gcc to split .gcc_except_table
|
||||
# so that its unused parts can also be discarded.
|
||||
EXTRA_ENV += PORTS_FORCE_SPLIT_SECTIONS="-ffunction-sections -fdata-sections"
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
.for f in egcc eg++
|
||||
echo "#! /bin/sh" >${WRKDIR}/bin/$f
|
||||
|
@ -241,7 +240,7 @@ post-extract:
|
|||
${WRKDIR}/bootstrap/include/c++/*/*/bits/c++config.h
|
||||
.endif
|
||||
-chmod 644 ${WRKDIR}/bootstrap/system-libs/lib*.so* # XXX
|
||||
-cp /usr/lib/libc.so.96.1 ${WRKDIR}/bootstrap/system-libs/ # XXX
|
||||
-cp `ls /usr/lib/libc.so.* | sort -t . -V | tail -1` ${WRKDIR}/bootstrap/system-libs/libc.so.* # XXX
|
||||
|
||||
post-install:
|
||||
.if ${BUILD_PACKAGES:M-ada}
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
SHA256 (gcc/adastrap-amd64-8.4.0-2.tar.xz) = md1cFMkEzkLSd20UGbdJC86YbuF8/1Fq+GWdZhTi9R4=
|
||||
SHA256 (gcc/adastrap-amd64-8.4.0-3.tar.xz) = I3JSFasUpOp+FJcPIhlOY9erWp1iJHAFpTpGBbIpemE=
|
||||
SHA256 (gcc/adastrap-arm-4.9.4-0.tar.xz) = sadBk8tP/65RDDIHlWE1yo9MnSUP/44Ou9064RXonto=
|
||||
SHA256 (gcc/adastrap-hppa-8.4.0-0.tar.xz) = coLL4dXisyWf6rxA12wmLb9LdSIHEbiy+2QrhFcxjBc=
|
||||
SHA256 (gcc/adastrap-i386-8.4.0-1.tar.xz) = leht2GSU3LvJXQbKQOBP16r2McK48tKTJ/QahKharl8=
|
||||
SHA256 (gcc/adastrap-mips64-8.4.0-2.tar.xz) = EcN30iNNpT3jlXuT1b4aVA+At6lq5nflGVX7nGjVlVQ=
|
||||
SHA256 (gcc/adastrap-powerpc-8.4.0-1.tar.xz) = 37XCFnWANlafsuyA7nze9kXznFM7yTptz0Tiznkou78=
|
||||
SHA256 (gcc/adastrap-mips64-8.4.0-3.tar.xz) = iXSWvAOvLOZAMyZMqmfaEMYemoYdABmy/RH0Tcz9HIg=
|
||||
SHA256 (gcc/adastrap-powerpc-8.4.0-2.tar.xz) = lbnQeFaMgAuql4FjIKGVT2e1IFB8pVyXlzEiaxnvkk8=
|
||||
SHA256 (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = cqpGS2beYV+CFf7X+P4voVHHT78v6SCgtksHXjP/B4E=
|
||||
SHA256 (gcc/gcc-8.4.0.tar.xz) = 4wpuUtEOHyftVRBK0jPDC9HpnPtf+YqwItyUHt0bLdQ=
|
||||
SIZE (gcc/adastrap-amd64-8.4.0-2.tar.xz) = 61507704
|
||||
SIZE (gcc/adastrap-amd64-8.4.0-3.tar.xz) = 61812184
|
||||
SIZE (gcc/adastrap-arm-4.9.4-0.tar.xz) = 31142168
|
||||
SIZE (gcc/adastrap-hppa-8.4.0-0.tar.xz) = 48150724
|
||||
SIZE (gcc/adastrap-i386-8.4.0-1.tar.xz) = 59489768
|
||||
SIZE (gcc/adastrap-mips64-8.4.0-2.tar.xz) = 49929788
|
||||
SIZE (gcc/adastrap-powerpc-8.4.0-1.tar.xz) = 53348576
|
||||
SIZE (gcc/adastrap-mips64-8.4.0-3.tar.xz) = 49719140
|
||||
SIZE (gcc/adastrap-powerpc-8.4.0-2.tar.xz) = 54731408
|
||||
SIZE (gcc/adastrap-sparc64-6.5.0-0.tar.xz) = 38704976
|
||||
SIZE (gcc/gcc-8.4.0.tar.xz) = 63713440
|
||||
|
|
|
@ -1,19 +1,6 @@
|
|||
First hunk: lld complains about .gcc_except_table referencing
|
||||
symbols in discarded sections. Tell gcc to split .gcc_except_table
|
||||
so that its unused parts can also be discarded.
|
||||
|
||||
Index: libcc1/Makefile.in
|
||||
--- libcc1/Makefile.in.orig
|
||||
+++ libcc1/Makefile.in
|
||||
@@ -292,7 +292,7 @@ CPPFLAGS_FOR_C_FAMILY = -I $(srcdir)/../gcc/c-family \
|
||||
|
||||
CPPFLAGS_FOR_C = $(CPPFLAGS_FOR_C_FAMILY) -I $(srcdir)/../gcc/c
|
||||
CPPFLAGS_FOR_CXX = $(CPPFLAGS_FOR_C_FAMILY) -I $(srcdir)/../gcc/cp
|
||||
-AM_CXXFLAGS = $(WARN_FLAGS) $(WERROR) $(visibility)
|
||||
+AM_CXXFLAGS = $(WARN_FLAGS) $(WERROR) $(visibility) $(PORTS_FORCE_SPLIT_SECTIONS)
|
||||
# Can be simplified when libiberty becomes a normal convenience library.
|
||||
libiberty_normal = ../libiberty/libiberty.a
|
||||
libiberty_noasan = ../libiberty/noasan/libiberty.a
|
||||
@@ -310,6 +310,8 @@ cc1libdir = $(libdir)/$(libsuffix)
|
||||
shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
|
||||
marshall.cc marshall.hh rpc.hh status.hh
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
Index: libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
|
||||
--- libstdc++-v3/config/os/bsd/openbsd/ctype_base.h.orig
|
||||
+++ libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
|
||||
@@ -42,6 +42,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
// on the mask type. Because of this, we don't use an enum.
|
||||
typedef char mask;
|
||||
|
||||
+#ifdef _CTYPE_U
|
||||
+ static const mask upper = _CTYPE_U;
|
||||
+ static const mask lower = _CTYPE_L;
|
||||
+ static const mask alpha = _CTYPE_U | _CTYPE_L;
|
||||
+ static const mask digit = _CTYPE_N;
|
||||
+ static const mask xdigit = _CTYPE_N | _CTYPE_X;
|
||||
+ static const mask space = _CTYPE_S;
|
||||
+ static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
|
||||
+ static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
|
||||
+ static const mask cntrl = _CTYPE_C;
|
||||
+ static const mask punct = _CTYPE_P;
|
||||
+ static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N;
|
||||
+# if __cplusplus >= 201103L
|
||||
+ static const mask blank = space;
|
||||
+# endif
|
||||
+#else
|
||||
static const mask upper = _U;
|
||||
static const mask lower = _L;
|
||||
static const mask alpha = _U | _L;
|
||||
@@ -53,8 +69,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
static const mask cntrl = _C;
|
||||
static const mask punct = _P;
|
||||
static const mask alnum = _U | _L | _N;
|
||||
-#if __cplusplus >= 201103L
|
||||
+# if __cplusplus >= 201103L
|
||||
static const mask blank = space;
|
||||
+# endif
|
||||
#endif
|
||||
};
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue