mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
91a508d5bf
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
77 lines
1.8 KiB
Diff
77 lines
1.8 KiB
Diff
--- 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
|
|
@@ -2122,18 +2122,23 @@ AC_CONFIG_HEADERS([config.h])
|
|
#
|
|
AC_CONFIG_FILES([
|
|
Makefile
|
|
+libblkid/blkid.pc
|
|
libblkid/docs/Makefile
|
|
libblkid/docs/version.xml
|
|
libblkid/src/blkid.h
|
|
+libfdisk/fdisk.pc
|
|
libfdisk/docs/Makefile
|
|
libfdisk/docs/version.xml
|
|
libfdisk/src/libfdisk.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
|
|
@@ -9,7 +9,6 @@ SUBDIRS += libsmartcols/docs
|
|
endif
|
|
|
|
pkgconfig_DATA += libsmartcols/smartcols.pc
|
|
-PATHFILES += libsmartcols/smartcols.pc
|
|
EXTRA_DIST += libsmartcols/COPYING
|
|
|
|
endif # BUILD_LIBSMARTCOLS
|
|
--- a/libfdisk/Makemodule.am
|
|
+++ b/libfdisk/Makemodule.am
|
|
@@ -8,7 +8,6 @@ SUBDIRS += libfdisk/docs
|
|
endif
|
|
|
|
pkgconfig_DATA += libfdisk/fdisk.pc
|
|
-PATHFILES += libfdisk/fdisk.pc
|
|
EXTRA_DIST += libfdisk/COPYING
|
|
|
|
endif # BUILD_LIBFDISK
|