Fossil SCM
Merge the latest autosetup changes into trunk.
Commit
172580e0a427d33db65735327bd3d46b6970e4fb
Parent
90b692ba5fb5482…
2 files changed
+7
+1
-7
M
auto.def
+7
| --- auto.def | ||
| +++ auto.def | ||
| @@ -134,10 +134,17 @@ | ||
| 134 | 134 | define FOSSIL_ENABLE_SSL |
| 135 | 135 | define-append EXTRA_CFLAGS $cflags |
| 136 | 136 | define-append EXTRA_LDFLAGS $ldflags |
| 137 | 137 | define-append LIBS -lssl -lcrypto |
| 138 | 138 | msg-result "HTTP support enabled" |
| 139 | + | |
| 140 | + # Maybe needed to silence warnings on Mac OS X 10.7 with openssl | |
| 141 | + if {[string match *-darwin* [get-define host]]} { | |
| 142 | + if {[cctest -cflags {-Wdeprecated-declarations}]} { | |
| 143 | + define-append EXTRA_CFLAGS -Wdeprecated-declarations | |
| 144 | + } | |
| 145 | + } | |
| 139 | 146 | } else { |
| 140 | 147 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 141 | 148 | } |
| 142 | 149 | } |
| 143 | 150 | |
| 144 | 151 |
| --- auto.def | |
| +++ auto.def | |
| @@ -134,10 +134,17 @@ | |
| 134 | define FOSSIL_ENABLE_SSL |
| 135 | define-append EXTRA_CFLAGS $cflags |
| 136 | define-append EXTRA_LDFLAGS $ldflags |
| 137 | define-append LIBS -lssl -lcrypto |
| 138 | msg-result "HTTP support enabled" |
| 139 | } else { |
| 140 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 141 | } |
| 142 | } |
| 143 | |
| 144 |
| --- auto.def | |
| +++ auto.def | |
| @@ -134,10 +134,17 @@ | |
| 134 | define FOSSIL_ENABLE_SSL |
| 135 | define-append EXTRA_CFLAGS $cflags |
| 136 | define-append EXTRA_LDFLAGS $ldflags |
| 137 | define-append LIBS -lssl -lcrypto |
| 138 | msg-result "HTTP support enabled" |
| 139 | |
| 140 | # Maybe needed to silence warnings on Mac OS X 10.7 with openssl |
| 141 | if {[string match *-darwin* [get-define host]]} { |
| 142 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 143 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 144 | } |
| 145 | } |
| 146 | } else { |
| 147 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 148 | } |
| 149 | } |
| 150 | |
| 151 |
+1
-7
| --- autosetup/cc.tcl | ||
| +++ autosetup/cc.tcl | ||
| @@ -331,17 +331,11 @@ | ||
| 331 | 331 | # simply replaces the existing value. |
| 332 | 332 | # |
| 333 | 333 | # Returns the previous settings |
| 334 | 334 | proc cc-update-settings {args} { |
| 335 | 335 | set prev [cc-get-settings] |
| 336 | - array set new $prev | |
| 337 | - | |
| 338 | - foreach {name value} $args { | |
| 339 | - set new($name) $value | |
| 340 | - } | |
| 341 | - cc-store-settings $new | |
| 342 | - | |
| 336 | + cc-store-settings [dict merge $prev $args] | |
| 343 | 337 | return $prev |
| 344 | 338 | } |
| 345 | 339 | |
| 346 | 340 | # @cc-with settings ?{ script }? |
| 347 | 341 | # |
| 348 | 342 |
| --- autosetup/cc.tcl | |
| +++ autosetup/cc.tcl | |
| @@ -331,17 +331,11 @@ | |
| 331 | # simply replaces the existing value. |
| 332 | # |
| 333 | # Returns the previous settings |
| 334 | proc cc-update-settings {args} { |
| 335 | set prev [cc-get-settings] |
| 336 | array set new $prev |
| 337 | |
| 338 | foreach {name value} $args { |
| 339 | set new($name) $value |
| 340 | } |
| 341 | cc-store-settings $new |
| 342 | |
| 343 | return $prev |
| 344 | } |
| 345 | |
| 346 | # @cc-with settings ?{ script }? |
| 347 | # |
| 348 |
| --- autosetup/cc.tcl | |
| +++ autosetup/cc.tcl | |
| @@ -331,17 +331,11 @@ | |
| 331 | # simply replaces the existing value. |
| 332 | # |
| 333 | # Returns the previous settings |
| 334 | proc cc-update-settings {args} { |
| 335 | set prev [cc-get-settings] |
| 336 | cc-store-settings [dict merge $prev $args] |
| 337 | return $prev |
| 338 | } |
| 339 | |
| 340 | # @cc-with settings ?{ script }? |
| 341 | # |
| 342 |