Skip to content

Commit

Permalink
mympd: fix build (#6277)
Browse files Browse the repository at this point in the history
* mympd: fix build
- build with CMake (disable ninja)
- mympd build was broken since CMAKE_USE_NINJA default value changed from 0 to 1 in #6002

* fix log output of meson build path
  • Loading branch information
hgy59 authored Oct 13, 2024
1 parent b5047cb commit 67526d6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions cross/mympd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ LICENSE = GPLv3
# myMPD was originally a fork of ympd, but it has evolved into a much more comprehensive MPD client.

CMAKE_USE_TOOLCHAIN_FILE = NO
CMAKE_USE_NINJA = 0

POST_INSTALL_TARGET = mympd_post_install

Expand Down
2 changes: 1 addition & 1 deletion mk/spksrc.cross-meson.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include ../../mk/spksrc.cross-ninja.mk
meson_configure_target:
@$(MSG) - Meson configure
@$(MSG) - Dependencies = $(DEPENDS)
@$(MSG) - Build path = $(WORK_DIR)/$(PKG_DIR)/$(MESON_BUILD_DIR)
@$(MSG) - Build path = $(MESON_BUILD_DIR)
@$(MSG) - Configure ARGS = $(CONFIGURE_ARGS)
@$(MSG) - Install prefix = $(INSTALL_PREFIX)
cd $(MESON_BASE_DIR) && env $(ENV) meson setup $(MESON_BUILD_DIR) -Dprefix=$(INSTALL_PREFIX) $(CONFIGURE_ARGS)
Expand Down
2 changes: 1 addition & 1 deletion mk/spksrc.native-meson.mk
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ include ../../mk/spksrc.common-rules.mk
meson_configure_target:
@$(MSG) - Meson configure
@$(MSG) - Dependencies = $(DEPENDS)
@$(MSG) - Build path = $(WORK_DIR)/$(PKG_DIR)/$(MESON_BUILD_DIR)
@$(MSG) - Build path = $(MESON_BUILD_DIR)
@$(MSG) - Configure ARGS = $(CONFIGURE_ARGS)
@$(MSG) - Install prefix = $(INSTALL_PREFIX)
cd $(WORK_DIR)/$(PKG_DIR) && env $(ENV) meson $(MESON_BUILD_DIR) -Dprefix=$(INSTALL_PREFIX) $(CONFIGURE_ARGS)
Expand Down

0 comments on commit 67526d6

Please sign in to comment.