Page MenuHomeFreeBSD
Differential D51925

packages: Improve handling of -lib packages
Needs ReviewPublic
Actions

Authored by ivy on Fri, Aug 15, 8:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Aug 19, 11:59 PM
Unknown Object (File)
Sat, Aug 16, 2:09 PM
Subscribers
bdrewery
emaste
imp
jrtc27

Details

Reviewers
des
Group Reviewers
pkgbase
Summary

For some packages (OpenSSL, Kerberos) we want to ship runtime libraries
in a separate package, e.g. openssl and openssl-lib. Currently this is
done using PACKAGE=openssl-lib, but that creates packages with strange
names like openssl-lib-lib32.

Instead, add a new LIB_PACKAGE option to bsd.lib.mk that causes runtime
libraries to be placed in a new -lib subpackage. This significantly
improves the set of packages we create; for example, OpenSSL goes from:

FreeBSD-openssl
FreeBSD-openssl-dbg
FreeBSD-openssl-lib
FreeBSD-openssl-lib-dbg
FreeBSD-openssl-lib-dbg-lib32
FreeBSD-openssl-lib-dev
FreeBSD-openssl-lib-dev-lib32
FreeBSD-openssl-lib-lib32
FreeBSD-openssl-lib-man
FreeBSD-openssl-man

to:

FreeBSD-openssl
FreeBSD-openssl-dbg
FreeBSD-openssl-dbg-lib32
FreeBSD-openssl-dev
FreeBSD-openssl-dev-lib32
FreeBSD-openssl-lib
FreeBSD-openssl-lib32
FreeBSD-openssl-man

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 66275
Build 63158: arc lint + arc unit

Event Timeline

ivy created this revision.Fri, Aug 15, 8:00 PM
Herald added subscribers: jrtc27, emaste, imp, bdrewery. · View Herald TranscriptFri, Aug 15, 8:00 PM
ivy requested review of this revision.Fri, Aug 15, 8:00 PM
Harbormaster completed remote builds in B66274: Diff 160410.Fri, Aug 15, 8:00 PM
ivy updated this revision to Diff 160411.Fri, Aug 15, 8:02 PM

remove some dead code

Harbormaster completed remote builds in B66275: Diff 160411.Fri, Aug 15, 8:02 PM
ivy updated this revision to Diff 160415.Fri, Aug 15, 8:55 PM

fix generate-ucl to not create a dependency from -lib to the base package

Harbormaster completed remote builds in B66278: Diff 160415.Fri, Aug 15, 8:56 PM
des requested changes to this revision.Sat, Aug 16, 10:31 AM
des added inline comments.
krb5/include/Makefile
10

drop this

krb5/include/Makefile.inc
10

move this to ../Makefile.inc

krb5/lib/Makefile.inc
12–13

drop this

krb5/libdata/Makefile
9–10

drop this

krb5/util/build-tools/Makefile
10

drop this

krb5/util/et/Makefile
10–11

drop this

krb5/util/profile/Makefile
10–11

drop this

krb5/util/ss/Makefile
10–11

drop this

krb5/util/support/Makefile
10–11

drop this

krb5/util/verto/Makefile
10–11

drop this

secure/lib/libcrypto/Makefile
9–10

move this to Makefile.inc

secure/lib/libcrypto/engines/Makefile.inc
1–2

drop this

secure/lib/libcrypto/modules/Makefile.inc
1–2

drop this

secure/lib/libssl/Makefile
6–7

drop this

This revision now requires changes to proceed.Sat, Aug 16, 10:31 AM
ivy updated this revision to Diff 160520.Mon, Aug 18, 12:04 AM

address review feedback

for Kerberos, we can set PACKAGE in krb5/Makefile.inc as everything eventually
includes this, but set LIB_PACKAGE in krb5/{lib,util}/Makefile.inc to avoid
creating a kerberos-kdc-lib package.

for OpenSSL, as suggested, except we can't drop {LIB_,}PACKAGE from
secure/lib/libcrypto/{modules,engines}/Makefile.inc because
libcrypto/Makefile.inc isn't included in these subdirs.

Harbormaster completed remote builds in B66314: Diff 160520.Mon, Aug 18, 12:04 AM
des added a comment.Mon, Aug 18, 10:08 AM
In D51925#1187576, @ivy wrote:

address review feedback
for Kerberos, we can set PACKAGE in krb5/Makefile.inc as everything eventually
includes this, but set LIB_PACKAGE in krb5/{lib,util}/Makefile.inc to avoid
creating a kerberos-kdc-lib package.

for OpenSSL, as suggested, except we can't drop {LIB_,}PACKAGE from
secure/lib/libcrypto/{modules,engines}/Makefile.inc because
libcrypto/Makefile.inc isn't included in these subdirs.

I never asked you to move or drop any of the LIB_PACKAGE lines...

des accepted this revision.Mon, Aug 18, 10:09 AM
This revision is now accepted and ready to land.Mon, Aug 18, 10:09 AM
ivy added a comment.Mon, Aug 18, 3:49 PM
In D51925#1187710, @des wrote:

I never asked you to move or drop any of the LIB_PACKAGE lines...

no, but since i was cleaning up anyway i thought it was neater this way.

ivy updated this revision to Diff 160613.Tue, Aug 19, 4:24 PM

rebase, and also move compile_et (+ its awk scripts) to kerberos-dev

This revision now requires review to proceed.Tue, Aug 19, 4:24 PM
Harbormaster completed remote builds in B66348: Diff 160613.Tue, Aug 19, 4:24 PM

Revision Contents
Changeset List

PathSize
krb5/
include/
2 lines
2 lines
lib/
3 lines
libdata/
3 lines
util/
build-tools/
2 lines
et/
3 lines
profile/
3 lines
ss/
3 lines
support/
3 lines
verto/
3 lines
lib/
libcrypt/
2 lines
release/
packages/
4 lines
3 lines
ucl/
secure/
lib/
libcrypto/
3 lines
engines/
3 lines
modules/
3 lines
libssl/
3 lines
share/
mk/
53 lines

Diff 160411

View Options

krb5/include/Makefile

Loading...
View Options

krb5/include/Makefile.inc

Loading...
View Options

krb5/lib/Makefile.inc

Loading...
View Options

krb5/libdata/Makefile

Loading...
View Options

krb5/util/build-tools/Makefile

Loading...
View Options

krb5/util/et/Makefile

Loading...
View Options

krb5/util/profile/Makefile

Loading...
View Options

krb5/util/ss/Makefile

Loading...
View Options

krb5/util/support/Makefile

Loading...
View Options

krb5/util/verto/Makefile

Loading...
View Options

lib/libcrypt/Makefile

Loading...
View Options

release/packages/generate-ucl.lua

Loading...
View Options

release/packages/generate-ucl.sh

Loading...
View Options

release/packages/ucl/kerberos-lib-all.ucl

Loading...
View Options

release/packages/ucl/openssl-lib-all.ucl

Loading...
View Options

secure/lib/libcrypto/Makefile

Loading...
View Options

secure/lib/libcrypto/engines/Makefile.inc

Loading...
View Options

secure/lib/libcrypto/modules/Makefile.inc

Loading...
View Options

secure/lib/libssl/Makefile

Loading...
View Options

share/mk/bsd.lib.mk

Loading...