Browse Source

Merge pull request #111 from equinox0815/uanytun-gcrypt

reenabled libgcrypt and make it the default again
sbyx 10 years ago
parent
commit
f94dce1ab4
1 changed files with 24 additions and 3 deletions
  1. 24
    3
      net/uanytun/Makefile

+ 24
- 3
net/uanytun/Makefile View File

@@ -37,9 +37,9 @@ endef
37 37
 
38 38
 define Package/uanytun
39 39
   $(call Package/uanytun/template)
40
-  TITLE+= (nettle)
41
-  VARIANT:=nettle
42
-  DEPENDS+=+libnettle
40
+  TITLE+= (gcrypt)
41
+  VARIANT:=gcrypt
42
+  DEPENDS+=+libgcrypt
43 43
 endef
44 44
 
45 45
 define Package/uanytun/conffiles
@@ -61,6 +61,17 @@ uAnytun is a tiny implementation of SATP the secure anycast tunneling protocol.
61 61
 endef
62 62
 
63 63
 
64
+define Package/uanytun-nettle
65
+  $(call Package/uanytun/template)
66
+  TITLE+= (nettle)
67
+  VARIANT:=nettle
68
+  DEPENDS+=+libnettle
69
+endef
70
+
71
+Package/uanytun-nettle/conffiles=$(Package/uanytun/conffiles)
72
+Package/uanytun-nettle/description=$(Package/uanytun/description)
73
+
74
+
64 75
 define Package/uanytun-sslcrypt
65 76
   $(call Package/uanytun/template)
66 77
   TITLE+= (openssl)
@@ -101,6 +112,11 @@ VARIANT_CFLAGS:=
101 112
 VARIANT_LDFLAGS:=-ldl
102 113
 VARIANT_MAKE_OPTS:=
103 114
 
115
+ifeq ($(BUILD_VARIANT),gcrypt)
116
+VARIANT_CFLAGS+=-DUSE_GCRYPT
117
+VARIANT_LDFLAGS+=-lgpg-error -lgcrypt
118
+endif
119
+
104 120
 ifeq ($(BUILD_VARIANT),nettle)
105 121
 VARIANT_CFLAGS+=-DUSE_NETTLE
106 122
 VARIANT_LDFLAGS+=-lnettle
@@ -140,6 +156,10 @@ define Package/uanytun/install
140 156
   $(call Package/uanytun/install-generic,$(1),uanytun.config)
141 157
 endef
142 158
 
159
+define Package/uanytun-nettle/install
160
+  $(call Package/uanytun/install-generic,$(1),uanytun.config)
161
+endef
162
+
143 163
 define Package/uanytun-sslcrypt/install
144 164
   $(call Package/uanytun/install-generic,$(1),uanytun.config)
145 165
 endef
@@ -150,5 +170,6 @@ endef
150 170
 
151 171
 
152 172
 $(eval $(call BuildPackage,uanytun))
173
+$(eval $(call BuildPackage,uanytun-nettle))
153 174
 $(eval $(call BuildPackage,uanytun-sslcrypt))
154 175
 $(eval $(call BuildPackage,uanytun-nocrypt))