From: "Daniel Cegiełka" <daniel.cegielka@gmail.com>
To: musl@lists.openwall.com
Subject: Re: GLOB_BRACE
Date: Fri, 27 Sep 2013 15:06:05 +0200 [thread overview]
Message-ID: <CAPLrYETyyk1qnTSkmBxef5qQG8QabaACFC9YZaR-+EvAtwLb2w@mail.gmail.com> (raw)
In-Reply-To: <524578B9.4050808@opensource.dyc.edu>
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
2013/9/27 Anthony G. Basile <basile@opensource.dyc.edu>:
> Also openrc
> doesn't build on musl and its still required for some fundamental gentoo
> pieces, even though it competes with systemd.
Could you describe compilation errors (temp/build.log)? Try patches...
Daniel
[-- Attachment #2: openrc_DECLS.diff --]
[-- Type: application/octet-stream, Size: 1058 bytes --]
diff -urN openrc-0.9.8.4.orig//src/libeinfo/einfo.h openrc-0.9.8.4/src/libeinfo/einfo.h
--- openrc-0.9.8.4.orig//src/libeinfo/einfo.h 2012-08-16 12:10:45.164407735 +0200
+++ openrc-0.9.8.4/src/libeinfo/einfo.h 2012-08-16 12:11:12.779059479 +0200
@@ -48,8 +48,6 @@
# endif
#endif
-__BEGIN_DECLS
-
/*! @brief Color types to use */
typedef enum
{
@@ -140,5 +138,4 @@
/*! @brief Prefix each einfo line with something */
void eprefix(const char * EINFO_RESTRICT);
-__END_DECLS
#endif
diff -urN openrc-0.9.8.4.orig//src/librc/rc.h.in openrc-0.9.8.4/src/librc/rc.h.in
--- openrc-0.9.8.4.orig//src/librc/rc.h.in 2012-08-16 12:10:45.168407539 +0200
+++ openrc-0.9.8.4/src/librc/rc.h.in 2012-08-16 12:12:17.691890180 +0200
@@ -31,8 +31,6 @@
#include <stdbool.h>
#include <stdio.h>
-__BEGIN_DECLS
-
#define RC_SYSCONFDIR "@SYSCONFDIR@"
#define RC_LIBDIR "@PREFIX@/@LIB@/rc"
#define RC_LIBEXECDIR "@LIBEXECDIR@"
@@ -551,5 +549,4 @@
* we have our own */
ssize_t rc_getline(char **, size_t *, FILE *);
-__END_DECLS
#endif
[-- Attachment #3: strlcat_strlcpy.diff --]
[-- Type: application/octet-stream, Size: 1206 bytes --]
diff -urN openrc-0.8.3.orig/src/libeinfo/libeinfo.c openrc-0.8.3/src/libeinfo/libeinfo.c
--- openrc-0.8.3.orig/src/libeinfo/libeinfo.c 2011-06-20 04:37:55.000000000 +0200
+++ openrc-0.8.3/src/libeinfo/libeinfo.c 2011-07-13 22:34:46.000000000 +0200
@@ -196,60 +196,6 @@
};
#endif
-/* strlcat and strlcpy are nice, shame glibc does not define them */
-#ifdef __GLIBC__
-# if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
-static size_t
-strlcat(char *dst, const char *src, size_t size)
-{
- char *d = dst;
- const char *s = src;
- size_t src_n = size;
- size_t dst_n;
-
- while (src_n-- != 0 && *d != '\0')
- d++;
- dst_n = d - dst;
- src_n = size - dst_n;
-
- if (src_n == 0)
- return dst_n + strlen(src);
-
- while (*s != '\0') {
- if (src_n != 1) {
- *d++ = *s;
- src_n--;
- }
- s++;
- }
- *d = '\0';
-
- return dst_n + (s - src);
-}
-
-static size_t
-strlcpy(char *dst, const char *src, size_t size)
-{
- const char *s = src;
- size_t n = size;
-
- if (n && --n)
- do {
- if (!(*dst++ = *src++))
- break;
- } while (--n);
-
- if (!n) {
- if (size)
- *dst = '\0';
- while (*src++);
- }
-
- return src - s - 1;
-}
-# endif
-#endif
-
static bool
yesno(const char *value)
{
next prev parent reply other threads:[~2013-09-27 13:06 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-15 20:57 GLOB_BRACE Paul Schutte
2013-09-16 12:50 ` GLOB_BRACE Rich Felker
2013-09-16 13:40 ` GLOB_BRACE Paul Schutte
2013-09-16 13:47 ` GLOB_BRACE Justin Cormack
2013-09-16 13:51 ` GLOB_BRACE Luca Barbato
2013-09-16 14:18 ` GLOB_BRACE Paul Schutte
2013-09-23 14:08 ` GLOB_BRACE Rob Landley
2013-09-23 14:35 ` GLOB_BRACE Luca Barbato
2013-09-23 15:03 ` GLOB_BRACE Rich Felker
2013-09-23 15:21 ` GLOB_BRACE Kurt H Maier
2013-09-23 15:27 ` GLOB_BRACE Luca Barbato
2013-09-25 22:46 ` GLOB_BRACE Paul Schutte
2013-09-26 0:02 ` GLOB_BRACE Rich Felker
2013-09-26 3:35 ` GLOB_BRACE Luca Barbato
2013-09-26 4:48 ` GLOB_BRACE Daniel Cegiełka
2013-09-26 18:23 ` GLOB_BRACE Rich Felker
2013-09-26 18:30 ` GLOB_BRACE Daniel Cegiełka
2013-09-26 18:38 ` GLOB_BRACE Rich Felker
2013-09-26 18:50 ` GLOB_BRACE Daniel Cegiełka
2013-09-26 18:59 ` GLOB_BRACE Rich Felker
2013-09-26 19:10 ` GLOB_BRACE Daniel Cegiełka
2013-09-26 19:13 ` GLOB_BRACE Rich Felker
2013-09-26 19:24 ` GLOB_BRACE Daniel Cegiełka
2013-09-26 19:06 ` GLOB_BRACE John Spencer
2013-09-26 20:21 ` GLOB_BRACE Daniel Cegiełka
2013-09-26 20:41 ` GLOB_BRACE Daniel Cegiełka
2013-09-27 12:23 ` GLOB_BRACE Anthony G. Basile
2013-09-27 12:53 ` GLOB_BRACE Daniel Cegiełka
2013-09-27 13:06 ` Daniel Cegiełka [this message]
2013-09-29 21:51 ` GLOB_BRACE Anthony G. Basile
2013-09-29 21:57 ` GLOB_BRACE Rich Felker
2013-09-26 19:16 ` GLOB_BRACE Christian Neukirchen
2013-09-23 15:18 ` GLOB_BRACE Rob Landley
2013-09-23 15:31 ` GLOB_BRACE Kurt H Maier
2013-09-23 15:54 ` GLOB_BRACE Rich Felker
2013-09-23 17:22 ` GLOB_BRACE Rob Landley
2013-09-23 19:55 ` GLOB_BRACE Rich Felker
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=CAPLrYETyyk1qnTSkmBxef5qQG8QabaACFC9YZaR-+EvAtwLb2w@mail.gmail.com \
--to=daniel.cegielka@gmail.com \
--cc=musl@lists.openwall.com \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).