Try fixing up osx cross-compile issues with pkg-config

Author: Tobias-Fischer

vinca/main.py

@@ -338,10 +338,13 @@ def generate_output(pkg_shortname, vinca_conf, distro, version):
         output["requirements"]["build"] += [
             {"sel(build_platform != target_platform)": "pybind11"}
         ]
+    # pkg-config must be in build, not host
     if "pkg-config" in output["requirements"]["host"]:
         output["requirements"]["build"] += [
             {"sel(build_platform != target_platform)": "pkg-config"}
         ]
+        while "pkg-config" in output["requirements"]["host"]:
+            output["requirements"]["host"].remove("pkg-config")
 
     # fixup problems with udev (which is mapped to libusb):
     if "libusb" in output["requirements"]["host"]:

vinca/templates/build_catkin.sh.in

@@ -25,13 +25,6 @@ fi
 echo "USING PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
 
 
-if [[ "$CONDA_BUILD_CROSS_COMPILATION" != "1" ]]; then
-  PKG_CONFIG_EXECUTABLE=$PREFIX/bin/pkg-config
-else
-  PKG_CONFIG_EXECUTABLE=$BUILD_PREFIX/bin/pkg-config
-fi
-echo "USING PKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE}"
-
 export ROS_PYTHON_VERSION=`$PYTHON_EXECUTABLE -c "import sys; print('%i.%i' % (sys.version_info[0:2]))"`
 echo "Using Python $ROS_PYTHON_VERSION"
 
@@ -57,7 +50,6 @@ cmake ${CMAKE_ARGS} .. -DCMAKE_INSTALL_PREFIX=$PREFIX \
          -DCMAKE_FIND_FRAMEWORK=LAST \
          -DBUILD_SHARED_LIBS=ON \
          -DPYTHON_EXECUTABLE=$PYTHON_EXECUTABLE \
-         -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE \
          -DSETUPTOOLS_DEB_LAYOUT=OFF \
          -DCATKIN_SKIP_TESTING=$SKIP_TESTING \
          -DCATKIN_BUILD_BINARY_PACKAGE=$CATKIN_BUILD_BINARY_PACKAGE \