rust: refactor build system #20686

1715173329 · 2023-03-19T06:27:25Z

Maintainer: @lu-zero
Compile tested: ipq807x/generic
Run tested: redmi-ax6

Description:
refactor the rust build system (added in #19863 )

These tarball cannot be reused, so simply drop them. Also move cargo config to a file instead of using echo command. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

They are for the target build which is not supported yet, drop them. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

lu-zero

Looks great! Thank you!

PolynomialDivision · 2023-03-19T09:59:03Z

Awesome! Thanks. I'm currently giving it a testbuild on my machine.

Besides those changes, what's the status of the plan to reuse the llvm openwrt toolchain? AFAIK, it is already shipped with the SDK. So build time would reduce even more.

lu-zero · 2023-03-19T10:26:55Z

this version is fetching the pre-built llvm from the rust-lang ci.

1715173329 · 2023-03-19T10:32:24Z

Besides those changes, what's the status of the plan to reuse the llvm openwrt toolchain? AFAIK, it is already shipped with the SDK. So build time would reduce even more.

There're some issues with llvm-bpf:

It's not defaultly enabled in buildroot
We need to enable more targets in LLVM_TARGETS_TO_BUILD (looks like it should go to toolchain)
Need to disable LLVM_ENABLE_ZSTD or rust will fail to lookup library.

trippleflux · 2023-03-19T12:41:19Z

@1715173329

Please add options/possibilities to self-built llvm, instead of pre-built one.

Still compiling for x86_64, will edit this message about the result.

1715173329 · 2023-03-19T12:51:54Z

The default configuration of llvm-bpf does not work for rust, I don't wanna add a broken option.
Given that you have to modify llvm-bpf manually, then just do it for rust again.

trippleflux · 2023-03-19T16:20:06Z

Based on yoctoproject rust Makefile, must-root is only valid for musl libc, while on glibc it's doesn't need it :

 config.set(host_section, "cxx", e(d.expand("${RUST_TARGET_CXX}")))
    config.set(host_section, "cc", e(d.expand("${RUST_TARGET_CC}")))
    config.set(host_section, "linker", e(d.expand("${RUST_TARGET_CCLD}")))
    if "musl" in host_section:
        config.set(host_section, "musl-root", e(d.expand("${STAGING_DIR_HOST}${exec_prefix}")))

    # If we don't do this rust-native will compile it's own llvm for BUILD.
    # [target.${BUILD_ARCH}-unknown-linux-gnu]
    build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS'))

So I proposing the following for OpenWrt Makefile :

$(if $(CONFIG_USE_MUSL),--set=target.$(RUSTC_TARGET_ARCH).musl-root=$(TOOLCHAIN_DIR) \)

Also regarding CONFIG_PKG_CC_STACKPROTECTOR_REGULAR & CONFIG_PKG_CC_STACKPROTECTOR_STRONG in glibc, the "-lssp_nonshared" seems cannot be found.

What do you think of the following for rust-values.mk :

ifeq ($(CONFIG_USE_MUSL),y)
  # Force linking of the SSP library
  ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR
    ifeq ($(strip $(PKG_SSP)),1)
      RUSTC_LDFLAGS += -lssp_nonshared
    endif
  endif
  ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
    ifeq ($(strip $(PKG_SSP)),1)
      TARGET_CFLAGS += -lssp_nonshared
    endif
  endif
endif

ifeq ($(CONFIG_USE_GLIBC),y)
  ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR
    ifeq ($(strip $(PKG_SSP)),1)
      TARGET_CFLAGS += --enable-stack-protector=yes
    endif
  endif
  ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
    ifeq ($(strip $(PKG_SSP)),1)
      TARGET_CFLAGS += --enable-stack-protector=strong
    endif
  endif
endif

lu-zero · 2023-03-19T16:27:05Z

--enable-stack-protector=strong doesn't seem something you'd pass to gcc, TARGET_CFLAGS is being used to make sure that the stand-alone ssp gets linked in. glibc should have it as part of itself.

trippleflux · 2023-03-19T17:52:47Z

Other finding, If I am enabled ccache, the HOSTCC will return as ccache then the Build/Compile/Cargo will failed, changing back CC=cc inside Build/Compile/Cargo will return successful rust app compilation.

1715173329 · 2023-03-19T17:56:17Z

Thanks for the test, it should be $(HOSTCC_NOCACHE).

1715173329 · 2023-03-19T18:06:29Z

So I proposing the following for OpenWrt Makefile :
$(if $(CONFIG_USE_MUSL),--set=target.$(RUSTC_TARGET_ARCH).musl-root=$(TOOLCHAIN_DIR) \)

Looks good to me.

ifeq ($(CONFIG_USE_GLIBC),y)
ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR
ifeq ($(strip $(PKG_SSP)),1)
TARGET_CFLAGS += --enable-stack-protector=yes
endif
endif
ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
ifeq ($(strip $(PKG_SSP)),1)
TARGET_CFLAGS += --enable-stack-protector=strong
endif
endif
endif

https://github.com/openwrt/openwrt/blob/c98e09f01bc6788644d22ffd02cd7aaaef63f5ea/toolchain/glibc/common.mk#L64-L65

Looks like it's enabled already?

oskarirauta · 2023-03-20T02:15:04Z

Seems like an improvement, I haven't tested yet; but looking at Makefile, it would seem that this fixes previous version's won't build if host and target are same arch. (x86_64 and x86_64 for example/most often).

I'll test later, but it looks like none of problems to build on a must host has not been fixed, so glibc hosts without changes only.

trippleflux · 2023-03-20T08:36:29Z

ifeq ($(CONFIG_USE_MUSL),y)

Force linking of the SSP library

ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR
ifeq ($(strip $(PKG_SSP)),1)
RUSTC_LDFLAGS += -lssp_nonshared
endif
endif
ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
ifeq ($(strip $(PKG_SSP)),1)
TARGET_CFLAGS += -lssp_nonshared
endif
endif
endif

Perhaps the force -lssp_nonshared linkage need to be enclosed as :

ifeq ($(CONFIG_USE_MUSL),y)
  # Force linking of the SSP library
  ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR
    ifeq ($(strip $(PKG_SSP)),1)
      RUSTC_LDFLAGS += -lssp_nonshared
    endif
  endif
  ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
    ifeq ($(strip $(PKG_SSP)),1)
      TARGET_CFLAGS += -lssp_nonshared
    endif
  endif
endif

Then left for glibc with nothing addition?.

Seems like an improvement, I haven't tested yet; but looking at Makefile, it would seem that this fixes previous version's won't build if host and target are same arch. (x86_64 and x86_64 for example/most often).

I'll test later, but it looks like none of problems to build on a must host has not been fixed, so glibc hosts without changes only.

For me when building for x86_64 on x86_64 the solution for current OpenWrt rust Makefile is :

define Host/PackageDist
	( \
		cd $(HOST_BUILD_DIR)/build/dist ; \
		$(TAR) -cJf $(DL_DIR)/$(RUST_INSTALL_TARGET_FILENAME) \
			rust-*-$(RUSTC_TARGET_ARCH).tar.xz ; \
		$(TAR) -cJf $(DL_DIR)/$(RUST_INSTALL_HOST_FILENAME) \
			*.xz ; \
	)
endef

Removing the "--exclude rust-*-$(RUSTC_TARGET_ARCH).tar.xz " & removing Force linking of the SSP library.

1715173329 · 2023-03-20T08:47:31Z

I just removed Host/PackageDist, seems useless at least for now

Added new RustBinPackage, RustBinHostBuild wrapper. Added new RUST_PKG_FEATURES flag. Moved CARGO_HOME to STAGING_DIR_HOSTPKG. Overrode default Build/Compile and Host/Compile to Cargo build. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

While at it, move maturin out of rust directory. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Fixed a build error: > unresolved import `time::macros` Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

llvm-bpf is not ready for generic usage, so use prebuilt llvm toolchain provided by the rust project to speedup build (~1hour faster). Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Don't set musl-specific options/ldflags when using glibc. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

oskarirauta · 2023-03-20T15:21:13Z

For me when building for x86_64 on x86_64 the solution for current OpenWrt rust Makefile is :

define Host/PackageDist
	( \
		cd $(HOST_BUILD_DIR)/build/dist ; \
		$(TAR) -cJf $(DL_DIR)/$(RUST_INSTALL_TARGET_FILENAME) \
			rust-*-$(RUSTC_TARGET_ARCH).tar.xz ; \
		$(TAR) -cJf $(DL_DIR)/$(RUST_INSTALL_HOST_FILENAME) \
			*.xz ; \
	)
endef

That didn't work for me.. I locally changed it to

        cd $(HOST_BUILD_DIR)/build/dist && \
          $(TAR) -cJf $(DL_DIR)/$(RUST_INSTALL_TARGET_FILENAME) \
          *.xz

That worked. I was looking that this refactored version fixes that issue.
Working version of rust for musl-host build with target_arch = host_arch is available here: https://github.com/oskarirauta/openwrt-rust/tree/main/lang/rust

esaaprillia · 2023-03-22T12:30:10Z

I still doubt rust will exist in openwrt

oskarirauta · 2023-03-22T17:10:40Z

I still doubt rust will exist in openwrt

May I ask why?

1715173329 · 2023-03-22T17:21:19Z

I'd say this guy just threw garbage everywhere, check his github activity

oskarirauta · 2023-03-22T17:33:56Z

@1715173329 no need, I'll take your word on it.

PolynomialDivision · 2023-03-23T10:37:08Z

@1715173329 I think you can merge? ;)

