logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

pkg-config.patch (3446B)

    

  1. SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
  3. SPDX-License-Identifier: GPL-2.0-or-later
  5. We don't have pkg-config, hence:
  6. a) disable gtk-doc (uses pkg-config exclusively)
  7. b) disable pkg-config type checks
  9. --- util-linux-2.19.1/configure.ac	2021-06-12 11:23:41.719074631 +1000
  10. +++ util-linux-2.19.1/configure.ac	2021-06-12 11:26:17.748153926 +1000
  11. @@ -84,9 +84,6 @@
  12.  dnl libtool-2
  13.  LT_INIT
  14.  
  15. -PKG_PROG_PKG_CONFIG
  16. -
  17. -GTK_DOC_CHECK([1.10])
  18.  AC_PATH_PROG([XSLTPROC], [xsltproc])
  19.  
  20.  linux_os=no
  21. @@ -360,17 +360,8 @@
  22.  have_uuid=yes
  23.  
  24.  if test "x$enable_libuuid" = xno; then
  25. -  # Check for external (e2fsprogs) libuuid
  26. -  PKG_CHECK_MODULES(UUID, uuid, [have_uuid=yes], [have_uuid=no])
  27. -  if test "x$have_uuid" = xno; then
  28. -    # system without pkg-config or so, try classic check
  29. -    AC_CHECK_LIB(uuid, uuid_is_null, [have_uuid=yes], [have_uuid=no])
  30. -  fi
  31. -  if test "x$have_uuid" = xyes; then
  32. -    UTIL_SET_FLAGS($UUID_CFLAGS, $UUID_CFLAGS, $UUID_LIBS)
  33. -    AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [break], [])
  34. -    UTIL_RESTORE_FLAGS
  35. -  fi
  36. +  # system without pkg-config or so, try classic check
  37. +  AC_CHECK_LIB(uuid, uuid_is_null, [have_uuid=yes], [have_uuid=no])
  38.  else
  39.    # internal library
  40.    AC_DEFINE(HAVE_UUID_H, 1, [Define to 1 if you have the <uuid.h> header file.])
  41. @@ -408,21 +408,8 @@
  42.  
  43.  if test "x$enable_libblkid" = xno; then
  44.    if test "x$build_mount" = xyes || test "x$enable_fsck" = xyes; then
  45. -    # Check for external (e2fsprogs) libblkid
  46. -    PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], [have_blkid=no])
  47. -    if test "x$have_blkid" = xno; then
  48. -      # system without pkg-config or so, try classic check
  49. -      AC_CHECK_LIB(blkid, blkid_get_cache, [have_blkid=yes], [have_blkid=no])
  50. -    fi
  51. -    if test "x$have_blkid" = xyes; then
  52. -      UTIL_SET_FLAGS($BLKID_CFLAGS, $BLKID_CFLAGS, $BLKID_LIBS)
  53. -      AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], [])
  54. -      UTIL_RESTORE_FLAGS
  55. -    fi
  56. -    if test -n "$enable_static_programs"; then
  57. -      # TODO check only when mount of fsck are requested
  58. -      UTIL_PKG_STATIC([BLKID_LIBS_STATIC], [blkid])
  59. -    fi
  60. +    # system without pkg-config or so, try classic check
  61. +    AC_CHECK_LIB(blkid, blkid_get_cache, [have_blkid=yes], [have_blkid=no])
  62.    fi
  63.  else
  64.    # internal library
  65. @@ -1251,8 +1251,6 @@
  66.  schedutils/Makefile
  67.  shlibs/blkid/blkid.pc
  68.  shlibs/blkid/Makefile
  69. -shlibs/blkid/docs/Makefile
  70. -shlibs/blkid/docs/version.xml
  71.  shlibs/blkid/src/Makefile
  72.  shlibs/blkid/src/blkid.h
  73.  shlibs/blkid/src/superblocks/Makefile
  74. @@ -1263,8 +1261,6 @@
  75.  shlibs/mount/Makefile
  76.  shlibs/mount/src/Makefile
  77.  shlibs/mount/src/libmount.h
  78. -shlibs/mount/docs/Makefile
  79. -shlibs/mount/docs/version.xml
  80.  shlibs/mount/samples/Makefile
  81.  shlibs/uuid/uuid.pc
  82.  shlibs/uuid/Makefile
  83. --- util-linux-2.19.1/shlibs/mount/Makefile.am.bak	2021-06-12 11:32:07.578612839 +1000
  84. +++ util-linux-2.19.1/shlibs/mount/Makefile.am	2021-06-12 11:32:20.247701887 +1000
  85. @@ -2,11 +2,6 @@
  86.  
  87.  SUBDIRS = src samples
  88.  
  89. -if ENABLE_GTK_DOC
  90. -SUBDIRS += docs
  91. -endif
  92. -
  93. -# pkg-config stuff
  94.  pkgconfigdir = $(usrlib_execdir)/pkgconfig
  95.  pkgconfig_DATA = mount.pc
  96.  
  97. --- util-linux-2.19.1/shlibs/blkid/Makefile.am.bak	2021-06-12 11:32:03.546584499 +1000
  98. +++ util-linux-2.19.1/shlibs/blkid/Makefile.am	2021-06-12 11:32:10.790635416 +1000
  99. @@ -2,10 +2,6 @@
  100.  
  101.  SUBDIRS = src samples
  102.  
  103. -if ENABLE_GTK_DOC
  104. -SUBDIRS += docs
  105. -endif
  106. -
  107.  # pkg-config stuff
  108.  pkgconfigdir = $(usrlib_execdir)/pkgconfig
  109.  pkgconfig_DATA = blkid.pc