Radix cross Linux

The main Radix cross Linux repository contains the build scripts of packages, which have the most complete and common functionality for desktop machines

452 Commits   2 Branches   1 Tag
Index: Makefile
===================================================================
--- Makefile	(revision 144)
+++ Makefile	(revision 145)
@@ -391,40 +391,16 @@
 	@mkdir -p $(build_dir)
 	# ======= Build WebKitGtk =======
 	@( cd $(build_dir) ; \
-	   $(BUILD_ENVIRONMENT) $(python_environment) cmake -G 'Unix Makefiles' $(configure_switches) ../$(src_dir_name) ; \
+	   $(BUILD_ENVIRONMENT) $(python_environment) cmake -G Ninja $(configure_switches) ../$(src_dir_name) ; \
 	 )
-	# ======= Include cmakeconfig.h =======
 	@( cd $(build_dir) ; \
-	   for file in `find . -type f -name 'flags.make' -print` ; do \
-	     sed -i 's,^C_INCLUDES =,C_INCLUDES = -I$(CURDIR)/$(build_dir),'     $${file} ; \
-	     sed -i 's,^CXX_INCLUDES =,CXX_INCLUDES = -I$(CURDIR)/$(build_dir),' $${file} ; \
-	   done ; \
+	   sed -i '/COMMAND = .*g-ir-scanner/s, env CC=[^ ]*, env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(python_environment) CC="$(CCACHE)$(CROSS_PREFIX)gcc",g' build.ninja ; \
 	 )
-	# ======= Python3 environment for g-ir-scanner =======
 	@( cd $(build_dir) ; \
-	   for file in `find . -type f -name 'build.make' -print` ; do \
-	     sed -i '/[ ][^ ]*g-ir-scanner[^ ]*/s,\([ ][^ ]*g-ir-scanner[^ ]*\), $(python_environment) \1,g' $${file} ; \
-	   done ; \
-	 )
-	# ======= PKG_CONFIG_PATH to find libsoup3 for *.gir files =======
-	@( cd $(build_dir) ; \
-	   for file in `find . -type f -name 'build.make' -print` ; do \
-	     sed -i 's, env CC=[^ ]*, env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) CC="$(CCACHE)$(CROSS_PREFIX)gcc",g' $${file} ; \
-	   done ; \
-	 )
-	# ======= Use CCACHE for CC and CXX compilers =======
-	@( cd $(build_dir) ; \
-	   for file in `find . -type f -name 'build.make' -print` ; do \
-	     sed -i 's,&& $(CROSS_PREFIX)gcc,&& $(CCACHE)$(CROSS_PREFIX)gcc",g' $${file} ; \
-	     sed -i 's,&& $(CROSS_PREFIX)g++,&& $(CCACHE)$(CROSS_PREFIX)g++",g' $${file} ; \
-	   done ; \
-	 )
-	# ======= Use make instead of $$(MAKE) for non parallel build =======
-	@( cd $(build_dir) ; \
 	   env -i CCACHE_BASEDIR=$(CCACHE_BASEDIR) \
 	          CCACHE_DIR=$(CCACHE_DIR)         \
 	          CCACHE_UMASK=$(CCACHE_UMASK)     \
-	          make ; \
+	          ninja -j1 ; \
 	 )
 	@touch $@
 
@@ -431,7 +407,11 @@
 $(install_target): $(build_target)
 	@mkdir -p $(WEBKITGTK_PKG)
 	# ======= Install WebKitGtk =======
-	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) install $(env_sysroot)
+	@cd $(build_dir) && $(env_sysroot) ninja -j1 install
+	# ======= Link MiniBrowser =======
+	@( cd $(WEBKITGTK_PKG)/usr/bin ; \
+	   ln -sf ../libexec/webkitgtk-6.0/MiniBrowser . ; \
+	 )
 	# ======= Install Documentation =======
 	@if [ -d $(WEBKITGTK_PKG)/usr/share/man ]; then \
 	  ( cd $(WEBKITGTK_PKG)/usr/share/man ; \