mirrors/openwrt
0
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-11-24 02:16:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: remove custom pkgconfig patch

Browse Source 
Replace with sed as done elsewhere.

Fixes error with at least btrfs-progs:

Package '@LIBSELINUX@', required by 'mount', not found
Package '@LIBCRYPTSETUP@', required by 'mount', not foun

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-01-27 21:17:07 -08:00 committed by Hauke Mehrtens
parent f4d974d7f8
commit cbedb5de75
2 changed files with 11 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/utils/util-linux/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.36.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36
@ -534,10 +534,20 @@ TARGET_CFLAGS += $(FPIC) -std=gnu99
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/blkid.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/blkid.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/blkid.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fdisk.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/fdisk.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/fdisk.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mount.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/mount.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/mount.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/smartcols.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/smartcols.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/smartcols.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/uuid.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/uuid.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/uuid.pc
$(INSTALL_DIR) $(1)/usr/include/blkid
$(CP) $(PKG_INSTALL_DIR)/usr/include/blkid/blkid.h $(1)/usr/include/blkid

76
package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
View File

@ -1,76 +0,0 @@
--- 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
@@ -2522,18 +2522,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/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
@@ -9,7 +9,6 @@ SUBDIRS += libfdisk/docs
endif
pkgconfig_DATA += libfdisk/fdisk.pc
-PATHFILES += libfdisk/fdisk.pc
EXTRA_DIST += libfdisk/COPYING
endif # BUILD_LIBFDISK