From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/53] libcgroup: Add dependency on fts when building on musl
Date: Fri, 8 Jan 2016 10:18:36 +0000 [thread overview]
Message-ID: <dbbe5797b14f4386b6f46d8e33e229dcadd751dc.1452248145.git.raj.khem@gmail.com> (raw)
In-Reply-To: <604bc7909e229178e6723a5323f99ae33cf7ec7f.1452248145.git.raj.khem@gmail.com>
In-Reply-To: <cover.1452248145.git.raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libcgroup/libcgroup/musl-decls-compat.patch | 235 +++++++++++++++++++++
meta/recipes-core/libcgroup/libcgroup_0.41.bb | 4 +
2 files changed, 239 insertions(+)
create mode 100644 meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch
diff --git a/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch b/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch
new file mode 100644
index 0000000..65f4ef9
--- /dev/null
+++ b/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch
@@ -0,0 +1,235 @@
+commit ca780b4f7f71abeeb04a585f2a4d889caaa985fa
+Author: Isaac Dunham <ibid.ag@gmail.com>
+Date: Fri Sep 5 22:35:32 2014 -0700
+
+ Remove __.*DECLS nonsense
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: libcgroup-0.41/include/libcgroup/config.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/config.h
++++ libcgroup-0.41/include/libcgroup/config.h
+@@ -9,7 +9,9 @@
+ #include <features.h>
+ #endif
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /**
+ * @defgroup group_config 5. Configuration
+@@ -107,6 +109,8 @@ int cgroup_config_create_template_group(
+ * @}
+ * @}
+ */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /*_LIBCGROUP_CONFIG_H*/
+Index: libcgroup-0.41/include/libcgroup/error.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/error.h
++++ libcgroup-0.41/include/libcgroup/error.h
+@@ -9,7 +9,9 @@
+ #include <features.h>
+ #endif
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /**
+ * @defgroup group_errors 6. Error handling
+@@ -99,6 +101,8 @@ int cgroup_get_last_errno(void);
+ * @}
+ * @}
+ */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _LIBCGROUP_INIT_H */
+Index: libcgroup-0.41/include/libcgroup/groups.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/groups.h
++++ libcgroup-0.41/include/libcgroup/groups.h
+@@ -11,7 +11,9 @@
+ #include <stdbool.h>
+ #endif
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /**
+ * Flags for cgroup_delete_cgroup_ext().
+@@ -577,6 +579,8 @@ char *cgroup_get_cgroup_name(struct cgro
+ */
+
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _LIBCGROUP_GROUPS_H */
+Index: libcgroup-0.41/include/libcgroup/init.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/init.h
++++ libcgroup-0.41/include/libcgroup/init.h
+@@ -9,7 +9,9 @@
+ #include <features.h>
+ #endif
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /**
+ * @defgroup group_init 1. Initialization
+@@ -58,6 +60,8 @@ int cgroup_get_subsys_mount_point(const
+ * @}
+ * @}
+ */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _LIBCGROUP_INIT_H */
+Index: libcgroup-0.41/include/libcgroup/iterators.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/iterators.h
++++ libcgroup-0.41/include/libcgroup/iterators.h
+@@ -11,7 +11,9 @@
+ #include <features.h>
+ #endif
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /**
+ * @defgroup group_iterators 3. Iterators
+@@ -423,6 +425,8 @@ int cgroup_get_subsys_mount_point_end(vo
+ * @}
+ */
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _LIBCGROUP_ITERATORS_H */
+Index: libcgroup-0.41/include/libcgroup/tasks.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/tasks.h
++++ libcgroup-0.41/include/libcgroup/tasks.h
+@@ -12,7 +12,9 @@
+ #include <stdbool.h>
+ #endif
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /** Flags for cgroup_change_cgroup_uid_gid(). */
+ enum cgflags {
+@@ -204,6 +206,8 @@ int cgroup_register_unchanged_process(pi
+ * @}
+ * @}
+ */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _LIBCGROUP_TASKS_H */
+Index: libcgroup-0.41/src/daemon/cgrulesengd.h
+===================================================================
+--- libcgroup-0.41.orig/src/daemon/cgrulesengd.h
++++ libcgroup-0.41/src/daemon/cgrulesengd.h
+@@ -17,7 +17,9 @@
+
+ #include <features.h>
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ #include "config.h"
+ #include "libcgroup.h"
+@@ -119,7 +121,9 @@ void cgre_flash_templates(int signum);
+ */
+ void cgre_catch_term(int signum);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _CGRULESENGD_H */
+
+Index: libcgroup-0.41/src/libcgroup-internal.h
+===================================================================
+--- libcgroup-0.41.orig/src/libcgroup-internal.h
++++ libcgroup-0.41/src/libcgroup-internal.h
+@@ -16,7 +16,9 @@
+
+ #define __LIBCG_INTERNAL
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ #include "config.h"
+ #include <fts.h>
+@@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_e
+ */
+ int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif
+Index: libcgroup-0.41/include/libcgroup/log.h
+===================================================================
+--- libcgroup-0.41.orig/include/libcgroup/log.h
++++ libcgroup-0.41/include/libcgroup/log.h
+@@ -11,7 +11,9 @@
+
+ #include <stdarg.h>
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ /**
+ * @defgroup group_log 7. Logging
+@@ -142,6 +144,8 @@ extern int cgroup_parse_log_level_str(co
+ * @}
+ * @}
+ */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* _LIBCGROUP_LOG_H */
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
index 287aecd..9597963 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
@@ -11,12 +11,16 @@ inherit autotools pkgconfig
DEPENDS = "bison-native flex-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2"
+SRC_URI_append_libc-musl = " file://musl-decls-compat.patch"
SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f"
SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/"
+DEPENDS_append_libc-musl = " fts "
+EXTRA_OEMAKE_append_libc-musl = "LIBS=-lfts"
+
EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}"
PACKAGES =+ "cgroups-pam-plugin"
--
2.7.0
next prev parent reply other threads:[~2016-01-08 10:19 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 10:19 [PATCH 00/53] musl fixes 3 Khem Raj
2016-01-08 10:18 ` [PATCH 01/53] powertop: Include right headers for timval struct Khem Raj
2016-01-08 10:18 ` [PATCH 02/53] dhcp: Include sys/types.h for u_int* defs Khem Raj
2016-01-08 10:18 ` [PATCH 03/53] blktrace: Include <sys/types.h for dev_t Khem Raj
2016-01-08 10:18 ` [PATCH 04/53] ppp: Fix build with musl Khem Raj
2016-01-08 10:18 ` [PATCH 05/53] tcp-wrappers: " Khem Raj
2016-01-08 10:18 ` [PATCH 06/53] fts: Add recipe Khem Raj
2016-01-08 10:18 ` [PATCH 07/53] connman: include config.h for HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR Khem Raj
2016-01-08 10:18 ` Khem Raj [this message]
2016-01-08 10:18 ` [PATCH 09/53] linux-libc-headers: Port patches for linux-headers for musl Khem Raj
2016-01-08 10:18 ` [PATCH 10/53] xserver-xorg: Fix build with musl Khem Raj
2016-01-08 10:18 ` [PATCH 11/53] gdk-pixbuf: Fix latent build issue exposed by musl Khem Raj
2016-01-08 10:18 ` [PATCH 12/53] argp-standalone: Add recipe Khem Raj
2016-01-08 10:18 ` [PATCH 13/53] gnutls: Link with libargp on musl and depend on argp-standalone Khem Raj
2016-01-08 10:18 ` [PATCH 14/53] util-linux: Fix ptest builds on musl Khem Raj
2016-01-08 10:18 ` [PATCH 15/53] webkitgtk: Fix build with clang Khem Raj
2016-01-08 10:18 ` [PATCH 16/53] elfutils: Fix build with uclibc Khem Raj
2016-01-08 10:18 ` [PATCH 17/53] packagegroup-self-hosted.bb: Move glibc-gconv-ibm850 to glibc only case Khem Raj
2016-01-08 10:18 ` [PATCH 18/53] guile: Fix build with uclibc Khem Raj
2016-01-08 10:18 ` [PATCH 19/53] gnutls: Link with libuargp on uclibc Khem Raj
2016-01-08 10:18 ` [PATCH 20/53] mtools: Fix build with uclibc Khem Raj
2016-01-08 16:17 ` Burton, Ross
2016-01-08 16:25 ` Burton, Ross
2016-01-08 17:27 ` Khem Raj
2016-01-08 10:18 ` [PATCH 21/53] parted: " Khem Raj
2016-01-08 10:18 ` [PATCH 22/53] net-tools: Link with libintl on uclibc Khem Raj
2016-01-08 10:18 ` [PATCH 23/53] libdrm: Upgrade 2.4.65 -> 2.4.66 Khem Raj
2016-01-08 10:18 ` [PATCH 24/53] directfb: Fix build with musl Khem Raj
2016-01-09 3:27 ` Andre McCurdy
2016-01-09 7:43 ` Khem Raj
2016-01-09 8:43 ` Khem Raj
2016-01-09 9:58 ` Burton, Ross
2016-01-08 10:18 ` [PATCH 25/53] gzip: " Khem Raj
2016-01-08 10:18 ` [PATCH 26/53] watchdog: " Khem Raj
2016-01-08 10:18 ` [PATCH 27/53] xinetd: " Khem Raj
2016-01-08 10:18 ` [PATCH 28/53] dpkg: Add musleabi to known architectures Khem Raj
2016-01-08 10:18 ` [PATCH 29/53] puzzles: Zero'ise structs before use Khem Raj
2016-01-08 10:18 ` [PATCH 30/53] Revert "glib-2.0: build dependency cleanup" Khem Raj
2016-01-08 10:39 ` Burton, Ross
2016-01-08 17:36 ` Khem Raj
2016-01-08 10:18 ` [PATCH 31/53] apt: Add support for building for musl targets Khem Raj
2016-01-08 10:19 ` [PATCH 32/53] libunwind: backtrace APIs are glibc specific Khem Raj
2016-01-08 10:19 ` [PATCH 33/53] babeltrace: Add missing header for MAXNAMLEN define Khem Raj
2016-01-08 10:19 ` [PATCH 34/53] elfutils: Fix build with musl Khem Raj
2016-01-08 10:19 ` [PATCH 35/53] sysklogd: untangle header inclusion maze Khem Raj
2016-01-08 10:19 ` [PATCH 36/53] console-tools: Include sys/types.h for u_char and u_short defs Khem Raj
2016-01-08 10:19 ` [PATCH 37/53] webkitgtk: Fix build on non-glibc linux systems Khem Raj
2016-01-08 10:19 ` [PATCH 38/53] rt-tests: Fix build with non-gcc compilers Khem Raj
2016-01-08 10:19 ` [PATCH 39/53] webkitgtk: Update patch status Khem Raj
2016-01-08 10:19 ` [PATCH 40/53] tar: Fix build for musl based targets Khem Raj
2016-01-08 10:19 ` [PATCH 41/53] net-tools: Fix build on musl Khem Raj
2016-01-08 10:19 ` [PATCH 42/53] pax: Fix build with musl Khem Raj
2016-01-08 10:19 ` [PATCH 43/53] iputils: " Khem Raj
2016-01-08 10:19 ` [PATCH 44/53] libuser: Fix build when secure getenv is not there Khem Raj
2016-01-08 10:19 ` [PATCH 45/53] iproute2: Fix build with musl Khem Raj
2016-01-08 10:19 ` [PATCH 46/53] irda-utils: Fix header inclusions Khem Raj
2016-01-08 10:19 ` [PATCH 47/53] nspr: Drop older glibc code Khem Raj
2016-01-08 10:19 ` [PATCH 48/53] chkconfig: Avoid using caddr_t Khem Raj
2016-01-08 10:19 ` [PATCH 49/53] tcf-agent: Implement canonicalize_file_name() for musl as well Khem Raj
2016-01-08 10:19 ` [PATCH 50/53] bsd-headers, musl: Add recipe for bsd missing features Khem Raj
2016-01-08 10:19 ` [PATCH 51/53] nfs-utils: Disable tcp-wrappers for musl Khem Raj
2016-01-08 10:19 ` [PATCH 52/53] portmap: Point to tirpc headers and libraries on musl Khem Raj
2016-01-08 10:19 ` [PATCH 53/53] elfutils: Add ALLOW_EMPTY for musl Khem Raj
2016-01-08 10:58 ` [PATCH 00/53] musl fixes 3 Burton, Ross
2016-01-08 14:00 ` Burton, Ross
2016-01-08 14:12 ` Burton, Ross
2016-01-08 14:23 ` Burton, Ross
2016-01-08 17:46 ` Khem Raj
2016-01-08 14:32 ` Burton, Ross
2016-01-08 17:47 ` Khem Raj
2016-01-08 14:53 ` Burton, Ross
2016-01-08 17:57 ` Khem Raj
2016-01-09 9:23 ` Khem Raj
2016-01-09 10:06 ` Burton, Ross
2016-01-08 17:43 ` Khem Raj
2016-01-08 18:29 ` Burton, Ross
2016-01-08 18:34 ` Khem Raj
2016-01-09 8:59 ` Khem Raj
2016-01-08 14:56 ` Burton, Ross
2016-01-08 17:59 ` Khem Raj
2016-01-10 21:10 ` Khem Raj
2016-01-10 21:29 ` Matthias Schiffer
2016-01-10 22:22 ` Phil Blundell
2016-01-10 22:24 ` Paul Eggleton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dbbe5797b14f4386b6f46d8e33e229dcadd751dc.1452248145.git.raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox