- install correct libs to staging/usr/lib
fixes eudev, nfs-kernel-server
the lib*.a seem broken - use the correct .so files
and remove .a libs
- some build breakage was observed with parallel builds:
text-utils/more-more.o: In function `putstring':
more.c:(.text+0x1f4): undefined reference to `tputs'
text-utils/more-more.o: In function `initterm':
more.c:(.text+0x1b74): undefined reference to `setupterm'
more.c:(.text+0x1f0c): undefined reference to `tparm'
more.c:(.text+0x20ac): undefined reference to `tigetnum'
more.c:(.text+0x20c8): undefined reference to `tigetflag'
more.c:(.text+0x20ec): undefined reference to `tigetstr'
more.c:(.text+0x2148): undefined reference to `PC'
text-utils/more-more.o: In function `reset_tty':
more.c:(.text+0x2630): undefined reference to `tputs'
- fix line length
Signed-off-by: Dirk Neukirchen <dirkneukirc...@web.de>
---
package/utils/util-linux/Makefile | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/package/utils/util-linux/Makefile
b/package/utils/util-linux/Makefile
index 4d6799d..cfa244d 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -16,9 +16,16 @@ PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.28
PKG_MD5SUM:=e534e6ccc49107e5d31c329af798ef7d
PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING
Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1
libuuid/COPYING Documentation/licenses/COPYING.BSD-3
+PKG_LICENSE_FILES:= COPYING \
+ getopt/COPYING \
+ libblkid/COPYING \
+ libmount/COPYING \
+ Documentation/licenses/COPYING.GPLv2 \
+ Documentation/licenses/COPYING.LGPLv2.1 \
+ libuuid/COPYING \
+ Documentation/licenses/COPYING.BSD-3
-PKG_BUILD_PARALLEL:=1
+PKG_BUILD_PARALLEL:=0
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_cal \
@@ -462,32 +469,43 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib
+
+ $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so
+ $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so
+ $(LN) libmount.so.1 $(1)/usr/lib/libmount.so
+ $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so
+ $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so
endef
define Package/libfdisk/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib/
+ $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so
endef
define Package/libblkid/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib/
+ $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so
endef
define Package/libmount/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib/
+ $(LN) libmount.so.1 $(1)/usr/lib/libmount.so
endef
define Package/libsmartcols/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib/
+ $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so
endef
define Package/libuuid/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libuuid.so* $(1)/usr/lib/
+ $(LN) libuuid.so.1 $(1)/usr/lib/libuuid.so
endef
define Package/agetty/install
--
2.8.3
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
