From c55092396ef9013391afbf5c5e27abe5c9c3eae2 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Sun, 6 Feb 2022 23:39:39 +0300 Subject: [PATCH] ruby: fix build on macos 1. ruby/host build fails on macos due to Apple ld generates warning if a folder from LDFLAGS is not exist. configure script catches this warning and fails. This patch disables ld warnings for macos 2. ruby build fails on macos due /bin/true is not exist on macos. This patch replaces /bin/true with true in OpenWrt Makefile Signed-off-by: Sergey V. Lobanov --- lang/ruby/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 500bb16325..2329c591e4 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby PKG_VERSION:=3.0.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 # First two numbes PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION)))) @@ -78,6 +78,12 @@ CONFIGURE_ARGS += --disable-jit-support # Host JIT does work but it is not worth it HOST_CONFIGURE_ARGS += --disable-jit-support +# Apple ld generates warning if LD_FLAGS var includes path to lib that is not +# exist (e.g. -L$(STAGING_DIR)/host/lib). configure script fails if ld generates +# any output +HOST_LDFLAGS += \ + $(if $(CONFIG_HOST_OS_MACOS),-Wl$(comma)-w) + TARGET_LDFLAGS += -L$(PKG_BUILD_DIR) # Ruby uses DLDFLAGS and not LDFLAGS for libraries. LDFLAGS is only for execs. @@ -221,7 +227,7 @@ endef # nothing to do define Package/ruby-stdlib/install - /bin/true + true endef define Package/ruby-abbrev/files