Skip to content

Comments

Windows: Produce a static version of the public libraries, always#7496

Closed
levitte wants to merge 1 commit intoopenssl:masterfrom
levitte:fix-7492
Closed

Windows: Produce a static version of the public libraries, always#7496
levitte wants to merge 1 commit intoopenssl:masterfrom
levitte:fix-7492

Conversation

@levitte
Copy link
Member

@levitte levitte commented Oct 25, 2018

When building shared libraries on Windows, we had a clash between
'libcrypto.lib' the static routine library and 'libcrypto.lib' the
import library.

We now change it so the static versions of our libraries get '_static'
appended to their names. These will never get installed, but can
still be used for our internal purposes, such as internal tests.

When building non-shared, the renaming mechanism doesn't com into
play. In that case, the static libraries 'libcrypto.lib' and
'libssl.lib' are installed, just as always.

Fixes #7492

Checklist
  • documentation is added or updated
  • tests are added or updated

@levitte levitte added the branch: master Applies to master branch label Oct 25, 2018
@levitte levitte added the branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL) label Oct 25, 2018
Copy link
Member

@t-j-h t-j-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please correct "com" to "come" in the commit message before pushing

When building shared libraries on Windows, we had a clash between
'libcrypto.lib' the static routine library and 'libcrypto.lib' the
import library.

We now change it so the static versions of our libraries get '_static'
appended to their names.  These will never get installed, but can
still be used for our internal purposes, such as internal tests.

When building non-shared, the renaming mechanism doesn't come into
play.  In that case, the static libraries 'libcrypto.lib' and
'libssl.lib' are installed, just as always.

Fixes openssl#7492
@levitte
Copy link
Member Author

levitte commented Oct 25, 2018

Will do

levitte added a commit that referenced this pull request Oct 25, 2018
When building shared libraries on Windows, we had a clash between
'libcrypto.lib' the static routine library and 'libcrypto.lib' the
import library.

We now change it so the static versions of our libraries get '_static'
appended to their names.  These will never get installed, but can
still be used for our internal purposes, such as internal tests.

When building non-shared, the renaming mechanism doesn't come into
play.  In that case, the static libraries 'libcrypto.lib' and
'libssl.lib' are installed, just as always.

Fixes #7492

Reviewed-by: Tim Hudson <[email protected]>
(Merged from #7496)

(cherry picked from commit b3023ce)
@levitte
Copy link
Member Author

levitte commented Oct 25, 2018

Merged.

master:
b3023ce Windows: Produce a static version of the public libraries, always

1.1.1:
8529945 Windows: Produce a static version of the public libraries, always

@levitte levitte closed this Oct 25, 2018
levitte added a commit that referenced this pull request Oct 25, 2018
When building shared libraries on Windows, we had a clash between
'libcrypto.lib' the static routine library and 'libcrypto.lib' the
import library.

We now change it so the static versions of our libraries get '_static'
appended to their names.  These will never get installed, but can
still be used for our internal purposes, such as internal tests.

When building non-shared, the renaming mechanism doesn't come into
play.  In that case, the static libraries 'libcrypto.lib' and
'libssl.lib' are installed, just as always.

Fixes #7492

Reviewed-by: Tim Hudson <[email protected]>
(Merged from #7496)
@mspncp mspncp added this to the 1.1.1a milestone Oct 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: master Applies to master branch branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fix internal tests for shared Windows builds

3 participants