Diff

Differences From Artifact [aec06a1dc7]:

To Artifact [425a7ec59e]:


    51     51   
    52     52   	if [ ! -d '../buildsrc' ]; then
    53     53   		gzip -dc "../${SRC}" | tar -xf -
    54     54   	else    
    55     55   		cp -rp ../buildsrc/* './'
    56     56   	fi
    57     57   
           58  +	# Determine SSL directory
           59  +	if [ -z "${CPP}" ]; then
           60  +		CPP="${CC} -E"
           61  +	fi
           62  +	SSLDIR="$(echo '#include <openssl/ssl.h>' 2>/dev/null | ${CPP} - | awk '/# 1 "\/.*\/ssl\.h/{ print $3; exit }' | sed 's@^"@@;s@"$@@;s@/include/openssl/ssl\.h$@@')"
           63  +
    58     64   	# Apply required patches
    59     65   	cd "${BUILDDIR}" || exit 1
    60     66   	for patch in "${PATCHDIR}/all"/tls-${TLSVERS}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tls-${TLSVERS}-*.diff; do
    61     67   		if [ ! -f "${patch}" ]; then
    62     68   			continue
    63     69   		fi
    64     70   
................................................................................
   108    114   		else
   109    115   			sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' configure > configure.new
   110    116   		fi
   111    117   		cat configure.new > configure
   112    118   		rm -f configure.new
   113    119   
   114    120   		(
   115         -			echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
   116         -			./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
          121  +			echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" --with-ssl-dir=\"${SSLDIR}\" ${CONFIGUREEXTRA}"
          122  +			./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}" ${CONFIGUREEXTRA}
   117    123   
   118    124   			echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\""
   119    125   			${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" || exit 1
   120    126   
   121    127   			echo "Running: ${MAKE:-make} tcllibdir=\"${INSTDIR}/lib\" AR=\"${AR:-ar}\" RANLIB=\"${RANLIB:-ranlib}\" install"
   122    128   			${MAKE:-make} tcllibdir="${INSTDIR}/lib" AR="${AR:-ar}" RANLIB="${RANLIB:-ranlib}" install || exit 1
   123    129   		) || continue