Skip to content

Commit e1bb67d

Browse files
authored
Merge pull request #4075 from hadfl/aarch64
aarch64 build fixes
2 parents 11eb18d + 64add69 commit e1bb67d

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

build/iso-codes/build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ DESC+="(e.g. country, language, language scripts, and currency names)"
2727
set_builddir $PROG-v$VER
2828
set_arch 64
2929

30+
pre_configure() {
31+
typeset arch=$1
32+
33+
! cross_arch $arch && return
34+
35+
CONFIGURE_OPTS[$arch]="--prefix=$PREFIX"
36+
37+
PATH+=:$OOCEBIN
38+
}
39+
3040
init
3141
download_source $PROG $PROG v$VER
3242
patch_source

build/ncurses/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ CONFIGURE_OPTS_COMMON="
4545
--with-terminfo-dirs=$GPREFIX/share/terminfo
4646
--with-default-terminfo-dir=$GPREFIX/share/terminfo
4747
cf_cv_struct_dirent64=no
48+
TIC=$GNUBIN/tic
4849
"
4950
CONFIGURE_OPTS_ABI6="$CONFIGURE_OPTS_COMMON"
5051
CONFIGURE_OPTS_ABI5="$CONFIGURE_OPTS_COMMON --with-abi-version=5"
@@ -65,9 +66,6 @@ CONFIGURE_OPTS[aarch64]="
6566
--with-pkg-config-libdir=$PREFIX/lib/pkgconfig
6667
"
6768

68-
# Always use the GNU version of tic for compiling terminfo
69-
export TIC_PATH=$GNUBIN/tic
70-
7169
build_abi5() {
7270
logmsg -n '--- Building backward-compatible ABI version 5 libraries.'
7371
# Skip for cross compiling

doc/baseline.aarch64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,15 @@ omnios system/firmware/aarch64
474474
omnios system/flash/fwflash
475475
omnios system/fru-id
476476
omnios system/fru-id/platform
477+
omnios system/gpio
477478
omnios system/header
478479
omnios system/header/header-audio
479480
omnios system/header/header-firewire
480481
omnios system/header/header-picl
481482
omnios system/header/header-storage
482483
omnios system/header/header-ugen
483484
omnios system/header/header-usb
485+
omnios system/i2c
484486
omnios system/io/tests
485487
omnios system/ipc
486488
omnios system/kernel
@@ -577,6 +579,7 @@ omnios system/storage/luxadm
577579
omnios system/storage/sasinfo
578580
omnios system/test/cryptotest
579581
omnios system/test/elftest
582+
omnios system/test/i2ctest
580583
omnios system/test/ksh93
581584
omnios system/test/libctest
582585
omnios system/test/libmlrpctest

0 commit comments

Comments
 (0)