Merge pull request #3283 from citrus-it/build-essential

aarch64: add build-essential
omniosorg · Jul 10, 2023 · decd7aa · decd7aa
2 parents 668810f + f0f434e
commit decd7aa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build/flex/build.sh b/build/flex/build.sh
@@ -21,8 +21,7 @@
 # CDDL HEADER END }}}
 #
 # Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
-# Use is subject to license terms.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 #
 . ../../lib/build.sh
 
@@ -39,6 +38,7 @@ CONFIGURE_OPTS="
 	--infodir=$PREFIX/share/info
 "
 CONFIGURE_OPTS[amd64]+=" --includedir=/usr/include"
+CONFIGURE_OPTS[aarch64]+=" CC_FOR_BUILD=$GCC"
 
 MAKE_ARGS+=' dist_doc_DATA= '
 MAKE_INSTALL_ARGS+=' dist_doc_DATA= '

diff --git a/build/flex/local.mog b/build/flex/local.mog
@@ -7,10 +7,12 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 license COPYING license=BSD-LLNL
 
 dir group=bin mode=0755 owner=root path=usr/sfw/bin
 link path=usr/sfw/bin/flex target=../../bin/flex
 
+<transform file path=.*\.a$ -> drop>
+
diff --git a/build/meta/build-essential.p5m b/build/meta/build-essential.p5m
@@ -1,11 +1,12 @@
 set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/developer/build-essential@11,5.11-$(PVER)
 set name=pkg.summary value="Meta-package containing common development tools."
 set name=pkg.description value="Meta-package containing common development tools."
+$(i386_ONLY)depend fmri=developer/gcc12 type=require
+$(aarch64_ONLY)depend fmri=developer/gcc10 type=require
 depend fmri=developer/build/autoconf type=require
 depend fmri=developer/build/automake type=require
 depend fmri=developer/build/gnu-make type=require
 depend fmri=developer/build/make type=require
-depend fmri=developer/gcc12 type=require
 depend fmri=developer/lexer/flex type=require
 depend fmri=developer/object-file type=require
 depend fmri=developer/parser/bison type=require

diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64
@@ -22,8 +22,10 @@ compress/lzip
 compress/unzip
 compress/xz
 data/iso-codes
+developer/build-essential
 developer/build/libtool
 developer/exuberant-ctags
+developer/lexer/flex
 developer/macro/gnu-m4
 developer/nasm
 developer/parser/bison
@@ -52,6 +54,8 @@ web/ca-bundle
 compress/zip
 compress/zstd
 database/sqlite-3
+developer/build/autoconf
+developer/build/automake
 developer/build/gnu-make
 editor/vim
 file/gnu-coreutils
@@ -142,13 +146,6 @@ entire
 ###############################################################################
 # TO DO
 # compress/p7zip
-# developer/build-essential
-# developer/build/autoconf
-# developer/build/automake
-# developer/gcc10
-# developer/gcc12
-# developer/gnu-binutils
-# developer/lexer/flex
 # developer/macro/cpp
 # developer/pkg-config
 # developer/swig