summaryrefslogtreecommitdiff
path: root/src/GNUmakefile
diff options
context:
space:
mode:
authorWilliam Ahern (william@25thandclement.com) <wahern@aix7.polarhome.com>2014-07-18 02:21:21 +0200
committerWilliam Ahern (william@25thandclement.com) <wahern@aix7.polarhome.com>2014-07-18 02:21:21 +0200
commit9157308b90ea7df405ed9b22f1801f3f70f2e30b (patch)
treeaf5ade3770609332d9561a3ca39fb0e12a64f4da /src/GNUmakefile
parentf026c11953f5a3b3e7285a08829f5777cfe31331 (diff)
downloadluaossl-rel-20140718.tar.gz
luaossl-rel-20140718.tar.bz2
luaossl-rel-20140718.zip
patches to build on AIXrel-20140718
Diffstat (limited to 'src/GNUmakefile')
-rw-r--r--src/GNUmakefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GNUmakefile b/src/GNUmakefile
index f988855..ee263b0 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -17,7 +17,7 @@ include $(d)/../GNUmakefile
17# C O M P I L A T I O N F L A G S 17# C O M P I L A T I O N F L A G S
18# 18#
19OS_$(d) = $(shell $(d)/../mk/vendor.os) 19OS_$(d) = $(shell $(d)/../mk/vendor.os)
20CC_$(d) = $(shell $(d)/../mk/vendor.cc) 20CC_$(d) = $(shell env CC="$(CC) "$(d)/../mk/vendor.cc)
21LUAPATH_$(d) = $(shell env CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(<D)/../mk/lua.path -krxm3 -I$(DESTDIR)$(includedir) -I/usr/include -I/usr/local/include -P$(DESTDIR)$(bindir) -P$(bindir) -L$(DESTDIR)$(libdir) -L$(libdir) -v$(1) $(2)) 21LUAPATH_$(d) = $(shell env CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(<D)/../mk/lua.path -krxm3 -I$(DESTDIR)$(includedir) -I/usr/include -I/usr/local/include -P$(DESTDIR)$(bindir) -P$(bindir) -L$(DESTDIR)$(libdir) -L$(libdir) -v$(1) $(2))
22 22
23CPPFLAGS_$(d) = $(CPPFLAGS_$(abspath $(@D)/../..)) 23CPPFLAGS_$(d) = $(CPPFLAGS_$(abspath $(@D)/../..))
@@ -29,7 +29,7 @@ ifeq ($(CC_$(d)), sunpro)
29CPPFLAGS_$(d) += -DOPENSSL_NO_EC 29CPPFLAGS_$(d) += -DOPENSSL_NO_EC
30endif 30endif
31 31
32LDFLAGS_$(d) += -lssl -lcrypto -lpthread 32LDFLAGS_$(d) += -lssl -lcrypto -lpthread -lm
33 33
34# NetBSD, FreeBSD, OpenBSD (and presumably descendants) lack any libdl; 34# NetBSD, FreeBSD, OpenBSD (and presumably descendants) lack any libdl;
35# dlopen, et al are part of libc. 35# dlopen, et al are part of libc.
@@ -109,7 +109,7 @@ MODS$(1)_$(d) = \
109 109
110$$(DESTDIR)$(2)/_openssl.so: $$(d)/$(1)/openssl.so 110$$(DESTDIR)$(2)/_openssl.so: $$(d)/$(1)/openssl.so
111 $$(MKDIR) -p $$(@D) 111 $$(MKDIR) -p $$(@D)
112 $$(CP) -p $$< $$@ 112 $$(CP) -fp $$< $$@
113 113
114$$(DESTDIR)$(3)/openssl/%.lua: $$(d)/openssl.%.lua 114$$(DESTDIR)$(3)/openssl/%.lua: $$(d)/openssl.%.lua
115 $$(LUAC$(1)_$(d)) -p $$< 115 $$(LUAC$(1)_$(d)) -p $$<