-n

fix solaris build

2 files changed, 12 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 739b87d..c6f7e4d 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/openssl.c b/openssl.c
index afae12b..b63e6e0 100644
--- a/openssl.c
+++ b/openssl.c
@@ -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));
                         }