libgd: fix build and switch to clang

omniosorg · Jul 10, 2024 · dc32da9 · dc32da9
1 parent 41aac0f
commit dc32da9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/build/libgd/build.sh b/build/libgd/build.sh
@@ -23,16 +23,15 @@ SUMMARY="libgd"
 DESC="GD is an open source code library for the dynamic creation of images by "
 DESC+="programmers"
 
-# does not yet build with gcc 14
-((GCCVER > 13)) && set_gccver 13
-
 SKIP_LICENCES=libgd
 
-forgo_isaexec
-
 OPREFIX=$PREFIX
 PREFIX+="/$PROG"
 
+forgo_isaexec
+test_relver '>=' 151051 && set_clangver
+set_standard XPG6
+
 BUILD_DEPENDS_IPS="
     library/fontconfig
     library/freetype2
@@ -49,20 +48,17 @@ XFORM_ARGS="
     -DPKGROOT=$PROG
 "
 
-CONFIGURE_OPTS="
-    --prefix=$PREFIX
+CONFIGURE_OPTS+="
     --disable-static
     --includedir=$OPREFIX/include
 "
-CONFIGURE_OPTS[i386]="
-    --libdir=$OPREFIX/lib
-"
-CONFIGURE_OPTS[amd64]="
-    --libdir=$OPREFIX/lib/amd64
-"
 
-LDFLAGS[i386]+=" -R$OPREFIX/lib"
-LDFLAGS[amd64]+=" -R$OPREFIX/lib/amd64"
+pre_configure() {
+    typeset arch=$1
+
+    CONFIGURE_OPTS[$arch]+=" --libdir=$OPREFIX/${LIBDIRS[$arch]}"
+    LDFLAGS[$arch]+=" -Wl,-R$OPREFIX/${LIBDIRS[$arch]}"
+}
 
 init
 download_source $PROG $PROG $VER

diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
@@ -20,6 +20,7 @@ extra.omnios ooce/library/libarchive
 extra.omnios ooce/library/libde265
 extra.omnios ooce/library/libev
 extra.omnios ooce/library/libexif
+extra.omnios ooce/library/libgd
 extra.omnios ooce/library/libgif
 extra.omnios ooce/library/libheif
 extra.omnios ooce/library/libid3tag

diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64
@@ -85,4 +85,5 @@ ooce/library/libheif
 ###############################################################################
 .SYSROOT
 ooce/multimedia/dcraw
+ooce/library/libgd
 ###############################################################################