diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2024-01-18 02:02:37 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2024-01-18 02:57:13 +0000 |
| commit | 21a74b9aac80dc16a8b0392bb1cf9c410649c35c (patch) | |
| tree | 26448aa686585079e10bb42483de4650a8faddc4 /x11-toolkits | |
| parent | c721369988fc8a9c959a7dc64fa5060812ee5ebe (diff) | |
| download | ports-21a74b9aac80dc16a8b0392bb1cf9c410649c35c.tar.gz ports-21a74b9aac80dc16a8b0392bb1cf9c410649c35c.zip | |
x11-toolkits/wlroots: dedup *_DEPENDS in consumers
LIB_DEPENDS against a port with non-default USE_LDCONFIG can desync
RUN_DEPENDS and BUILD_DEPENDS, leading to incorrectly registered
dependencies when built in a dirty environment.
$ make install -C x11-toolkits/wlroots
$ make install -C x11-wm/hikari
$ pkg info -xr wlroots
wlroots-0.17.1:
hikari-2.3.3_4
wlroots015-0.15.1_2:
$ make run-depends-list -C x11-wm/hikari | fgrep wlroots
/usr/ports/main/x11-toolkits/wlroots015
$ make actual-package-depends -C x11-wm/hikari | fgrep wlroots
"wlroots": {origin: "x11-toolkits/wlroots", version: "0.17.1"}
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/wlroots015/override.mk | 4 | ||||
| -rw-r--r-- | x11-toolkits/wlroots016/override.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11-toolkits/wlroots015/override.mk b/x11-toolkits/wlroots015/override.mk index 556e497fa9e2..c94d1ab53853 100644 --- a/x11-toolkits/wlroots015/override.mk +++ b/x11-toolkits/wlroots015/override.mk @@ -1,7 +1,7 @@ WLR_SUFFIX= 015 +SOVERSION= 10 -BUILD_DEPENDS:= ${BUILD_DEPENDS:S/wlroots/&${WLR_SUFFIX}/g} -LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots$/&${WLR_SUFFIX}/} +LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots.so/&.${SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/} USES+= localbase # -isystem CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig" diff --git a/x11-toolkits/wlroots016/override.mk b/x11-toolkits/wlroots016/override.mk index 443008a3c69d..f690580b51dc 100644 --- a/x11-toolkits/wlroots016/override.mk +++ b/x11-toolkits/wlroots016/override.mk @@ -1,7 +1,7 @@ WLR_SUFFIX= 016 +SOVERSION= 11 -BUILD_DEPENDS:= ${BUILD_DEPENDS:S/wlroots/&${WLR_SUFFIX}/g} -LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots$/&${WLR_SUFFIX}/} +LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots.so/&.${SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/} USES+= localbase # -isystem CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig" |