Index: Makefile
===================================================================
--- Makefile (revision 124)
+++ Makefile (revision 125)
@@ -57,10 +57,12 @@
REQUIRES = app/sqlite/3.39.4.0
REQUIRES += libs/glib-networking/2.76.0
+REQUIRES += libs/gobject-introspection/1.76.1
REQUIRES += libs/brotli/1.0.9
REQUIRES += libs/libpsl/0.21.1
REQUIRES += net/nghttp2/1.43.0
REQUIRES += net/krb5/1.19.1
+REQUIRES += dev/vala/0.56.6
# ======= __END_OF_REQUIRES__ =======
@@ -83,9 +85,7 @@
cross_file = $(TARGET_BUILD_DIR)/$(TARGET)-cross
-vala-api-file = $(CURDIR)/vala-api/libsoup-3.0.vapi
-
####### Targets
PKG_GROUP = libs
@@ -181,7 +181,8 @@
extra_configure_switches += --default-library=shared
endif
-extra_configure_switches += -Dintrospection=disabled
+extra_configure_switches += -Dintrospection=enabled
+extra_configure_switches += -Dvapi=enabled
extra_configure_switches += -Dgssapi=enabled
extra_configure_switches += -Dbrotli=enabled
@@ -197,6 +198,12 @@
extra_configure_switches += -Ddoc_tests=false
+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_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
LDFLAGS += -Wl,-rpath,$(TARGET_LIB_RPATH)
@@ -237,7 +244,8 @@
@echo "strip = '$(STRIP)'" >> $(cross_file)
@echo "pkgconfig = 'pkg-config'" >> $(cross_file)
@echo "" >> $(cross_file)
- @meson setup \
+ @$(python_environment) \
+ meson setup \
--prefix=/usr \
--libdir=lib$(LIBSUFFIX) \
--libexecdir=/usr/libexec \
@@ -257,14 +265,14 @@
-Dtests=false \
$(extra_configure_switches) \
--cross-file=$(cross_file) $(SRC_DIR) $(build_dir)
- @cd $(build_dir) && ninja -v
+ @( cd $(build_dir) ; \
+ sed -i '/COMMAND = /s, /usr/bin/g-ir-scanner , $(python_environment) $(TARGET_DEST_DIR)/usr/bin/g-ir-scanner-wrapper ,g' build.ninja ; \
+ )
+ @( cd $(build_dir) ; env -i ninja -v )
@touch $@
$(install_target): $(build_target)
@cd $(build_dir) && $(env_sysroot) ninja install
- # ======= Install Vala API file =======
- @mkdir -p $(LIBSOUP_PKG)/usr/share/vala/vapi
- @cp -a $(vala-api-file) $(LIBSOUP_PKG)/usr/share/vala/vapi/
# ======= Install Documentation =======
@if [ -d $(LIBSOUP_PKG)/usr/share/man ]; then \
( cd $(LIBSOUP_PKG)/usr/share/man ; \