[16070] in Kerberos-V5-bugs

home help back first fref pref prev next nref lref last post

[krbdev.mit.edu #8662] git commit

daemon@ATHENA.MIT.EDU (Greg Hudson via RT)
Wed Jun 20 12:20:26 2018

Mail-followup-to: rt@krbdev.mit.edu
mail-copies-to: never
From: "Greg Hudson via RT" <rt-comment@KRBDEV-PROD-APP-1.mit.edu>
In-Reply-To: <rt-8662@krbdev.mit.edu>
Message-ID: <rt-8662-48677.18.4766164150303@krbdev.mit.edu>
To: "'AdminCc of krbdev.mit.edu Ticket #8662'":;
Date: Wed, 20 Jun 2018 12:20:19 -0400 (EDT)
Reply-To: rt-comment@KRBDEV-PROD-APP-1.mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: krb5-bugs-bounces@mit.edu


Clean up Windows build CPU detection

In the main build, set a variable BITS based on the detected CPU type,
and use it in library name expansions rather than repeatedly checking
for the same three 64-bit architectures.  Also remove an unused
variable WLIB, formerly used to name the winsock library.

In the installer build, detect the CPU type in the makefile and pass
it to candle with the -arch option.  This sets $(sys.BUILDARCH) in wix
scripts and also sets the default value of Win64 in components so we
don't have to set it for each one.

Update the build instructions and appveyor.yml to reflect that the
builder no longer needs to set CPU.

https://github.com/krb5/krb5/commit/3a30dec3bbb7f264b7ce74e363c9b23edfd4e491
Author: Greg Hudson <ghudson@mit.edu>
Commit: 3a30dec3bbb7f264b7ce74e363c9b23edfd4e491
Branch: master
 appveyor.yml                                   |    2 -
 src/config/win-pre.in                          |   38 ++---
 src/lib/Makefile.in                            |    6 +-
 src/windows/README                             |   32 ++---
 src/windows/installer/wix/Makefile             |   14 ++-
 src/windows/installer/wix/config.wxi           |   12 --
 src/windows/installer/wix/features.wxi         |    8 +-
 src/windows/installer/wix/files.wxi            |  172 +++++++++++-------------
 src/windows/installer/wix/kfw.wxs              |    3 +-
 src/windows/installer/wix/lang/config_1033.wxi |    4 +-
 src/windows/installer/wix/platform.wxi         |    4 +-
 src/windows/installer/wix/runtime.wxi          |    2 +-
 src/windows/leash/Makefile.in                  |    2 +-
 src/windows/leashdll/Makefile.in               |    8 +-
 14 files changed, 134 insertions(+), 173 deletions(-)

_______________________________________________
krb5-bugs mailing list
krb5-bugs@mit.edu
https://mailman.mit.edu/mailman/listinfo/krb5-bugs

home help back first fref pref prev next nref lref last post