Check-in [8082796226]
Overview
Comment:Updated to support building libssl from the WebUI
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8082796226b607da576e15ff1d1d4b1399289d2f
User & Date: rkeene on 2016-07-08 22:00:59
Other Links: manifest | tags
Context
2016-08-02
03:19
Fix typos causing --disable-threads to fail to work sometimes and the "thread" package to not be included when --enable-threads is passed sometimes check-in: b7219bed1a user: rkeene tags: trunk
2016-07-08
22:00
Updated to support building libssl from the WebUI check-in: 8082796226 user: rkeene tags: trunk
21:56
Updated to try to use pkg-config to determine additional libraries for libssl check-in: 8edfc5151b user: rkeene tags: trunk
Changes

Modified build/web/kitcreator.vfs/index.rvt from [72c38390f4] to [3f7e9d34fb].

   120    120   				}
   121    121   				"option_minbuild" {
   122    122   					set build_options(minbuild) 1
   123    123   				}
   124    124   				"option_staticlibssl" {
   125    125   					set build_options(staticlibssl) 1
   126    126   				}
          127  +				"option_buildlibssl" {
          128  +					set build_options(buildlibssl) 1
          129  +				}
   127    130   				"option_staticpkgs" {
   128    131   					set build_options(staticpkgs) 1
   129    132   				}
   130    133   				"option_tclutfmax6" {
   131    134   					set build_options(tclutfmax6) 1
   132    135   				}
   133    136   				"option_storage" {
................................................................................
   367    370               <input type="checkbox" name="option_threaded">Kit: Threaded<br>
   368    371               <input type="checkbox" name="option_debug">Kit: Debugging Build<br>
   369    372               <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br>
   370    373               <input type="checkbox" name="option_dynamictk" id="option_dynamictk">Kit: Always link Tk dynamically (if Tk is built)<br>
   371    374               <input type="checkbox" name="option_minbuild">Kit: "Minimal" build (remove extra packages shipped as part of Tcl and reduce encodings)<br>
   372    375               <input type="checkbox" name="option_staticpkgs">Kit: Statically link packages in pkgs directory<br>
   373    376               <input type="checkbox" name="option_tclutfmax6">Kit: TCL_UTF_MAX=6 (incompatibility with standard Tcl)<br>
   374         -            <input type="checkbox" name="option_staticlibssl">TLS: Statically link to LibSSL
          377  +            <input type="checkbox" name="option_staticlibssl">TLS: Statically link to LibSSL<br>
          378  +            <input type="checkbox" name="option_buildlibssl">TLS: Build LibreSSL for this platform
   375    379             </td>
   376    380           </tr>
   377    381   	<tr>
   378    382   		<td>Kit Storage:</td>
   379    383   		<td>
   380    384   			<select name="option_storage">
   381    385   				<option value="auto">Automatically Determined</option>

Modified build/web/process_queue from [611cdd4af4] to [5643d5fd0a].

   104    104   					set ::env(KITCREATOR_MINBUILD) 1
   105    105   				}
   106    106   			}
   107    107   			"staticlibssl" {
   108    108   				if {$value} {
   109    109   					set ::env(KC_TLS_LINKSSLSTATIC) 1
   110    110   				}
          111  +			}
          112  +			"buildlibssl" {
          113  +				if {$value} {
          114  +					set ::env(KC_TLS_BUILDSSL) 1
          115  +				}
   111    116   			}
   112    117   			"staticpkgs" {
   113    118   				if {$value} {
   114    119   					set ::env(KC_TCL_STATICPKGS) 1
   115    120   				}
   116    121   			}
   117    122   			"tclutfmax6" {
................................................................................
   133    138   	}
   134    139   
   135    140   	catch {
   136    141   		set cmd [list $script $buildinfo(tcl_version) {*}$args]
   137    142   		set fd [open "${outfile}.log" w+]
   138    143   		puts $fd "Running: export KITCREATOR_PKGS=\"$::env(KITCREATOR_PKGS)\""
   139    144   
   140         -		foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC KC_TCL_STATICPKGS KC_TCL_UTF_MAX] {
          145  +		foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC KC_TLS_BUILDSSL KC_TCL_STATICPKGS KC_TCL_UTF_MAX] {
   141    146   			if {[info exists ::env($variable)]} {
   142    147   				puts $fd "Running: export $variable=\"$::env($variable)\""
   143    148   			}
   144    149   		}
   145    150   
   146    151   		puts $fd "Running: $cmd"
   147    152   		close $fd