fix apple paltform arch and PKG_CONFIG_LIBDIR are empty bug

Author: debugly

tools/export-android-build-env.sh

@@ -99,6 +99,6 @@ echo "MR_ANDROID_NDK_TOOLCHAIN: [$MR_TOOLCHAIN_ROOT]"
 
 # 
 THIS_DIR=$(DIRNAME=$(dirname "${BASH_SOURCE[0]}"); cd "${DIRNAME}"; pwd)
-source "$THIS_DIR/export-pkg-config-dir.sh"
+source "$THIS_DIR/export-android-pkg-config-dir.sh"
 
 echo "PKG_CONFIG_LIBDIR:$PKG_CONFIG_LIBDIR"

tools/export-pkg-config-dir.sh tools/export-android-pkg-config-dir.shtools/export-pkg-config-dir.sh renamed to tools/export-android-pkg-config-dir.sh

@@ -90,6 +90,8 @@ export MR_SYS_ROOT=`xcrun -sdk $XCRUN_SDK --show-sdk-path`
 
 # x86_64
 export MR_ARCH="${_MR_ARCH/_simulator/}"
+export MR_FF_ARCH="${MR_ARCH}"
+
 # ffmpeg-x86_64
 export MR_BUILD_NAME="${LIB_NAME}-${_MR_ARCH}"
 # ios/ffmpeg-x86_64
@@ -106,6 +108,6 @@ echo "MR_BUILD_PREFIX: [$MR_BUILD_PREFIX]"
 
 # 
 THIS_DIR=$(DIRNAME=$(dirname "${BASH_SOURCE[0]}"); cd "${DIRNAME}"; pwd)
-source "$THIS_DIR/export-pkg-config-dir.sh"
+source "$THIS_DIR/export-apple-pkg-config-dir.sh"
 
 echo "PKG_CONFIG_LIBDIR:$PKG_CONFIG_LIBDIR"

tools/export-apple-build-env.sh

@@ -0,0 +1,44 @@
+#! /usr/bin/env bash
+#
+# Copyright (C) 2021 Matt Reach<[email protected]>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# disabling pkg-config-path
+# https://gstreamer-devel.narkive.com/TeNagSKN/gst-devel-disabling-pkg-config-path
+# export PKG_CONFIG_LIBDIR=${sysroot}/lib/pkgconfig
+
+env_assert "MR_UNI_PROD_DIR"
+env_assert "MR_UNI_SIM_PROD_DIR"
+
+pkg_cfg_dir=
+
+if [[ "$MR_IS_SIMULATOR" == 1 ]];then
+    uni_dir="${MR_UNI_SIM_PROD_DIR}"
+else
+    uni_dir="${MR_UNI_PROD_DIR}"
+fi
+
+for dir in `[ -d ${uni_dir} ] && find "${uni_dir}" -type f -name "*.pc" | xargs dirname | uniq` ;
+do
+    if [[ $pkg_cfg_dir ]];then
+        pkg_cfg_dir="${pkg_cfg_dir}:${dir}"
+    else
+        pkg_cfg_dir="${dir}"
+    fi
+done
+
+export PKG_CONFIG_LIBDIR="$pkg_cfg_dir"
+
+unset pkg_cfg_dir uni_dir