Index: Makefile
===================================================================
--- Makefile (revision 384)
+++ Makefile (revision 385)
@@ -9,7 +9,12 @@
COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5B)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5P)
+COMPONENT_TARGETS += $(HARDWARE_ROCK_5B)
COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_REPKA_PI3)
COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
COMPONENT_TARGETS += $(HARDWARE_POIN2)
COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
@@ -42,6 +47,7 @@
COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VISIONFIVE2)
COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
@@ -57,6 +63,8 @@
REQUIRES = X11/libs/gdk-pixbuf2/2.42.9
REQUIRES += app/fontconfig/2.13.95
REQUIRES += libs/libcroco/0.6.13
+REQUIRES += libs/gobject-introspection/1.76.1
+REQUIRES += dev/vala/0.56.6
REQUIRES += env/X11/pango/1.50.12
# ======= __END_OF_REQUIRES__ =======
@@ -128,9 +136,9 @@
extra_configure_switches += --mandir=/usr/share/man
extra_configure_switches += --disable-dependency-tracking
-extra_configure_switches += --enable-introspection=no
+extra_configure_switches += --enable-introspection=yes
extra_configure_switches += --enable-gtk-doc=no
-extra_configure_switches += --enable-vala=no
+extra_configure_switches += --enable-vala=yes
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
@@ -151,14 +159,20 @@
# ------------
# $ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
# $ source "$HOME/.cargo/env"
-# $ rustup update
-# $ mkdir $HOME/projects
-# $ ( cd $HOME/projects ; rustup override set stable )
#
# List available targets:
# ----------------------
# $ rustc --print target-list
#
+# Install toolchain and make them default:
+# ---------------------------------------
+#
+# $ rustup toolchain install 1.71.1
+# $ rustup default 1.71.1
+#
+# $ rustc --version
+# rustc 1.71.1 (eb26296b5 2023-08-03)
+#
# Add targets:
# -----------
# $ rustup target add arm-unknown-linux-gnueabihf
@@ -172,6 +186,10 @@
# $ rustup target add i686-unknown-linux-gnu
# $ rustup target add x86_64-unknown-linux-gnu
#
+# $ cargo install cbindgen
+#
+
+#
# Rust Target Triplets:
# ====================
#
@@ -182,7 +200,8 @@
rust-target = arm-unknown-linux-gnueabihf
endif
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_H5_GLIBC) $(TOOLCHAIN_RK33XX_GLIBC) \
- $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_S9XX_GLIBC) \
+ $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_RK358X_GLIBC) \
+ $(TOOLCHAIN_S9XX_GLIBC) \
$(TOOLCHAIN_A311X_GLIBC) $(TOOLCHAIN_M1000_GLIBC)),)
rust-target = aarch64-unknown-linux-gnu
endif
@@ -208,10 +227,18 @@
rust-target = x86_64-unknown-linux-gnu
endif
+cargo-executable = $(shell which cargo)
+
extra_configure_switches += RUST_TARGET=$(rust-target)
-extra_configure_switches += CARGO='cargo +stable-x86_64-unknown-linux-gnu --config $(cross_file)'
+extra_configure_switches += CARGO='$(cargo-executable) +1.71.1-x86_64-unknown-linux-gnu --config $(cross_file)'
+PYTHON3_VERSION = 3.10
+
+python_environment = PYTHON=$(PYTHON3)
+python_environment += PYTHONPATH='$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/gobject-introspection:$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/python$(PYTHON3_VERSION)/lib-dynload'
+
+
TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
@@ -234,20 +261,24 @@
@echo ' "-C", "link-args=--sysroot=$(TARGET_DEST_DIR) -Wl,-rpath,$(TARGET_BIN_RPATH)",' >> $(cross_file)
@echo ' "-L", "$(TARGET_DEST_DIR)/lib$(LIBSUFFIX)",' >> $(cross_file)
@echo ' "-L", "$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)",' >> $(cross_file)
- @echo ' "--cap-lints", "allow",' >> $(cross_file)
+ @echo ' "--cap-lints", "allow",' >> $(cross_file)
@echo ']' >> $(cross_file)
@cd $(build_dir) && \
- $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+ $(BUILD_ENVIRONMENT) $(python_environment) ../$(src_dir_name)/configure \
--prefix=/usr \
--build=$(BUILD) \
--host=$(TARGET) \
$(extra_configure_switches)
- @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+ # ======= Build targets separately =======
+ @( cd $(build_dir) ; \
+ $(MAKE) librsvg-2.la ; \
+ env -i $(MAKE) librsvg-2.0.vapi $(python_environment) VAPIGEN=/usr/bin/vapigen ; \
+ )
@touch $@
$(install_target): $(build_target)
@mkdir -p $(LIBRSVG_PKG)
- @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(python_environment) VAPIGEN=/usr/bin/vapigen $(env_sysroot)
# ======= Install Documentation =======
@if [ -d $(LIBRSVG_PKG)/usr/share/man ]; then \
( cd $(LIBRSVG_PKG)/usr/share/man ; \
Index: .
===================================================================
--- . (revision 384)
+++ . (revision 385)
Property changes on: .
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc