cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch ports-gcc to GCC 8.3.0:

Browse Source 
* switch gcc4 module to gcc/8
* register the gcc/8 subpackages as updates for their gcc/4.9 counterparts
* sync the gcc version in devel/llvm
* add a quirk entry that gcj is obsolete
* unhook 4.9 from the build

Preparatory work by many.
ok sthen@
This commit is contained in:
naddy 2019-04-27 21:26:34 +00:00
parent 2ce0828c3b
commit b7e8ac93a7
12 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/llvm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.216 2019/03/09 06:18:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.217 2019/04/27 21:26:34 naddy Exp $
# XXX: Remember to bump MODCLANG_VERSION in lang/clang/clang.port.mk when
# updating this port.
@ -20,7 +20,7 @@ PKGSPEC-main = llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
REVISION-main = 9
REVISION-main = 10
REVISION-lldb = 0
CATEGORIES = devel
DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \
@ -114,7 +114,7 @@ PKG_ARGS += -Dpowerpc=0
TEST_TARGET = check
# XXX sync
GCC_VER = 4.9.4
GCC_VER = 8.3.0
.if ${MACHINE_ARCH} == "amd64"
GCC_CONFIG = x86_64-unknown-openbsd${OSREV}
.else

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.738 2019/04/27 17:27:29 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.739 2019/04/27 21:26:34 naddy Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.131
PKGNAME = quirks-3.132
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.755 2019/04/27 17:27:29 ajacoutot Exp $
# $OpenBSD: Quirks.pm,v 1.756 2019/04/27 21:26:35 naddy Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -1216,6 +1216,7 @@ my $obsolete_reason = {
'py3-funcsigs' => 5,
'rust-doc' => 1,
'glib-openssl' => 6,
'gcj' => 5,
};
# reasons for obsolete packages

4
infrastructure/mk/gcc4.port.mk
View File

@ -1,6 +1,2 @@
.if ${MACHINE_ARCH} == "aarch64"
MODGCC4_VERSION?=8
.else
MODGCC4_VERSION?=4.9
.endif
.include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk"

3
lang/gcc/8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2019/03/25 20:17:46 pascal Exp $
# $OpenBSD: Makefile,v 1.10 2019/04/27 21:26:35 naddy Exp $
BROKEN-i386 = ld: error: cp-demangle.c:(.debug_info+0x30115): has non-ABS relocation R_386_GOTOFF against symbol '.LC60'
@ -11,6 +11,7 @@ ONLY_FOR_ARCHS-ada = amd64 hppa i386 mips64 powerpc
DPB_PROPERTIES = parallel
V = 8.3.0
REVISION = 0
FULL_VERSION = $V
FULL_PKGVERSION = $V

4
lang/gcc/8/pkg/PLIST-ada
View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST-ada,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@comment $OpenBSD: PLIST-ada,v 1.2 2019/04/27 21:26:35 naddy Exp $
@option is-branch
@conflict gnat-<9
@pkgpath lang/gcc/4.9,-ada
@bin bin/gnat
@bin bin/gnatbind
@bin bin/gnatchop

4
lang/gcc/8/pkg/PLIST-c++
View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST-c++,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@comment $OpenBSD: PLIST-c++,v 1.2 2019/04/27 21:26:35 naddy Exp $
@option is-branch
@conflict gcc-libs->=9
@conflict g++-<9
@pkgpath lang/gcc/4.9,-c++
@bin bin/ec++
@bin bin/eg++
@bin bin/${CONFIG}-ec++

4
lang/gcc/8/pkg/PLIST-f95
View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-f95,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@comment $OpenBSD: PLIST-f95,v 1.2 2019/04/27 21:26:35 naddy Exp $
@option is-branch
@conflict gfortran-*
@conflict libgfortran-*
@conflict g95-<9
@pkgpath lang/gcc/4.9,-f95
@bin bin/egfortran
@bin bin/${CONFIG}-egfortran
@info info/gfortran.info

5
lang/gcc/8/pkg/PLIST-libs
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-libs,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@comment $OpenBSD: PLIST-libs,v 1.2 2019/04/27 21:26:35 naddy Exp $
@option no-default-conflict
@option is-branch
@conflict gcc-libs->=8,<9
@conflict gcc-libs-<9
@pkgpath lang/gcc/4.9,-libs
lib/libatomic.la
@lib lib/libatomic.so.${LIBatomic_VERSION}
lib/libestdc++.la

4
lang/gcc/8/pkg/PLIST-main
View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2019/04/27 21:26:35 naddy Exp $
@option is-branch
@conflict gcc-<9
@pkgpath lang/gcc/4.9,-main
@bin bin/ecpp
@bin bin/egcc
@bin bin/egcc-ar

4
lang/gcc/8/pkg/PLIST-objc
View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST-objc,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@comment $OpenBSD: PLIST-objc,v 1.2 2019/04/27 21:26:35 naddy Exp $
@option is-branch
@conflict gobjc-<9
@pkgpath lang/gcc/4.9,-objc
lib/gcc/${CONFIG}/${V}/include/objc/
lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h
lib/gcc/${CONFIG}/${V}/include/objc/Object.h

3
lang/gcc/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.16 2019/02/02 18:44:03 pascal Exp $
# $OpenBSD: Makefile,v 1.17 2019/04/27 21:26:35 naddy Exp $
SUBDIR =
SUBDIR += 4.9
SUBDIR += 8
.include <bsd.port.subdir.mk>