1715173329 · 2023-03-23T10:47:30Z

Sure, I will merge this tonight if there's no objection :-)

fuqiang03 · 2023-07-24T08:38:54Z

@1715173329

gcc12 glibc2.37 master
找不到解决的方法

1715173329 added 2 commits March 19, 2023 14:19

rust: remove useless tarball package

1772821

These tarball cannot be reused, so simply drop them. Also move cargo config to a file instead of using echo command. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

rust: remove useless target dependencies and configuration

391d02a

They are for the target build which is not supported yet, drop them. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

lu-zero approved these changes Mar 19, 2023

View reviewed changes

BKPepe requested a review from dangowrt March 19, 2023 12:03

1715173329 force-pushed the rustc branch from d2d2fe4 to e62faa4 Compare March 20, 2023 08:50

1715173329 added 6 commits March 20, 2023 16:52

rust: refactor build helper

8f04bcd

Added new RustBinPackage, RustBinHostBuild wrapper. Added new RUST_PKG_FEATURES flag. Moved CARGO_HOME to STAGING_DIR_HOSTPKG. Overrode default Build/Compile and Host/Compile to Cargo build. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

maturin: adapt new rust build standard

42606a6

While at it, move maturin out of rust directory. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

maturin: Update to 0.14.15

e3bfcce

