diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-05-15 15:55:21 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-05-15 15:55:21 (GMT) |
| commit | 24cbe510871f316c5d2f5f9df45f9a141fa1c8ad (patch) | |
| tree | d3c55fb0ec7e93598510ac79a234b532bba8f2b9 /macos | |
| parent | e1c7c90d500b4bf0dc3cc0194f8b399615e45d24 (diff) | |
| download | blt-24cbe510871f316c5d2f5f9df45f9a141fa1c8ad.zip blt-24cbe510871f316c5d2f5f9df45f9a141fa1c8ad.tar.gz blt-24cbe510871f316c5d2f5f9df45f9a141fa1c8ad.tar.bz2 | |
build openssl
Diffstat (limited to 'macos')
| -rw-r--r-- | macos/Makefile.in | 38 | ||||
| -rwxr-xr-x | macos/configure | 4 | ||||
| -rwxr-xr-x | macos/configure.ac | 3 |
3 files changed, 32 insertions, 13 deletions
diff --git a/macos/Makefile.in b/macos/Makefile.in index e16621c..1bfa383 100644 --- a/macos/Makefile.in +++ b/macos/Makefile.in @@ -11,9 +11,10 @@ mandir = @mandir@ OS = @OS@ ARCH = @ARCH@ -TLSFLAGS = @TLSFLAGS@ JOBS = @CORES@ +TLSFLAGS = --with-ssl-dir=$(prefix)/openssl + include ./make.include WITHTCL = --with-tcl=$(prefix)/build/tcl/Development @@ -38,9 +39,10 @@ TKFILES = \ #--------------------------build -.PHONY : saods9 tcl tk tkmacosx +.PHONY : saods9 tcl tk tkmacosx openssl saods9 : dirs tcl tk \ + openssl \ tcliis tclsignal \ tls tclxml xpa \ tkblt tktable tkimg \ @@ -121,6 +123,19 @@ tclsignal/Makefile : $(STD) \ $(CACHE) +#--------------------------openssl + +openssl : openssl/Makefile + @echo "" + @echo "*** $@ ***" + $(MAKE) -C openssl -j $(JOBS) + +openssl/Makefile: + @echo "" + @echo "*** $@ ***" + cd openssl; \ + ./config --prefix=$(prefix) + #-------------------------- tkmacosx tkmacosx: tkmacosx/Makefile @@ -140,7 +155,7 @@ tkmacosx/Makefile : #--------------------------clean -.PHONY : tclclean tkclean osclean tclsignalclean tkmacosxclean +.PHONY : tclclean tkclean osclean tclsignalclean tkmacosxclean opensslclean tclclean : @echo "" @@ -152,7 +167,7 @@ tkclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx clean -osclean : tclsignalclean tkmacosxclean +osclean : tclsignalclean tkmacosxclean opensslclean tclsignalclean : @echo "" @@ -164,9 +179,14 @@ tkmacosxclean : @echo "*** $@ ***" $(MAKE) -C tkmacosx clean +opensslclean: + @echo "" + @echo "*** $@ ***" + $(MAKE) -C openssl clean + #--------------------------distclean -.PHONY : tcldistclean tkdistclean +.PHONY : tcldistclean tkdistclean openssldistclean .PHONY : osdistclean tclsignaldistclean tkmacosxdistclean tcldistclean : @@ -179,7 +199,7 @@ tkdistclean : @echo "*** $@ ***" $(MAKE) -C tk$(TCL_VERSION)/macosx distclean -osdistclean : tclsignaldistclean tkmacosxdistclean +osdistclean : tclsignaldistclean tkmacosxdistclean openssldistclean tclsignaldistclean : @echo "" @@ -192,6 +212,12 @@ tkmacosxdistclean : @echo "*** $@ ***" $(MAKE) -C tkmacosx distclean +openssldistclean : + @echo "" + @echo "*** $@ ***" + $(MAKE) -C openssl clean + rm -f openssl/Makefile + #--------------------------distribution .PHONY : dist diff --git a/macos/configure b/macos/configure index 3a5308c..2688b39 100755 --- a/macos/configure +++ b/macos/configure @@ -584,7 +584,6 @@ PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS CORES -TLSFLAGS ARCH OS INSTALL_LIBRARY @@ -1906,9 +1905,6 @@ ARCH=$with_arch prefix=$ac_pwd exec_prefix=$ac_pwd -TLSFLAGS="--with-ssl-dir=/opt/local" - - CORES=`sysctl -n "hw.ncpu"` diff --git a/macos/configure.ac b/macos/configure.ac index 0f8b679..0d4f6ad 100755 --- a/macos/configure.ac +++ b/macos/configure.ac @@ -44,9 +44,6 @@ AC_SUBST(ARCH) prefix=$ac_pwd exec_prefix=$ac_pwd -TLSFLAGS="--with-ssl-dir=/opt/local" -AC_SUBST(TLSFLAGS) - CORES=`sysctl -n "hw.ncpu"` AC_SUBST(CORES) |