openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-02 16:01:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

ruby: fix build on macos

Browse Source 
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 <sergey@lobanov.in>
This commit is contained in:
Sergey V. Lobanov 2022-02-06 23:39:39 +03:00 committed by Beginner-Go
parent a537f137e3
commit c93e0ef3c8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/ruby/Makefile
View File

@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ruby PKG_NAME:=ruby
PKG_VERSION:=3.0.3 PKG_VERSION:=3.0.3
PKG_RELEASE:=1 PKG_RELEASE:=2
# First two numbes # First two numbes
PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION)))) 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 JIT does work but it is not worth it
HOST_CONFIGURE_ARGS += --disable-jit-support 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) TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)
# Ruby uses DLDFLAGS and not LDFLAGS for libraries. LDFLAGS is only for execs. # Ruby uses DLDFLAGS and not LDFLAGS for libraries. LDFLAGS is only for execs.
@ -221,7 +227,7 @@ endef
# nothing to do # nothing to do
define Package/ruby-stdlib/install define Package/ruby-stdlib/install
/bin/true true
endef endef
define Package/ruby-abbrev/files define Package/ruby-abbrev/files