Skip to contentSkip to conversation

package/softether: Fix compilation error

PATCH New Bernd Kuhls 3 participants 7 messages Mar 10, 2015 – Mar 15, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/softether: Fix compilation error

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/softether/0006-librt.patch |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/softether/0006-librt.patch
package/softether/0006-librt.patch new file +33 -0
new file mode 100644
index 0000000..661c960
@@ -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 <[email protected]>
+
+
+From 9a8538a6f2287fe8bebd0a7185de408e31e5a7df Mon Sep 17 00:00:00 2001
+From: Darik Horn <[email protected]>
+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)
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 package/softether: bump version

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/softether/softether.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/softether/softether.mk +1 -1
index 7f2dfb8..ea43877 100644
@@ -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 \
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 package/softether: bump version

Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/softether/softether.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/softether/softether.mk +0 -0
index 7f2dfb8..ea43877 100644

package/softether/softether.mk line 7

Quoted 5 lines
package/softether/softether.mk +1 -1
@@ -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.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 2/2 package/softether: bump version

Peter Korsgaard <[email protected]> wrote in
news:87h9tspt73.fsf at dell.be.48ers.dk:

Quoted 5 lines

package/softether/softether.mk line 7

Quoted 2 lines
package/softether/softether.mk +1 -1
-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

#4 lore raw

PATCH 2/2 package/softether: bump version

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Hi,

Quoted 10 lines
Quoted 5 lines

package/softether/softether.mk line 7

Quoted 2 lines
package/softether/softether.mk +1 -1
-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.

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 2/2 package/softether: bump version

Peter Korsgaard <[email protected]> wrote in
news:878uf4prxg.fsf at dell.be.48ers.dk:

Quoted 2 lines

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

#6 lore raw

PATCH 1/2 package/softether: Fix compilation error

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 4 lines · 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 <[email protected]>

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

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