summaryrefslogtreecommitdiff
path: root/package/util-linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-15 13:09:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-15 13:13:14 +0200
commitbf8903fa567e5c1b5d923c6f1c0aeb1d2fd1192a (patch)
tree64691c16412c4788e2f242abeb418187231d0ec8 /package/util-linux
parentbf3ec139fd4c0996463d221478eb8ce82694e6de (diff)
cleanup HOST_STYLE, use SYSROOT feature for pkgconf
there are three HOST_STYLE's, not set mean fully automatic installation. auto means prefix is set to /usr and DESTDIR is set to STAGING_HOST_DIR. When using manual, you need to provide your own targets. Instead of using sed to modify *.pc files, use PKG_SYSROOT feature, which does work better and avoids pathcing some pc files. Idea from sh4rm via #musl.
Diffstat (limited to 'package/util-linux')
-rw-r--r--package/util-linux/patches/patch-libblkid_blkid_pc_in16
-rw-r--r--package/util-linux/patches/patch-libuuid_uuid_pc_in16
-rw-r--r--package/util-linux/patches/patch-misc-utils_uuidd_820
3 files changed, 0 insertions, 52 deletions
diff --git a/package/util-linux/patches/patch-libblkid_blkid_pc_in b/package/util-linux/patches/patch-libblkid_blkid_pc_in
deleted file mode 100644
index b9abbbb9e..000000000
--- a/package/util-linux/patches/patch-libblkid_blkid_pc_in
+++ /dev/null
@@ -1,16 +0,0 @@
---- util-linux-2.24.2.orig/libblkid/blkid.pc.in 2013-02-27 17:46:29.858020511 +0100
-+++ util-linux-2.24.2/libblkid/blkid.pc.in 2014-05-24 12:49:28.928809032 +0200
-@@ -1,11 +1,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-
- Name: blkid
- Description: Block device id library
- Version: @LIBBLKID_VERSION@
- Requires.private: uuid
--Cflags: -I${includedir}/blkid
--Libs: -L${libdir} -lblkid
-+Cflags: -I${prefix}/include/blkid
-+Libs: -L${prefix}/lib -lblkid
diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in
deleted file mode 100644
index 010f3cffe..000000000
--- a/package/util-linux/patches/patch-libuuid_uuid_pc_in
+++ /dev/null
@@ -1,16 +0,0 @@
---- util-linux-2.24.2.orig/libuuid/uuid.pc.in 2013-02-27 17:46:29.883020734 +0100
-+++ util-linux-2.24.2/libuuid/uuid.pc.in 2014-05-24 12:50:07.644975668 +0200
-@@ -1,11 +1,8 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-
- Name: uuid
- Description: Universally unique id library
- Version: @LIBUUID_VERSION@
- Requires:
--Cflags: -I${includedir}/uuid
--Libs: -L${libdir} -luuid
-+Cflags: -I${prefix}/include/uuid
-+Libs: -L${prefix}/lib -luuid
diff --git a/package/util-linux/patches/patch-misc-utils_uuidd_8 b/package/util-linux/patches/patch-misc-utils_uuidd_8
deleted file mode 100644
index 0b16a57f5..000000000
--- a/package/util-linux/patches/patch-misc-utils_uuidd_8
+++ /dev/null
@@ -1,20 +0,0 @@
---- util-linux-2.24.2.orig/misc-utils/uuidd.8 2014-04-24 11:25:49.089462731 +0200
-+++ util-linux-2.24.2/misc-utils/uuidd.8 2014-05-19 15:36:26.182277055 +0200
-@@ -34,7 +34,7 @@ UUIDs.
- .TP
- .BR \-p , " \-\-pid " \fIpath\fR
- Specify the pathname where the pid file should be written. By default,
--the pid file is written to /run/uuidd/uuidd.pid.
-+the pid file is written to /var/uuidd/uuidd.pid.
- .TP
- .BR \-P , " \-\-no-pid "
- Do not create pid file.
-@@ -57,7 +57,7 @@ request it to return a random-based UUID
- .TP
- .BR \-s , " \-\-socket " \fIpath\fR
- Specify the pathname used for the unix-domain socket used by uuidd. By
--default, the pathname used is /run/uuidd/request. This is primarily
-+default, the pathname used is /var/uuidd/request. This is primarily
- for debugging purposes, since the pathname is hard-coded in the libuuid
- library.
- .TP