[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tlsdate/debian-master] Add basic GNU/Hurd build support
commit 2f7224a11eddcc0d515cd168954eaff4b7baa0f8
Author: Jacob Appelbaum <jacob@xxxxxxxxxxxxx>
Date: Wed Apr 24 19:57:17 2013 -0700
Add basic GNU/Hurd build support
---
INSTALL | 9 +++++----
m4/ax_platform.m4 | 4 ++++
src/compat/clock.h | 4 ++++
src/compat/include.am | 4 ++++
src/include.am | 28 ++++++++++++++++++++++++++--
5 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/INSTALL b/INSTALL
index 97ca73b..07bdcd9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,21 +18,22 @@ tlsdate should build and work on the following Operating Systems:
tlsdate should build and may work on the following Operating Systems:
- Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3)
+ Win32 with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3
+ Win32 with MinGW
Haiku r1alpha4
+ GNU/Hurd GNU-Mach 1.3.99-486-dbg/Hurd-0.3
Please file a bug or email the tlsdate team if you have successfully built or
use tlsdate on a platform that is not listed. We are specifically looking for
ports of tlsdate or for tlsdate integration on the following Operating Systems:
- Win32 (MinGW or otherwise)
+ Windows native
OpenWRT
pfsense
OpenVMS
Irix
- GNU/Hurd
Minix
- Any of the classic unix systems
+ Any of the other classic unix systems
Currently porting is in progress or partially documented for:
diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4
index 2d4285c..e5baba5 100644
--- a/m4/ax_platform.m4
+++ b/m4/ax_platform.m4
@@ -75,6 +75,9 @@
[*darwin*],
[TARGET_OS_OSX="true"
AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])],
+ [*gnu*],
+ [TARGET_OS_GNUHURD="true"
+ AC_DEFINE([TARGET_OS_GNUHURD],[1],[Whether we build for GNU/Hurd])],
[*linux*],
[TARGET_OS_LINUX="true"
AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])])
@@ -84,6 +87,7 @@
AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_OS_CYGWIN}" = "xtrue"])
AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_OS_HAIKU}" = "xtrue"])
AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OS_OSX}" = "xtrue"])
+ AM_CONDITIONAL([TARGET_GNUHURD],[test "x${TARGET_OS_GNUHURD}" = "xtrue"])
AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_OS_LINUX}" = "xtrue"])
AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"])
AM_CONDITIONAL([TARGET_NETBSD],[test "x${TARGET_OS_NETBSD}" = "xtrue"])
diff --git a/src/compat/clock.h b/src/compat/clock.h
index 727940e..15f3223 100644
--- a/src/compat/clock.h
+++ b/src/compat/clock.h
@@ -42,6 +42,10 @@ struct tlsdate_time {
struct timespec tp;
#elif TARGET_OS_MINGW
struct timespec tp;
+#elif TARGET_OS_GNUHURD
+ struct timespec tp;
+#else
+ struct timespec tp;
#endif
};
diff --git a/src/compat/include.am b/src/compat/include.am
index 55ebb61..55b6218 100644
--- a/src/compat/include.am
+++ b/src/compat/include.am
@@ -40,6 +40,10 @@ endif
endif
endif
+if TARGET_GNUHURD
+src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c
+endif
+
if TARGET_CYGWIN
src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c
endif
diff --git a/src/include.am b/src/include.am
index 3168a6c..f724f39 100644
--- a/src/include.am
+++ b/src/include.am
@@ -96,6 +96,17 @@ endif
endif
endif
+if TARGET_GNUHURD
+bin_PROGRAMS+= src/tlsdate
+bin_PROGRAMS+= src/tlsdate-helper
+
+src_conf_unittest_SOURCES = src/conf.c
+src_conf_unittest_SOURCES+= src/conf-unittest.c
+src_conf_unittest_SOURCES+= src/common/android.c
+check_PROGRAMS+= src/conf_unittest
+noinst_PROGRAMS+= src/conf_unittest
+endif
+
if TARGET_CYGWIN
bin_PROGRAMS+= src/tlsdate
bin_PROGRAMS+= src/tlsdate-helper
@@ -277,6 +288,19 @@ endif
endif
endif
+if TARGET_GNUHURD
+if !POLARSSL
+src_proxy_bio_unittest_LDADD = @SSL_LIBS@
+src_proxy_bio_unittest_SOURCES = src/proxy-bio.c
+src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c
+src_proxy_bio_unittest_SOURCES+= src/test-bio.c
+src_proxy_bio_unittest_SOURCES+= src/util.c
+src_proxy_bio_unittest_SOURCES+= src/common/android.c
+check_PROGRAMS+= src/proxy-bio_unittest
+noinst_PROGRAMS+= src/proxy-bio_unittest
+endif
+endif
+
if TARGET_CYGWIN
if !POLARSSL
src_proxy_bio_unittest_LDADD = @SSL_LIBS@
@@ -335,7 +359,6 @@ endif
# This is our explicit target list
# We do not attempt to build with PolarSSL
if !POLARSSL
-if !TARGET_HAIKU
if !TARGET_LINUX
if !TARGET_OSX
if !TARGET_OPENBSD
@@ -343,6 +366,7 @@ if !TARGET_NETBSD
if !TARGET_FREEBSD
if !TARGET_DRAGONFLYBSD
if !TARGET_HAIKU
+if !TARGET_GNUHURD
if !TARGET_CYGWIN
if !TARGET_MINGW
if !TARGET_BSD
@@ -368,7 +392,6 @@ endif
endif
if !POLARSSL
-if !TARGET_HAIKU
if !TARGET_LINUX
if !TARGET_OSX
if !TARGET_OPENBSD
@@ -376,6 +399,7 @@ if !TARGET_NETBSD
if !TARGET_FREEBSD
if !TARGET_DRAGONFLYBSD
if !TARGET_HAIKU
+if !TARGET_GNUHURD
if !TARGET_CYGWIN
if !TARGET_MINGW
if !TARGET_BSD
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits