From d24936c9cba99da992f091fbdca406d939234cd3 Mon Sep 17 00:00:00 2001
From: gnattu <gnattuoc@me.com>
Date: Wed, 6 Mar 2024 23:54:57 +0800
Subject: [PATCH] chore: use more intuative macOS setup for built-in libs

---
 builder/scripts.d/20-libiconv.sh | 11 ++++-------
 builder/scripts.d/20-libxml2.sh  | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/builder/scripts.d/20-libiconv.sh b/builder/scripts.d/20-libiconv.sh
index 2706c67c0..f2083e22d 100755
--- a/builder/scripts.d/20-libiconv.sh
+++ b/builder/scripts.d/20-libiconv.sh
@@ -5,12 +5,13 @@ SCRIPT_COMMIT="v1.17"
 SCRIPT_TAGFILTER="v?.*"
 
 ffbuild_enabled() {
-    # iconv is macOS built-in
-    [[ $TARGET == mac* ]] && return -1
     return 0
 }
 
 ffbuild_dockerbuild() {
+    # iconv is macOS built-in
+    [[ $TARGET == mac* ]] && return 0
+
     git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" iconv
     cd iconv
 
@@ -50,9 +51,5 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    if [[ $TARGET == mac* ]]; then
-        echo --enable-iconv
-    else
-        echo --disable-iconv
-    fi
+    echo --disable-iconv
 }
diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh
index 31e37f4d0..3cf0978e1 100755
--- a/builder/scripts.d/20-libxml2.sh
+++ b/builder/scripts.d/20-libxml2.sh
@@ -4,12 +4,13 @@ SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
 SCRIPT_COMMIT="12ce9b5ffeba776ede786c075795a4dbae94bfa1"
 
 ffbuild_enabled() {
-    # libxml2 is macOS built-in
-    [[ $TARGET == mac* ]] && return -1
     return 0
 }
 
 ffbuild_dockerbuild() {
+    # libxml2 is macOS built-in
+    [[ $TARGET == mac* ]] && return 0
+
     git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2
     cd libxml2
 
@@ -40,9 +41,5 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    if [[ $TARGET == mac* ]]; then
-        echo --enable-libxml2
-    else
-        echo --disable-libxml2
-    fi
+    echo --disable-libxml2
 }