diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
| commit | 2288ec26df8e47d9b699e46eecd05eb3570f03a0 (patch) | |
| tree | 1d204b70e027fd737f6aae1b7308ae959f5bd0b9 /package/util-linux | |
| parent | 45e7808c41c2e66266f738aa5eff70ce18cc04ac (diff) | |
| parent | 667bc9e981847a1d117a2fc7110948075a268bdd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/Makefile | 4 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-libuuid_uuid_pc_in | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index a99c5ed0d..b449a985e 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux PKG_VERSION:= 2.23.2 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= b39fde897334a4858bb2098edcce5b3f PKG_DESCR:= Linux utilities (meta-package) PKG_SECTION:= utils @@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --disable-use-tty-group \ --with-ncurses=$(STAGING_DIR)/usr/include \ --libdir=/usr/lib FAKE_FLAGS+= INSTALLSUID="install -m 4755" -TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK +TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo util-linux-install: diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in new file mode 100644 index 000000000..059310086 --- /dev/null +++ b/package/util-linux/patches/patch-libuuid_uuid_pc_in @@ -0,0 +1,13 @@ +--- util-linux-2.23.2.orig/libuuid/uuid.pc.in 2013-02-27 17:46:29.883020734 +0100 ++++ util-linux-2.23.2/libuuid/uuid.pc.in 2013-12-17 17:07:37.935403478 +0100 +@@ -1,7 +1,7 @@ + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@usrlib_execdir@ +-includedir=@includedir@ ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: uuid + Description: Universally unique id library |