mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

x11-toolkits/wlroots: dedup *_DEPENDS in consumers

Browse Source 
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"}
This commit is contained in:
Jan Beich 2024-01-18 03:02:37 +01:00
parent c721369988
commit 21a74b9aac
14 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-toolkits/wlroots015/override.mk
View File

@ -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"

4
x11-toolkits/wlroots016/override.mk
View File

@ -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"

3
x11-wm/cage/Makefile
View File

@ -15,8 +15,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols \
wlroots>=0.16.0:x11-toolkits/wlroots
wayland-protocols>=1.14:graphics/wayland-protocols
LIB_DEPENDS= libwayland-server.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots \
libxkbcommon.so:x11/libxkbcommon

3
x11-wm/cagebreak/Makefile
View File

@ -11,8 +11,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols \
wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
wayland-protocols>=1.14:graphics/wayland-protocols
LIB_DEPENDS= libevdev.so:devel/libevdev \
libudev.so:devel/libudev-devd \
libwayland-server.so:graphics/wayland \

3
x11-wm/dwl/Makefile
View File

@ -15,8 +15,7 @@ LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.dwm
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>0:graphics/wayland-protocols \
wlroots>=0.17.0:x11-toolkits/wlroots
wayland-protocols>0:graphics/wayland-protocols
LIB_DEPENDS= libwayland-server.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots \
libinput.so:x11/libinput \

3
x11-wm/gamescope/Makefile
View File

@ -20,8 +20,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
vulkan-headers>0:graphics/vulkan-headers \
wayland-protocols>=1.17:graphics/wayland-protocols \
glm>0:math/glm \
hwdata>0:misc/hwdata \
wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
hwdata>0:misc/hwdata
LIB_DEPENDS= libdrm.so:graphics/libdrm \
libliftoff.so:graphics/libliftoff \
libvulkan.so:graphics/vulkan-loader \

3
x11-wm/hikari/Makefile
View File

@ -12,8 +12,7 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols \
wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots
wayland-protocols>=1.14:graphics/wayland-protocols
LIB_DEPENDS= libinput.so:x11/libinput \
libucl.so:textproc/libucl \
libwayland-server.so:graphics/wayland \

3
x11-wm/hyprland/Makefile
View File

@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= cmake:devel/cmake-core \
evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.25:graphics/wayland-protocols \
wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
wayland-protocols>=1.25:graphics/wayland-protocols
LIB_DEPENDS= libtomlplusplus.so:devel/tomlplusplus \
libdrm.so:graphics/libdrm \
libwayland-server.so:graphics/wayland \

3
x11-wm/labwc/Makefile
View File

@ -13,8 +13,7 @@ WWW= https://github.com/labwc/labwc
LICENSE= GPLv2
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>0:graphics/wayland-protocols \
wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
wayland-protocols>0:graphics/wayland-protocols
LIB_DEPENDS= libpng.so:graphics/png \
libwayland-server.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots \

3
x11-wm/phoc/Makefile
View File

@ -12,8 +12,7 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.15:graphics/wayland-protocols \
wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
wayland-protocols>=1.15:graphics/wayland-protocols
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libwayland-server.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots \

1
x11-wm/river/Makefile
View File

@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>0:graphics/wayland-protocols \
wlroots>=0.16.0:x11-toolkits/wlroots \
zig>=0.11.0:lang/zig
LIB_DEPENDS= libevdev.so:devel/libevdev \
libwayland-server.so:graphics/wayland \

3
x11-wm/sway-devel/Makefile
View File

@ -17,8 +17,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.24:graphics/wayland-protocols \
wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots
wayland-protocols>=1.24:graphics/wayland-protocols
LIB_DEPENDS= libjson-c.so:devel/json-c \
libevdev.so:devel/libevdev \
libudev.so:devel/libudev-devd \

3
x11-wm/sway/Makefile
View File

@ -18,8 +18,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.24:graphics/wayland-protocols \
wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
wayland-protocols>=1.24:graphics/wayland-protocols
LIB_DEPENDS= libjson-c.so:devel/json-c \
libevdev.so:devel/libevdev \
libudev.so:devel/libudev-devd \

3
x11-wm/wayfire/Makefile
View File

@ -20,8 +20,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wf-config>=0.8.0<0.9.0:devel/wf-config \
${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
wayland-protocols>=1.12:graphics/wayland-protocols \
glm>=0.9.8:math/glm \
wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
glm>=0.9.8:math/glm
LIB_DEPENDS= libevdev.so:devel/libevdev \
libinotify.so:devel/libinotify \
libwf-config.so:devel/wf-config \