KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
openwrtv4/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch

77 lines
1.8 KiB
Diff
Raw Normal View History

util-linux: fix pkgconfig files Upstream choose to not rely on configure.ac and recursively expand paths in pkgconfig files at make time, leading to absolute /usr/include & /usr/lib in there... And we don't want that when cross-compiling... Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44627
2015-03-09 02:02:50 +00:00
--- a/libuuid/Makemodule.am
+++ b/libuuid/Makemodule.am
@@ -4,7 +4,6 @@ include libuuid/man/Makemodule.am
include libuuid/src/Makemodule.am
pkgconfig_DATA += libuuid/uuid.pc
-PATHFILES += libuuid/uuid.pc
EXTRA_DIST += libuuid/COPYING
endif # BUILD_LIBUUID
--- a/configure.ac
+++ b/configure.ac
packages/util/util-linux: Update to 2.32 - Update to upstream 2.32 - License file 'getopt/COPYING' not present (any more) - Disable 'chown root:root'-commands during 'make install' - Add new dependency to wipefs - Refresh patch 003 Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2018-03-24 13:10:03 +00:00
@@ -2351,18 +2351,23 @@ AC_CONFIG_HEADERS([config.h])
util-linux: fix pkgconfig files Upstream choose to not rely on configure.ac and recursively expand paths in pkgconfig files at make time, leading to absolute /usr/include & /usr/lib in there... And we don't want that when cross-compiling... Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44627
2015-03-09 02:02:50 +00:00
#
AC_CONFIG_FILES([
Makefile
+libblkid/blkid.pc
libblkid/docs/Makefile
libblkid/docs/version.xml
libblkid/src/blkid.h
util-linux: update to version 2.28 The following patches were merged upstream: * 0001-switch_root-improve-statfs-f_type-portability.patch * 0002-lib-colors-use-static-buffers-when-parse-scheme.patch * 002-mkostemp.patch The following patch is not needed any more because all libc implementations support alloc in sscanf: * 001-no-printf-alloc.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49191
2016-04-17 15:16:12 +00:00
+libfdisk/fdisk.pc
libfdisk/docs/Makefile
libfdisk/docs/version.xml
libfdisk/src/libfdisk.h
util-linux: fix pkgconfig files Upstream choose to not rely on configure.ac and recursively expand paths in pkgconfig files at make time, leading to absolute /usr/include & /usr/lib in there... And we don't want that when cross-compiling... Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44627
2015-03-09 02:02:50 +00:00
+libmount/mount.pc
libmount/docs/Makefile
libmount/docs/version.xml
libmount/src/libmount.h
+libsmartcols/smartcols.pc
libsmartcols/docs/Makefile
libsmartcols/docs/version.xml
libsmartcols/src/libsmartcols.h
+libuuid/uuid.pc
po/Makefile.in
])
--- a/libblkid/Makemodule.am
+++ b/libblkid/Makemodule.am
@@ -9,7 +9,6 @@ SUBDIRS += libblkid/docs
endif
pkgconfig_DATA += libblkid/blkid.pc
-PATHFILES += libblkid/blkid.pc
dist_man_MANS += libblkid/libblkid.3
packages/util/util-linux: Update to 2.32 - Update to upstream 2.32 - License file 'getopt/COPYING' not present (any more) - Disable 'chown root:root'-commands during 'make install' - Add new dependency to wipefs - Refresh patch 003 Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2018-03-24 13:10:03 +00:00
EXTRA_DIST += libblkid/COPYING
util-linux: fix pkgconfig files Upstream choose to not rely on configure.ac and recursively expand paths in pkgconfig files at make time, leading to absolute /usr/include & /usr/lib in there... And we don't want that when cross-compiling... Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44627
2015-03-09 02:02:50 +00:00
--- a/libmount/Makemodule.am
+++ b/libmount/Makemodule.am
@@ -9,7 +9,6 @@ SUBDIRS += libmount/docs
endif
pkgconfig_DATA += libmount/mount.pc
-PATHFILES += libmount/mount.pc
EXTRA_DIST += libmount/COPYING
endif # BUILD_LIBMOUNT
--- a/libsmartcols/Makemodule.am
+++ b/libsmartcols/Makemodule.am
util-linux: update to version 2.28 The following patches were merged upstream: * 0001-switch_root-improve-statfs-f_type-portability.patch * 0002-lib-colors-use-static-buffers-when-parse-scheme.patch * 002-mkostemp.patch The following patch is not needed any more because all libc implementations support alloc in sscanf: * 001-no-printf-alloc.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49191
2016-04-17 15:16:12 +00:00
@@ -9,7 +9,6 @@ SUBDIRS += libsmartcols/docs
util-linux: fix pkgconfig files Upstream choose to not rely on configure.ac and recursively expand paths in pkgconfig files at make time, leading to absolute /usr/include & /usr/lib in there... And we don't want that when cross-compiling... Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44627
2015-03-09 02:02:50 +00:00
endif
pkgconfig_DATA += libsmartcols/smartcols.pc
-PATHFILES += libsmartcols/smartcols.pc
EXTRA_DIST += libsmartcols/COPYING
endif # BUILD_LIBSMARTCOLS
util-linux: update to version 2.28 The following patches were merged upstream: * 0001-switch_root-improve-statfs-f_type-portability.patch * 0002-lib-colors-use-static-buffers-when-parse-scheme.patch * 002-mkostemp.patch The following patch is not needed any more because all libc implementations support alloc in sscanf: * 001-no-printf-alloc.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49191
2016-04-17 15:16:12 +00:00
--- a/libfdisk/Makemodule.am
+++ b/libfdisk/Makemodule.am
utils/util-linux: Update to 2.30.1 Refresh patch Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-07-11 09:07:51 +00:00
@@ -9,7 +9,6 @@ SUBDIRS += libfdisk/docs
util-linux: update to version 2.28 The following patches were merged upstream: * 0001-switch_root-improve-statfs-f_type-portability.patch * 0002-lib-colors-use-static-buffers-when-parse-scheme.patch * 002-mkostemp.patch The following patch is not needed any more because all libc implementations support alloc in sscanf: * 001-no-printf-alloc.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49191
2016-04-17 15:16:12 +00:00
endif
pkgconfig_DATA += libfdisk/fdisk.pc
-PATHFILES += libfdisk/fdisk.pc
EXTRA_DIST += libfdisk/COPYING
endif # BUILD_LIBFDISK
Reference in a new issue Copy permalink