aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils
diff options
context:
space:
mode:
authorDirk Neukirchen <dirkneukirchen@web.de>2016-05-27 21:25:14 +0200
committerJo-Philipp Wich <jo@mein.io>2016-05-28 09:14:55 +0200
commit6c1eb4441eb4ec6b85785ba4f5c8bc0c9397c7d9 (patch)
tree563c43ae1c51ee9b37c5b3b06136f3857624bb7f /package/utils
parent7f6945829640e82dadf928c9e214470fa0c5a321 (diff)
downloadupstream-6c1eb4441eb4ec6b85785ba4f5c8bc0c9397c7d9.tar.gz
upstream-6c1eb4441eb4ec6b85785ba4f5c8bc0c9397c7d9.tar.bz2
upstream-6c1eb4441eb4ec6b85785ba4f5c8bc0c9397c7d9.zip
util-linux: fix breakage
- 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 <dirkneukirchen@web.de>
Diffstat (limited to 'package/utils')
-rw-r--r--package/utils/util-linux/Makefile32
1 files changed, 25 insertions, 7 deletions
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 9d4ca386af..cfa244dca5 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 \
@@ -457,37 +464,48 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/include/libsmartcols/libsmartcols.h $(1)/usr/include/libsmartcols
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.{a,so*} $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfdisk.{a,so*} $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmount.{a,so*} $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.{a,so*} $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsmartcols.{a,so*} $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib
+ $(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