aarch64: build cups

omniosorg · Jul 7, 2023 · 6494331 · 6494331
1 parent 6381b06
commit 6494331
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/build/cups/build.sh b/build/cups/build.sh
@@ -31,6 +31,8 @@ OPREFIX=$PREFIX
 PREFIX+="/$PROG"
 VARDIR="/var$PREFIX"
 
+forgo_isaexec
+
 XFORM_ARGS="
     -DPREFIX=${PREFIX#/}
     -DOPREFIX=${OPREFIX#/}
@@ -39,7 +41,6 @@ XFORM_ARGS="
 "
 
 CONFIGURE_OPTS="
-    --prefix=$PREFIX
     --sysconfdir=/etc$OPREFIX
     --includedir=$OPREFIX/include
     --localstatedir=$VARDIR
@@ -67,19 +68,14 @@ CONFIGURE_OPTS="
 # this currently fails in zones as it uses libdevinfo
 CONFIGURE_OPTS+=" --disable-libusb"
 
-CONFIGURE_OPTS[i386]="
-    --libdir=$OPREFIX/lib
-"
-CONFIGURE_OPTS[amd64]="
-    --libdir=$OPREFIX/lib/amd64
-"
-
-LDFLAGS[i386]+=" -L$OPREFIX/lib -Wl,-R$OPREFIX/lib -lsocket"
-LDFLAGS[amd64]+=" -L$OPREFIX/lib/amd64 -Wl,-R$OPREFIX/lib/amd64 -lsocket"
-
 pre_configure() {
     typeset arch=$1
 
+    CONFIGURE_OPTS[$arch]+=" --libdir=$OPREFIX/${LIBDIRS[$arch]}"
+    LDFLAGS[$arch]+=" -L${SYSROOT[$arch]}/usr/${LIBDIRS[$arch]}"
+    LDFLAGS[$arch]+=" -Wl,-R$OPREFIX/${LIBDIRS[$arch]}"
+    LDFLAGS[$arch]+=" -lsocket"
+
     export DSOFLAGS="$LDFLAGS ${LDFLAGS[$arch]}"
 }
 
@@ -89,7 +85,6 @@ patch_source
 prep_build
 run_autoconf -f
 build
-strip_install
 VER=${VER//op/.} make_package
 clean_up
 

diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
@@ -31,6 +31,7 @@ extra.omnios ooce/multimedia/x264
 extra.omnios ooce/network/nsd
 extra.omnios ooce/network/openldap
 extra.omnios ooce/network/unbound
+extra.omnios ooce/print/cups
 extra.omnios ooce/security/gnupg
 extra.omnios ooce/system/htop
 extra.omnios ooce/terminal/minicom

diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64
@@ -34,6 +34,7 @@ ooce/terminal/minicom
 ooce/text/hunspell
 ooce/compress/pbzip2
 ooce/compress/pigz
+ooce/print/cups
 ###############################################################################
 .SYSROOT
 ooce/audio/flac