Fixed a build error: > unresolved import `time::macros` Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

ripgrep: adapt new rust build standard

0733864

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

rust: enable use of prebuilt llvm toolchain

cd6cec0

llvm-bpf is not ready for generic usage, so use prebuilt llvm toolchain provided by the rust project to speedup build (~1hour faster). Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

rust: fix build with glibc

ee4a467

Don't set musl-specific options/ldflags when using glibc. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

1715173329 force-pushed the rustc branch from e62faa4 to ee4a467 Compare March 20, 2023 08:52

1715173329 marked this pull request as ready for review March 21, 2023 09:03

PolynomialDivision approved these changes Mar 22, 2023

View reviewed changes

1715173329 merged commit bb3082a into openwrt:master Mar 23, 2023

1715173329 deleted the rustc branch March 23, 2023 18:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rust: refactor build system #20686

rust: refactor build system #20686

1715173329 commented Mar 19, 2023 •

edited by BKPepe

Loading

lu-zero left a comment

PolynomialDivision commented Mar 19, 2023 •

edited

Loading

lu-zero commented Mar 19, 2023

1715173329 commented Mar 19, 2023

trippleflux commented Mar 19, 2023

1715173329 commented Mar 19, 2023

trippleflux commented Mar 19, 2023

lu-zero commented Mar 19, 2023

trippleflux commented Mar 19, 2023

1715173329 commented Mar 19, 2023

1715173329 commented Mar 19, 2023

oskarirauta commented Mar 20, 2023

trippleflux commented Mar 20, 2023 •

edited

Loading

Force linking of the SSP library

1715173329 commented Mar 20, 2023

oskarirauta commented Mar 20, 2023 •

edited

Loading

esaaprillia commented Mar 22, 2023

oskarirauta commented Mar 22, 2023

1715173329 commented Mar 22, 2023

oskarirauta commented Mar 22, 2023

PolynomialDivision commented Mar 23, 2023

1715173329 commented Mar 23, 2023

fuqiang03 commented Jul 24, 2023 •

edited

Loading

rust: refactor build system #20686

rust: refactor build system #20686

Conversation

1715173329 commented Mar 19, 2023 • edited by BKPepe Loading

lu-zero left a comment

Choose a reason for hiding this comment

PolynomialDivision commented Mar 19, 2023 • edited Loading

lu-zero commented Mar 19, 2023

1715173329 commented Mar 19, 2023

trippleflux commented Mar 19, 2023

1715173329 commented Mar 19, 2023

trippleflux commented Mar 19, 2023

lu-zero commented Mar 19, 2023

trippleflux commented Mar 19, 2023

1715173329 commented Mar 19, 2023

1715173329 commented Mar 19, 2023

oskarirauta commented Mar 20, 2023

trippleflux commented Mar 20, 2023 • edited Loading

Force linking of the SSP library

1715173329 commented Mar 20, 2023

oskarirauta commented Mar 20, 2023 • edited Loading

esaaprillia commented Mar 22, 2023

oskarirauta commented Mar 22, 2023

1715173329 commented Mar 22, 2023

oskarirauta commented Mar 22, 2023

PolynomialDivision commented Mar 23, 2023

1715173329 commented Mar 23, 2023

fuqiang03 commented Jul 24, 2023 • edited Loading

1715173329 commented Mar 19, 2023 •

edited by BKPepe

Loading

PolynomialDivision commented Mar 19, 2023 •

edited

Loading

trippleflux commented Mar 20, 2023 •

edited

Loading

oskarirauta commented Mar 20, 2023 •

edited

Loading

fuqiang03 commented Jul 24, 2023 •

edited

Loading