diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-11-18 22:05:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-11-18 22:07:04 +0100 |
| commit | 981e7a568b6693798fd7142737a75c7fe10a5413 (patch) | |
| tree | b1fd4cdc989c3354950648706cf01239fcbb0e9f /package/util-linux/Makefile | |
| parent | 07d499822cbfcf650d469d7de7f33f1eea4a918c (diff) | |
util-linux: update to 2.29, install libs to /usr/lib and fixup pc files
Diffstat (limited to 'package/util-linux/Makefile')
| -rw-r--r-- | package/util-linux/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 2c6f60c52..1b73f505b 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.28.2 -PKG_RELEASE:= 2 -PKG_HASH:= b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd +PKG_VERSION:= 2.29 +PKG_RELEASE:= 1 +PKG_HASH:= 2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7 PKG_DESCR:= basic utilities PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses PKG_NEEDS:= threads -PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.28/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.29/ PKG_OPTS:= dev PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT @@ -70,7 +70,9 @@ $(eval $(call PKG_template,LIBMOUNT,libmount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK TARGET_LDFLAGS+= -ltinfo -CONFIGURE_ARGS+= --with-pic \ +CONFIGURE_ARGS+= --exec-prefix=/usr \ + --libdir=/usr/lib \ + --with-pic \ --disable-use-tty-group \ --disable-chfn-chsh \ --disable-more \ @@ -144,20 +146,20 @@ mcookie-install: libuuid-install: $(INSTALL_DIR) $(IDIR_LIBUUID)/usr/lib - $(CP) $(WRKINST)/lib/libuuid.so* $(IDIR_LIBUUID)/usr/lib + $(CP) $(WRKINST)/usr/lib/libuuid.so* $(IDIR_LIBUUID)/usr/lib libblkid-install: $(INSTALL_DIR) $(IDIR_LIBBLKID)/usr/lib - $(CP) $(WRKINST)/lib/libblkid.so* $(IDIR_LIBBLKID)/usr/lib + $(CP) $(WRKINST)/usr/lib/libblkid.so* $(IDIR_LIBBLKID)/usr/lib libfdisk-install: $(INSTALL_DIR) $(IDIR_LIBFDISK)/usr/lib - $(CP) $(WRKINST)/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib - $(CP) $(WRKINST)/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib + $(CP) $(WRKINST)/usr/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib libmount-install: $(INSTALL_DIR) $(IDIR_LIBMOUNT)/usr/lib - $(CP) $(WRKINST)/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk |