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
This commit is contained in:
Nicolas Thill 2015-03-09 02:02:50 +00:00
parent c3b9b35155
commit ba887275ca
1 changed files with 62 additions and 0 deletions

View File

@ -0,0 +1,62 @@
--- 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
@@ -1802,15 +1802,19 @@ AC_CONFIG_HEADERS([config.h])
#
AC_CONFIG_FILES([
Makefile
+libblkid/blkid.pc
libblkid/docs/Makefile
libblkid/docs/version.xml
libblkid/src/blkid.h
+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
EXTRA_DIST += libblkid/libblkid.3 libblkid/COPYING
--- 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
@@ -8,7 +8,6 @@ SUBDIRS += libsmartcols/docs
endif
pkgconfig_DATA += libsmartcols/smartcols.pc
-PATHFILES += libsmartcols/smartcols.pc
EXTRA_DIST += libsmartcols/COPYING
endif # BUILD_LIBSMARTCOLS