From 24cbe510871f316c5d2f5f9df45f9a141fa1c8ad Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 15 May 2019 11:55:21 -0400 Subject: build openssl --- ds9/macos/Makefile.in | 3 ++- macos/Makefile.in | 38 ++++++++++++++++++++++++++++++++------ macos/configure | 4 ---- macos/configure.ac | 3 --- unix/configure | 14 +------------- 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/ds9/macos/Makefile.in b/ds9/macos/Makefile.in index f33de59..518db12 100644 --- a/ds9/macos/Makefile.in +++ b/ds9/macos/Makefile.in @@ -178,7 +178,8 @@ ds9base : $(OBJS) $(LLIBS) $(TK_LIB_SPEC) \ $(TCL_LIB_SPEC) \ $(TK_LIBS) \ - $(LIBS) + $(LIBS) \ + -L $(prefix)/openssl -lssl -lcrypto # update date/time so we know when the build was done $(APPDIR): 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) diff --git a/unix/configure b/unix/configure index 2067ebf..525151f 100755 --- a/unix/configure +++ b/unix/configure @@ -624,7 +624,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -690,7 +689,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -943,15 +941,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1089,7 +1078,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1242,7 +1231,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] -- cgit v0.12