Changeset 16697 in niluje

Timestamp:

Nov 18, 2019, 7:42:06 PM (3 weeks ago)

Author:

NiLuJe

Message:

Kindle Hacks:

• X-TC:
  • Take the path of least resistance re: meson and sys_root and pkg-config

File:

• Configs/trunk/Kindle/Misc/MesonCross.tpl (modified) (2 diffs)

Configs/trunk/Kindle/Misc/MesonCross.tpl

@@ -17 +17 @@
 strip = '%STRIP%'                       # $(command -v ${CROSS_TC}-strip)
 # NOTE: Because setting PKG_CONFIG_SYSROOT_DIR usually fucks everything up, work it around...
-#       c.f., the NOTE on sys_root below...
+#       c.f., the NOTEs on sys_root below...
 #       Of course, we can't pass options to pkgconfig here, so we have to use a shell wrapper...
-pkgconfig = '%PKGCONFIG%'               # Other than that, we don't need a cross pkg-config, just to swap the search paths
+#pkgconfig = '%PKGCONFIG%'              # Other than that, we don't need a cross pkg-config, just to swap the search paths
+# NOTE: But, since we're now avoiding the whole PKG_CONFIG_SYSROOT_DIR mess, just use our native pkg-config,
+#       we're already asking it to only look for cross .pc files via PKG_CONFIG_LIBDIR,
+#       and said cross .pc files already feed us prefixed paths.
+pkgconfig = '/usr/bin/pkg-config'
 #exe_wrapper = 'qemu-arm-static'        # The whole point was not having to use qemu, so, no, thanks.
 
@@ -45 +49 @@
 #sys_root = '%SYSROOT%'                 # ${HOME}/x-tools/${CROSS_TC}/${CROSS_TC}/sysroot
 # NOTE: Except this is used to set PKG_CONFIG_SYSROOT_DIR since meson 0.52, so we actually want to use %PREFIX% here...
-#       This also happens to usually be extremely harmful, so we already work around it in pkg-config...
-sys_root = '%PREFIX%'                   # c.f., below
+#       This also happens to usually be extremely harmful, so we work around it in a pkg-config wrapper...
+# NOTE: The good news is, this is apparently not used anywhere except to fuck pkg-config up.
+#       You'd think this would be used to pass --sysroot to the compiler, but, apparently, no.
+#       So, just don't set it, it makes our lives markedly easier.
+#sys_root = '%PREFIX%'                  # c.f., below
 
 # Where we'll stuff custom properties if need be