Merge pull request #3726 from citrus-it/gccfixed

Stop shipping include-fixed with gcc
omniosorg · Nov 11, 2024 · d0c792b · d0c792b
2 parents ffce7b9 + de50c3b
commit d0c792b
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 78 deletions.
diff --git a/build/gcc10/local.mog b/build/gcc10/local.mog
@@ -59,8 +59,5 @@ link path=usr/share/man/man1/gfortran-$(MAJOR).1 \
 link path=usr/share/man/man1/gccgo-$(MAJOR).1 \
     target=/$(OPT)/share/man/man1/gccgo.1
 
-# We do not want to ship gcc's "fixed" headers for aarch64 since they are
-# broken there (for example, PATH_MAX is stripped from limits.h)
-$(aarch64_ONLY)<transform path=$(OPT)/lib/gcc/[^/]+/$(GCCVER)/include-fixed \
-    -> drop>
+<transform path=$(OPT)/lib/gcc/[^/]+/$(GCCVER)/include-fixed -> drop>
 
diff --git a/build/gcc13/build.sh b/build/gcc13/build.sh
@@ -27,7 +27,7 @@ DESC="The GNU Compiler Collection"
 GCCMAJOR=${VER%%.*}
 OPT=/opt/gcc-$GCCMAJOR
 
-XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=$OPT -D GCCVER=$VER"
+XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=${OPT#/} -D GCCVER=$VER"
 BMI_EXPECTED=1
 
 PREFIX=$OPT

diff --git a/build/gcc13/local.mog b/build/gcc13/local.mog
@@ -17,20 +17,20 @@ license COPYING3 license=GPLv3
 license COPYING3.LIB license=LGPLv3
 
 # Mediated symlinks
-<transform link target=$(OPT)/ -> default mediator gcc>
-<transform link target=$(OPT)/ -> default mediator-version $(MAJOR)>
+<transform link target=/$(OPT)/ -> default mediator gcc>
+<transform link target=/$(OPT)/ -> default mediator-version $(MAJOR)>
 
-link path=usr/bin/g++                   target=$(OPT)/bin/g++
-link path=usr/bin/gcc                   target=$(OPT)/bin/gcc
-link path=usr/bin/gcov                  target=$(OPT)/bin/gcov
-link path=usr/bin/gcpp                  target=$(OPT)/bin/cpp
-link path=usr/bin/gfortran              target=$(OPT)/bin/gfortran
+link path=usr/bin/g++                   target=/$(OPT)/bin/g++
+link path=usr/bin/gcc                   target=/$(OPT)/bin/gcc
+link path=usr/bin/gcov                  target=/$(OPT)/bin/gcov
+link path=usr/bin/gcpp                  target=/$(OPT)/bin/cpp
+link path=usr/bin/gfortran              target=/$(OPT)/bin/gfortran
 
-link path=usr/share/man/man1/g++.1      target=$(OPT)/share/man/man1/g++.1
-link path=usr/share/man/man1/gcc.1      target=$(OPT)/share/man/man1/gcc.1
-link path=usr/share/man/man1/gcov.1     target=$(OPT)/share/man/man1/gcov.1
-link path=usr/share/man/man1/gcpp.1     target=$(OPT)/share/man/man1/cpp.1
-link path=usr/share/man/man1/gfortran.1 target=$(OPT)/share/man/man1/gfortran.1
+link path=usr/share/man/man1/g++.1      target=/$(OPT)/share/man/man1/g++.1
+link path=usr/share/man/man1/gcc.1      target=/$(OPT)/share/man/man1/gcc.1
+link path=usr/share/man/man1/gcov.1     target=/$(OPT)/share/man/man1/gcov.1
+link path=usr/share/man/man1/gcpp.1     target=/$(OPT)/share/man/man1/cpp.1
+link path=usr/share/man/man1/gfortran.1 target=/$(OPT)/share/man/man1/gfortran.1
 
 # Symlinks to make the compiler tools available as xxx-13.
 # These are not mediated.
@@ -39,16 +39,18 @@ link path=usr/share/man/man1/gfortran.1 target=$(OPT)/share/man/man1/gfortran.1
 <transform link path=usr/.*-$(MAJOR)(\.1)?$ -> delete mediator-version .>
 <transform link path=usr/.*-$(MAJOR)(\.1)?$ -> delete mediator-priority .>
 
-link path=usr/bin/g++-$(MAJOR)          target=$(OPT)/bin/g++
-link path=usr/bin/gcc-$(MAJOR)          target=$(OPT)/bin/gcc
-link path=usr/bin/gcov-$(MAJOR)         target=$(OPT)/bin/gcov
-link path=usr/bin/gcpp-$(MAJOR)         target=$(OPT)/bin/cpp
-link path=usr/bin/gfortran-$(MAJOR)     target=$(OPT)/bin/gfortran
+link path=usr/bin/g++-$(MAJOR)          target=/$(OPT)/bin/g++
+link path=usr/bin/gcc-$(MAJOR)          target=/$(OPT)/bin/gcc
+link path=usr/bin/gcov-$(MAJOR)         target=/$(OPT)/bin/gcov
+link path=usr/bin/gcpp-$(MAJOR)         target=/$(OPT)/bin/cpp
+link path=usr/bin/gfortran-$(MAJOR)     target=/$(OPT)/bin/gfortran
 
-link path=usr/share/man/man1/g++-$(MAJOR).1  target=$(OPT)/share/man/man1/g++.1
-link path=usr/share/man/man1/gcc-$(MAJOR).1  target=$(OPT)/share/man/man1/gcc.1
-link path=usr/share/man/man1/gcov-$(MAJOR).1 target=$(OPT)/share/man/man1/gcov.1
-link path=usr/share/man/man1/gcpp-$(MAJOR).1 target=$(OPT)/share/man/man1/cpp.1
+link path=usr/share/man/man1/g++-$(MAJOR).1  target=/$(OPT)/share/man/man1/g++.1
+link path=usr/share/man/man1/gcc-$(MAJOR).1  target=/$(OPT)/share/man/man1/gcc.1
+link path=usr/share/man/man1/gcov-$(MAJOR).1 target=/$(OPT)/share/man/man1/gcov.1
+link path=usr/share/man/man1/gcpp-$(MAJOR).1 target=/$(OPT)/share/man/man1/cpp.1
 link path=usr/share/man/man1/gfortran-$(MAJOR).1 \
-    target=$(OPT)/share/man/man1/gfortran.1
+    target=/$(OPT)/share/man/man1/gfortran.1
+
+<transform path=$(OPT)/lib/gcc/[^/]+/$(GCCVER)/include-fixed -> drop>
 
diff --git a/build/gcc14/build.sh b/build/gcc14/build.sh
@@ -38,7 +38,7 @@ set_arch 64
 set_ssp none
 ARCH=${TRIPLETS[amd64]}
 
-XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=$OPT -D GCCVER=$VER -D TRIPLET=$ARCH"
+XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=${OPT#/} -D GCCVER=$VER -D TRIPLET=$ARCH"
 
 # We're building the 64-bit version of the compiler and tools but we want
 # to install it in the standard bin/lib locations. Gcc will take care of

diff --git a/build/gcc14/local.mog b/build/gcc14/local.mog
@@ -17,21 +17,21 @@ license COPYING3 license=GPLv3
 license COPYING3.LIB license=LGPLv3
 
 # Mediated symlinks
-<transform link target=$(OPT)/ -> default mediator gcc>
-<transform link target=$(OPT)/ -> default mediator-version $(MAJOR)>
-<transform link target=$(OPT)/ -> default mediator-priority vendor>
-
-link path=usr/bin/g++                   target=$(OPT)/bin/g++
-link path=usr/bin/gcc                   target=$(OPT)/bin/gcc
-link path=usr/bin/gcov                  target=$(OPT)/bin/gcov
-link path=usr/bin/gcpp                  target=$(OPT)/bin/cpp
-link path=usr/bin/gfortran              target=$(OPT)/bin/gfortran
-
-link path=usr/share/man/man1/g++.1      target=$(OPT)/share/man/man1/g++.1
-link path=usr/share/man/man1/gcc.1      target=$(OPT)/share/man/man1/gcc.1
-link path=usr/share/man/man1/gcov.1     target=$(OPT)/share/man/man1/gcov.1
-link path=usr/share/man/man1/gcpp.1     target=$(OPT)/share/man/man1/cpp.1
-link path=usr/share/man/man1/gfortran.1 target=$(OPT)/share/man/man1/gfortran.1
+<transform link target=/$(OPT)/ -> default mediator gcc>
+<transform link target=/$(OPT)/ -> default mediator-version $(MAJOR)>
+<transform link target=/$(OPT)/ -> default mediator-priority vendor>
+
+link path=usr/bin/g++                   target=/$(OPT)/bin/g++
+link path=usr/bin/gcc                   target=/$(OPT)/bin/gcc
+link path=usr/bin/gcov                  target=/$(OPT)/bin/gcov
+link path=usr/bin/gcpp                  target=/$(OPT)/bin/cpp
+link path=usr/bin/gfortran              target=/$(OPT)/bin/gfortran
+
+link path=usr/share/man/man1/g++.1      target=/$(OPT)/share/man/man1/g++.1
+link path=usr/share/man/man1/gcc.1      target=/$(OPT)/share/man/man1/gcc.1
+link path=usr/share/man/man1/gcov.1     target=/$(OPT)/share/man/man1/gcov.1
+link path=usr/share/man/man1/gcpp.1     target=/$(OPT)/share/man/man1/cpp.1
+link path=usr/share/man/man1/gfortran.1 target=/$(OPT)/share/man/man1/gfortran.1
 
 # Symlinks to make the compiler tools available as xxx-14.
 # These are not mediated.
@@ -40,19 +40,22 @@ link path=usr/share/man/man1/gfortran.1 target=$(OPT)/share/man/man1/gfortran.1
 <transform link path=usr/.*-$(MAJOR)(\.1)?$ -> delete mediator-version .>
 <transform link path=usr/.*-$(MAJOR)(\.1)?$ -> delete mediator-priority .>
 
-link path=usr/bin/g++-$(MAJOR)          target=$(OPT)/bin/g++
-link path=usr/bin/gcc-$(MAJOR)          target=$(OPT)/bin/gcc
-link path=usr/bin/gcov-$(MAJOR)         target=$(OPT)/bin/gcov
-link path=usr/bin/gcpp-$(MAJOR)         target=$(OPT)/bin/cpp
-link path=usr/bin/gfortran-$(MAJOR)     target=$(OPT)/bin/gfortran
-
-link path=usr/share/man/man1/g++-$(MAJOR).1  target=$(OPT)/share/man/man1/g++.1
-link path=usr/share/man/man1/gcc-$(MAJOR).1  target=$(OPT)/share/man/man1/gcc.1
-link path=usr/share/man/man1/gcov-$(MAJOR).1 target=$(OPT)/share/man/man1/gcov.1
-link path=usr/share/man/man1/gcpp-$(MAJOR).1 target=$(OPT)/share/man/man1/cpp.1
+link path=usr/bin/g++-$(MAJOR)          target=/$(OPT)/bin/g++
+link path=usr/bin/gcc-$(MAJOR)          target=/$(OPT)/bin/gcc
+link path=usr/bin/gcov-$(MAJOR)         target=/$(OPT)/bin/gcov
+link path=usr/bin/gcpp-$(MAJOR)         target=/$(OPT)/bin/cpp
+link path=usr/bin/gfortran-$(MAJOR)     target=/$(OPT)/bin/gfortran
+
+link path=usr/share/man/man1/g++-$(MAJOR).1  target=/$(OPT)/share/man/man1/g++.1
+link path=usr/share/man/man1/gcc-$(MAJOR).1  target=/$(OPT)/share/man/man1/gcc.1
+link path=usr/share/man/man1/gcov-$(MAJOR).1 \
+    target=/$(OPT)/share/man/man1/gcov.1
+link path=usr/share/man/man1/gcpp-$(MAJOR).1 target=/$(OPT)/share/man/man1/cpp.1
 link path=usr/share/man/man1/gfortran-$(MAJOR).1 \
-    target=$(OPT)/share/man/man1/gfortran.1
+    target=/$(OPT)/share/man/man1/gfortran.1
 
 link path=$(OPT)/lib/gcc/$(TRIPLET)/$(MAJOR) target=$(GCCVER)
 link path=$(OPT)/include/c++/$(MAJOR) target=$(GCCVER)
 
+<transform path=$(OPT)/lib/gcc/$(TRIPLET)/$(GCCVER)/include-fixed -> drop>
+
diff --git a/build/gcc7/build.sh b/build/gcc7/build.sh
@@ -13,7 +13,7 @@
 # }}}
 #
 # Copyright 2014 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -27,7 +27,7 @@ DESC="The GNU Compiler Collection"
 GCCMAJOR=${VER%%.*}
 OPT=/opt/gcc-$GCCMAJOR
 
-XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=$OPT -D GCCVER=$VER"
+XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=${OPT#/} -D GCCVER=$VER"
 BMI_EXPECTED=1
 
 # Build gcc with itself

diff --git a/build/gcc7/local.mog b/build/gcc7/local.mog
@@ -20,20 +20,20 @@ license COPYING3.LIB license=LGPLv3
 <transform file path=$(OPT)/share/info -> drop>
 
 # Mediated symlinks
-<transform link target=$(OPT)/ -> default mediator gcc>
-<transform link target=$(OPT)/ -> default mediator-version $(MAJOR)>
+<transform link target=/$(OPT)/ -> default mediator gcc>
+<transform link target=/$(OPT)/ -> default mediator-version $(MAJOR)>
 
-link path=usr/bin/g++                   target=$(OPT)/bin/g++
-link path=usr/bin/gcc                   target=$(OPT)/bin/gcc
-link path=usr/bin/gcov                  target=$(OPT)/bin/gcov
-link path=usr/bin/gcpp                  target=$(OPT)/bin/cpp
-link path=usr/bin/gfortran              target=$(OPT)/bin/gfortran
+link path=usr/bin/g++                   target=/$(OPT)/bin/g++
+link path=usr/bin/gcc                   target=/$(OPT)/bin/gcc
+link path=usr/bin/gcov                  target=/$(OPT)/bin/gcov
+link path=usr/bin/gcpp                  target=/$(OPT)/bin/cpp
+link path=usr/bin/gfortran              target=/$(OPT)/bin/gfortran
 
-link path=usr/share/man/man1/g++.1      target=$(OPT)/share/man/man1/g++.1
-link path=usr/share/man/man1/gcc.1      target=$(OPT)/share/man/man1/gcc.1
-link path=usr/share/man/man1/gcov.1     target=$(OPT)/share/man/man1/gcov.1
-link path=usr/share/man/man1/gcpp.1     target=$(OPT)/share/man/man1/cpp.1
-link path=usr/share/man/man1/gfortran.1 target=$(OPT)/share/man/man1/gfortran.1
+link path=usr/share/man/man1/g++.1      target=/$(OPT)/share/man/man1/g++.1
+link path=usr/share/man/man1/gcc.1      target=/$(OPT)/share/man/man1/gcc.1
+link path=usr/share/man/man1/gcov.1     target=/$(OPT)/share/man/man1/gcov.1
+link path=usr/share/man/man1/gcpp.1     target=/$(OPT)/share/man/man1/cpp.1
+link path=usr/share/man/man1/gfortran.1 target=/$(OPT)/share/man/man1/gfortran.1
 
 # Symlinks to make the compiler tools available as xxx-7.
 # These are not mediated.
@@ -42,16 +42,18 @@ link path=usr/share/man/man1/gfortran.1 target=$(OPT)/share/man/man1/gfortran.1
 <transform link path=usr/.*-$(MAJOR)(\.1)?$ -> delete mediator-version .>
 <transform link path=usr/.*-$(MAJOR)(\.1)?$ -> delete mediator-priority .>
 
-link path=usr/bin/g++-$(MAJOR)          target=$(OPT)/bin/g++
-link path=usr/bin/gcc-$(MAJOR)          target=$(OPT)/bin/gcc
-link path=usr/bin/gcov-$(MAJOR)         target=$(OPT)/bin/gcov
-link path=usr/bin/gcpp-$(MAJOR)         target=$(OPT)/bin/cpp
-link path=usr/bin/gfortran-$(MAJOR)     target=$(OPT)/bin/gfortran
+link path=usr/bin/g++-$(MAJOR)          target=/$(OPT)/bin/g++
+link path=usr/bin/gcc-$(MAJOR)          target=/$(OPT)/bin/gcc
+link path=usr/bin/gcov-$(MAJOR)         target=/$(OPT)/bin/gcov
+link path=usr/bin/gcpp-$(MAJOR)         target=/$(OPT)/bin/cpp
+link path=usr/bin/gfortran-$(MAJOR)     target=/$(OPT)/bin/gfortran
 
-link path=usr/share/man/man1/g++-$(MAJOR).1  target=$(OPT)/share/man/man1/g++.1
-link path=usr/share/man/man1/gcc-$(MAJOR).1  target=$(OPT)/share/man/man1/gcc.1
-link path=usr/share/man/man1/gcov-$(MAJOR).1 target=$(OPT)/share/man/man1/gcov.1
-link path=usr/share/man/man1/gcpp-$(MAJOR).1 target=$(OPT)/share/man/man1/cpp.1
+link path=usr/share/man/man1/g++-$(MAJOR).1  target=/$(OPT)/share/man/man1/g++.1
+link path=usr/share/man/man1/gcc-$(MAJOR).1  target=/$(OPT)/share/man/man1/gcc.1
+link path=usr/share/man/man1/gcov-$(MAJOR).1 target=/$(OPT)/share/man/man1/gcov.1
+link path=usr/share/man/man1/gcpp-$(MAJOR).1 target=/$(OPT)/share/man/man1/cpp.1
 link path=usr/share/man/man1/gfortran-$(MAJOR).1 \
-    target=$(OPT)/share/man/man1/gfortran.1
+    target=/$(OPT)/share/man/man1/gfortran.1
+
+<transform path=$(OPT)/lib/gcc/[^/]+/$(GCCVER)/include-fixed -> drop>