Hi ports --
For some reason, the gcc package doesn't install the stdatomic.h header.
Which doesn't matter, until it matters.
Discovered when I was building Firefox on amd64 with gcc-6.4.0 (which
works at runtime just fine, but is not a discussion to be had on this
thread because it's way more involved than this simple diff). Firefox
needs stdatomic.h when using gcc, and this diff lets Firefox build
successfully.
I'm kinda guessing with the PFRAG.* stuff outside of PFRAG.X86-main, so
more eyes appreciated.
OK? Better solution within the gcc framework itself?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/6/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 26 Nov 2018 22:21:31 -0000 1.13
+++ Makefile 27 Nov 2018 04:00:45 -0000
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS}
DPB_PROPERTIES = parallel
V = 6.4.0
-REVISION = 2
+REVISION = 3
FULL_VERSION = $V
FULL_PKGVERSION = $V
@@ -250,7 +250,10 @@ post-extract:
${WRKDIR}/bootstrap/include/c++/*/*/bits/c++config.h
.endif
+# Upstream doesn't install stdatomic.h???
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/gcc/ginclude/stdatomic.h \
+ ${PREFIX}/lib/gcc/${CONFIG}/${V}/include
.if ${BUILD_PACKAGES:M-ada}
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
Index: pkg/PFRAG.X86-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.X86-main,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.X86-main
--- pkg/PFRAG.X86-main 28 Dec 2016 21:48:21 -0000 1.2
+++ pkg/PFRAG.X86-main 27 Nov 2018 04:00:46 -0000
@@ -48,6 +48,7 @@ lib/gcc/${CONFIG}/${V}/include/rdseedint
lib/gcc/${CONFIG}/${V}/include/rtmintrin.h
lib/gcc/${CONFIG}/${V}/include/shaintrin.h
lib/gcc/${CONFIG}/${V}/include/smmintrin.h
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tbmintrin.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/tmmintrin.h
Index: pkg/PFRAG.alpha-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.alpha-main,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.alpha-main
--- pkg/PFRAG.alpha-main 1 Nov 2018 22:09:30 -0000 1.1
+++ pkg/PFRAG.alpha-main 27 Nov 2018 04:00:46 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.alpha-main,v 1.1 2018/11/01 22:09:30 sthen Exp $
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/unwind.h
lib/gcc/${CONFIG}/${V}/plugin/include/config/alpha/
Index: pkg/PFRAG.arm-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.arm-main,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.arm-main
--- pkg/PFRAG.arm-main 9 Sep 2016 20:51:03 -0000 1.2
+++ pkg/PFRAG.arm-main 27 Nov 2018 04:00:46 -0000
@@ -2,6 +2,7 @@
lib/gcc/${CONFIG}/${V}/include/arm_acle.h
lib/gcc/${CONFIG}/${V}/include/arm_neon.h
lib/gcc/${CONFIG}/${V}/include/mmintrin.h
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/unwind-arm-common.h
lib/gcc/${CONFIG}/${V}/include/unwind.h
Index: pkg/PFRAG.mips64-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.mips64-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.mips64-main
--- pkg/PFRAG.mips64-main 4 Sep 2016 16:20:22 -0000 1.1.1.1
+++ pkg/PFRAG.mips64-main 27 Nov 2018 04:00:46 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.mips64-main,v 1.1.1.1 2016/09/04 16:20:22 pascal Exp $
lib/gcc/${CONFIG}/${V}/include/loongson.h
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/unwind.h
lib/gcc/${CONFIG}/${V}/plugin/include/config/dbxelf.h
Index: pkg/PFRAG.mips64el-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.mips64el-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.mips64el-main
--- pkg/PFRAG.mips64el-main 4 Sep 2016 16:20:22 -0000 1.1.1.1
+++ pkg/PFRAG.mips64el-main 27 Nov 2018 04:00:46 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.mips64el-main,v 1.1.1.1 2016/09/04 16:20:22 pascal Exp $
lib/gcc/${CONFIG}/${V}/include/loongson.h
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/unwind.h
lib/gcc/${CONFIG}/${V}/plugin/include/config/dbxelf.h
Index: pkg/PFRAG.powerpc-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.powerpc-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.powerpc-main
--- pkg/PFRAG.powerpc-main 4 Sep 2016 16:20:20 -0000 1.1.1.1
+++ pkg/PFRAG.powerpc-main 27 Nov 2018 04:00:46 -0000
@@ -8,6 +8,7 @@ lib/gcc/${CONFIG}/${V}/include/ppu_intri
lib/gcc/${CONFIG}/${V}/include/si2vmx.h
lib/gcc/${CONFIG}/${V}/include/spe.h
lib/gcc/${CONFIG}/${V}/include/spu2vmx.h
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/unwind.h
lib/gcc/${CONFIG}/${V}/include/vec_types.h
Index: pkg/PFRAG.sparc64-main
===================================================================
RCS file: /cvs/ports/lang/gcc/6/pkg/PFRAG.sparc64-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.sparc64-main
--- pkg/PFRAG.sparc64-main 4 Sep 2016 16:20:20 -0000 1.1.1.1
+++ pkg/PFRAG.sparc64-main 27 Nov 2018 04:00:46 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.sparc64-main,v 1.1.1.1 2016/09/04 16:20:20 pascal Exp $
+lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/tgmath.h
lib/gcc/${CONFIG}/${V}/include/unwind.h
lib/gcc/${CONFIG}/${V}/include/visintrin.h
