[Buildroot] [PATCH 1/2] package/softether: Fix compilation error

[Buildroot] [PATCH 1/2] package/softether: Fix compilation error

[Bernd Kuhls]

/home/buildroot/instance-0/output/build/host-softether-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Mayaqua/Unix.c:2066:
undefined reference to `clock_gettime'

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/softether/0006-librt.patch |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/softether/0006-librt.patch

diff --git a/package/softether/0006-librt.patch b/package/softether/0006-librt.patch
new file mode 100644
index 0000000..661c960
--- /dev/null
+++ b/package/softether/0006-librt.patch
@@ -0,0 +1,33 @@
+Downloaded from
+https://github.com/dajhorn/SoftEtherVPN/commit/9a8538a6f2287fe8bebd0a7185de408e31e5a7df
+
+Fixes
+http://autobuild.buildroot.net/results/48f/48f778a891e0bf6a60ed2e4bec057c338ec25ec9/
+and many others
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+
+From 9a8538a6f2287fe8bebd0a7185de408e31e5a7df Mon Sep 17 00:00:00 2001
+From: Darik Horn <dajhorn@vanadac.com>
+Date: Thu, 5 Jun 2014 21:02:02 -0400
+Subject: [PATCH] Add an explicit autoconf check for librt.
+
+The realtime extensions library is not automatically linked on Debian ARM
+platforms, so do an AC_CHECK_LIB for it in the configuration macro.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 165623a..6f85393 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,6 +60,7 @@ CC="$PTHREAD_CC"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ 
++AC_CHECK_LIB([rt],[clock_gettime])
+ 
+ AX_CHECK_OPENSSL([
+ 	AC_SUBST(OPENSSL_LIBS)
-- 
1.7.10.4

[Buildroot] [PATCH 2/2] package/softether: bump version

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/softether/softether.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/softether/softether.mk b/package/softether/softether.mk
index 7f2dfb8..ea43877 100644
--- a/package/softether/softether.mk
+++ b/package/softether/softether.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SOFTETHER_VERSION = 16b713b98da8dba29f0f845d5a8c36d6f7c34824
+SOFTETHER_VERSION = 64fd19e6f849247e3daee765ad278c6bf072afcb
 SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION))
 SOFTETHER_PATCH = \
 	https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch \
-- 
1.7.10.4

[Buildroot] [PATCH 2/2] package/softether: bump version

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 >  package/softether/softether.mk |    2 +-
 >  1 file changed, 1 insertion(+), 1 deletion(-)

 > diff --git a/package/softether/softether.mk b/package/softether/softether.mk
 > index 7f2dfb8..ea43877 100644
 > --- a/package/softether/softether.mk
 > +++ b/package/softether/softether.mk
 > @@ -4,7 +4,7 @@
 >  #
 >  ################################################################################
 
 > -SOFTETHER_VERSION = 16b713b98da8dba29f0f845d5a8c36d6f7c34824
 > +SOFTETHER_VERSION = 64fd19e6f849247e3daee765ad278c6bf072afcb

Does this include the patch in 1/2? If so then we should drop that patch
(and if not, why not?)

Anyway, I have in the mean time fixed the clock_gettime issue in the .mk
file:

http://git.buildroot.net/buildroot/commit/?id=766366411386f5bba773042ada58e6379a3d0adf

But we can certainly revert that again once we bump the version.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] package/softether: bump version

[Bernd Kuhls]

Peter Korsgaard <peter@korsgaard.com> wrote in 
news:87h9tspt73.fsf at dell.be.48ers.dk:

> > -SOFTETHER_VERSION = 16b713b98da8dba29f0f845d5a8c36d6f7c34824
> > +SOFTETHER_VERSION = 64fd19e6f849247e3daee765ad278c6bf072afcb
> 
> Does this include the patch in 1/2? If so then we should drop that patch
> (and if not, why not?)

Hi,

no, the clock_gettime patch (http://patchwork.ozlabs.org/patch/448671/) has 
not yet made it into upstream.

Regards, Bernd

[Buildroot] [PATCH 2/2] package/softether: bump version

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

Hi,

>> > -SOFTETHER_VERSION = 16b713b98da8dba29f0f845d5a8c36d6f7c34824
 >> > +SOFTETHER_VERSION = 64fd19e6f849247e3daee765ad278c6bf072afcb
 >> 
 >> Does this include the patch in 1/2? If so then we should drop that patch
 >> (and if not, why not?)

 > Hi,

 > no, the clock_gettime patch (http://patchwork.ozlabs.org/patch/448671/) has 
 > not yet made it into upstream.

Ok, what is then the reason for the bump? A bit more descriptive commit
messages would be good.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] package/softether: bump version

[Bernd Kuhls]

Peter Korsgaard <peter@korsgaard.com> wrote in 
news:878uf4prxg.fsf at dell.be.48ers.dk:

> Ok, what is then the reason for the bump? A bit more descriptive commit
> messages would be good.

Hi,

both patches are independent from each other. There is no particular reason 
for the version bump besides the existence of updates to the source repo ;)

Regards, Bernd

[Buildroot] [PATCH 1/2] package/softether: Fix compilation error

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Tue, 10 Mar 2015 19:58:36 +0100, Bernd Kuhls wrote:
> /home/buildroot/instance-0/output/build/host-softether-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Mayaqua/Unix.c:2066:
> undefined reference to `clock_gettime'
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Both patches applied.

For this specific patch, I've also reverted Peter's fix for the same
problem, since it was no longer needed.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com