[Buildroot] [PATCH] transmission: fix compile error

[Buildroot] [PATCH] transmission: fix compile error

[Waldemar Brodkorb]

After update to uClibc-ng 1.0.18 transmission fails to
compile as the special treatment for sys/quota.h isn't required
anymore, because upstream synced with GNU libc to fix a samba4
compile problem.

Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
---
 ...ince-1.0.18-has-sys-quota.h-synced-with-G.patch | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch

diff --git a/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
new file mode 100644
index 0000000..91a962a
--- /dev/null
+++ b/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
@@ -0,0 +1,29 @@
+From 8682fe1bad44acc06154003ca9c9163b917bf4e3 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@uclibc-ng.org>
+Date: Thu, 29 Sep 2016 19:52:49 +0200
+Subject: [PATCH] uClibc-ng since 1.0.18 has sys/quota.h synced with GNU libc
+
+Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
+
+Pull Request:
+https://github.com/transmission/transmission/pull/42
+---
+ libtransmission/platform-quota.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c
+index 58c518a..57377ef 100644
+--- a/libtransmission/platform-quota.c
++++ b/libtransmission/platform-quota.c
+@@ -284,7 +284,7 @@ getquota (const char * device)
+       spaceused = (int64_t) dq.dqb_curblocks >> 1;
+ #elif defined(__APPLE__)
+       spaceused = (int64_t) dq.dqb_curbytes;
+-#elif defined(__UCLIBC__)
++#elif defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0 || (__UCLIBC_MAJOR__ == 1 && __UCLIBC_SUBLEVEL__ <= 17))
+       spaceused = (int64_t) btodb(dq.dqb_curblocks);
+ #elif defined(__sun) || (defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION < 2)
+       spaceused = (int64_t) dq.dqb_curblocks >> 1;
+-- 
+2.1.4
+
-- 
2.1.4

[Buildroot] [PATCH] transmission: fix compile error

[Peter Korsgaard]

>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > After update to uClibc-ng 1.0.18 transmission fails to
 > compile as the special treatment for sys/quota.h isn't required
 > anymore, because upstream synced with GNU libc to fix a samba4
 > compile problem.

 > Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>

Committed, thanks. Don't forget to submit the patch upstream.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] transmission: fix compile error

[Arnout Vandecappelle]

On 29-09-16 20:12, Waldemar Brodkorb wrote:
> After update to uClibc-ng 1.0.18 transmission fails to
> compile as the special treatment for sys/quota.h isn't required
> anymore, because upstream synced with GNU libc to fix a samba4
> compile problem.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
> ---
>  ...ince-1.0.18-has-sys-quota.h-synced-with-G.patch | 29 ++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
>  create mode 100644 package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
> 
> diff --git a/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
> new file mode 100644
> index 0000000..91a962a
> --- /dev/null
> +++ b/package/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch
> @@ -0,0 +1,29 @@
> +From 8682fe1bad44acc06154003ca9c9163b917bf4e3 Mon Sep 17 00:00:00 2001
> +From: Waldemar Brodkorb <wbx@uclibc-ng.org>
> +Date: Thu, 29 Sep 2016 19:52:49 +0200
> +Subject: [PATCH] uClibc-ng since 1.0.18 has sys/quota.h synced with GNU libc
> +
> +Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
> +
> +Pull Request:
> +https://github.com/transmission/transmission/pull/42
> +---
> + libtransmission/platform-quota.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c
> +index 58c518a..57377ef 100644
> +--- a/libtransmission/platform-quota.c
> ++++ b/libtransmission/platform-quota.c
> +@@ -284,7 +284,7 @@ getquota (const char * device)
> +       spaceused = (int64_t) dq.dqb_curblocks >> 1;
> + #elif defined(__APPLE__)
> +       spaceused = (int64_t) dq.dqb_curbytes;
> +-#elif defined(__UCLIBC__)
> ++#elif defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0 || (__UCLIBC_MAJOR__ == 1 && __UCLIBC_SUBLEVEL__ <= 17))

 Shouldn't this also include __UCLIBC_MINOR__ == 0, so the condition doesn't
trigger when uClibc-ng 1.1.0 is released?

 Regards,
 Arnout

> +       spaceused = (int64_t) btodb(dq.dqb_curblocks);
> + #elif defined(__sun) || (defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION < 2)
> +       spaceused = (int64_t) dq.dqb_curblocks >> 1;
> +-- 
> +2.1.4
> +
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH] transmission: fix compile error

[Waldemar Brodkorb]

Hi Arnout,
Arnout Vandecappelle wrote,

> > +--- a/libtransmission/platform-quota.c
> > ++++ b/libtransmission/platform-quota.c
> > +@@ -284,7 +284,7 @@ getquota (const char * device)
> > +       spaceused = (int64_t) dq.dqb_curblocks >> 1;
> > + #elif defined(__APPLE__)
> > +       spaceused = (int64_t) dq.dqb_curbytes;
> > +-#elif defined(__UCLIBC__)
> > ++#elif defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0 || (__UCLIBC_MAJOR__ == 1 && __UCLIBC_SUBLEVEL__ <= 17))
> 
>  Shouldn't this also include __UCLIBC_MINOR__ == 0, so the condition doesn't
> trigger when uClibc-ng 1.1.0 is released?

Do you know of any hidden roadmap I am not aware of? ;)

best regards
   Waldemar