diff options
author | William Ahern <william@solaris.(none)> | 2012-09-27 13:11:30 -0700 |
---|---|---|
committer | William Ahern <william@solaris.(none)> | 2012-09-27 13:11:30 -0700 |
commit | 7314a6aaddf0984258d5e04b27faee08de314821 (patch) | |
tree | 48c3ce632d32f2a4509b6fca3976d777f91ddd33 | |
parent | 21dfde350145320964f034b0f26543f000de1538 (diff) | |
download | luaossl-7314a6aaddf0984258d5e04b27faee08de314821.tar.gz luaossl-7314a6aaddf0984258d5e04b27faee08de314821.tar.bz2 luaossl-7314a6aaddf0984258d5e04b27faee08de314821.zip |
-n
fix solaris build
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | openssl.c | 4 |
2 files changed, 12 insertions, 0 deletions
@@ -13,8 +13,16 @@ VENDOR.CC = $(shell env CC="${CC}" ../mk/vendor.cc) CPPFLAGS = -I$(DESTDIR)$(lua52include) + +ifeq ($(VENDOR.CC), sunpro) +DFLAGS = -g +CFLAGS = -xcode=pic13 $(DFLAGS) +CPPFLAGS += -DOPENSSL_NO_EC +else DFLAGS = -g -Wall -Wextra -Wno-deprecated-declarations -Wno-unused CFLAGS = -fPIC $(DFLAGS) +endif + LDFLAGS = -lssl -lcrypto ifeq ($(VENDOR.OS), Darwin) @@ -789,6 +789,7 @@ creat: break; } +#ifndef OPENSSL_NO_EC case EVP_PKEY_EC: { EC_GROUP *grp; EC_KEY *key; @@ -821,6 +822,7 @@ creat: break; } +#endif default: return luaL_error(L, "%d: unknown EVP base type (%d)", EVP_PKEY_type(type), type); } /* switch() */ @@ -998,6 +1000,7 @@ static int pk_toPEM(lua_State *L) { break; } +#ifndef OPENSSL_NO_EC case EVP_PKEY_EC: { EC_KEY *ec = EVP_PKEY_get1_EC_KEY(key); const EC_GROUP *grp = EC_KEY_get0_group(ec); @@ -1011,6 +1014,7 @@ static int pk_toPEM(lua_State *L) { break; } +#endif default: return luaL_error(L, "%d: unknown EVP base type", EVP_PKEY_type(key->type)); } |