From ea5f0e7c18f2a166ec8ca512a4e7d2562a65d4f0 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 28 Oct 2022 22:00:08 +0200 Subject: [PATCH] Fri 28 Oct 2022 10:00:08 PM CEST --- lw-linux-base/Makefile | 7 ++++--- lw-linux-base/assets/pre_build_patches_mozconfig.sh | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lw-linux-base/Makefile b/lw-linux-base/Makefile index 47aaee3..0210e50 100644 --- a/lw-linux-base/Makefile +++ b/lw-linux-base/Makefile @@ -6,6 +6,7 @@ source_release:=$(shell cat source_release) full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") mozbuild=~/.mozbuild +assets=assets/linux-base ifeq ($(target_type),) target_type:=flatpak endif @@ -77,8 +78,8 @@ veryclean : clean # this is the place to apply patches and create a custom mozconfig pre-build : - cp -v assets/mozconfig.$(arch) librewolf-$(full_version)/mozconfig - ./assets/pre_build_patches_mozconfig.sh + cp -v $(assets)/mozconfig.$(arch) librewolf-$(full_version)/mozconfig + ./$(assets)/pre_build_patches_mozconfig.sh build : dir (cd librewolf-$(full_version) && ./mach build) @@ -91,7 +92,7 @@ package : dir post-package : cp -v librewolf-$(full_version)/obj-$(arch)-pc-linux-gnu/dist/librewolf-$(full_version).en-US.linux-$(arch).tar.bz2 . - ./assets/post_package_distini_etc.sh + ./$(assets)/post_package_distini_etc.sh artifacts : ${MAKE} -f assets/$(target_type)/artifacts.mk artifacts diff --git a/lw-linux-base/assets/pre_build_patches_mozconfig.sh b/lw-linux-base/assets/pre_build_patches_mozconfig.sh index ebca54a..8dec0fb 100755 --- a/lw-linux-base/assets/pre_build_patches_mozconfig.sh +++ b/lw-linux-base/assets/pre_build_patches_mozconfig.sh @@ -31,12 +31,12 @@ fi cd librewolf-$full_version # hopefully the magic sauce that makes things build on 18.04 and later on work "everywhere" -patch -Np1 -i ../assets/deb_patches/armhf-reduce-linker-memory-use.patch -patch -Np1 -i ../assets/deb_patches/reduce-rust-debuginfo.patch -patch -Np1 -i ../assets/deb_patches/use-system-icupkg.patch +patch -Np1 -i ../assets/linux-base//deb_patches/armhf-reduce-linker-memory-use.patch +patch -Np1 -i ../assets/linux-base//deb_patches/reduce-rust-debuginfo.patch +patch -Np1 -i ../assets/linux-base//deb_patches/use-system-icupkg.patch # might make the build just a tiny bit cleaner, not really required though -patch -Np1 -i ../assets/deb_patches/fix-wayland-build.patch +patch -Np1 -i ../assets/linux-base//deb_patches/fix-wayland-build.patch cd ..