librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

first aarch64 build

Browse source
This commit is contained in:
Bert van der Weerd 2022-10-27 13:14:46 +02:00
parent ea17dc287c
commit 3f4175dcc0
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flatpak/Makefile
View file

@ -7,10 +7,11 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
mozbuild=~/.mozbuild mozbuild=~/.mozbuild
# if arch not passed on commandline, default to x86_64 # if arch not passed on commandline, default to x86_64
ifeq ($(arch),aarch64) ifneq ($(arch),x86_64)
else ifneq ($(arch),aarch64)
arch=x86_64 arch=x86_64
endif endif
endif
docker_image_name=lw-linux-flatpak-$(arch) docker_image_name=lw-linux-flatpak-$(arch)
@ -54,6 +55,9 @@ veryclean : clean
rm -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" rm -f "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz" "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum"
rm -f version source_release rm -f version source_release
pre-build : pre-build :
./assets/pre_build_patches_mozconfig.sh ./assets/pre_build_patches_mozconfig.sh
@ -67,7 +71,7 @@ package : dir
cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null ) cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null )
post-package : post-package :
cp -v librewolf-$(full_version)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(full_version).en-US.linux-x86_64.tar.bz2 . 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 : artifacts :
@ -76,8 +80,8 @@ artifacts :
dir : librewolf-$(full_version)
dir : librewolf-$(full_version)
librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
rm -rf $@ rm -rf $@
@ -88,6 +92,10 @@ librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
# (cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch) # (cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch)
# (cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch) # (cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch)
docker-build : docker-build :
docker build -t $(docker_image_name) - < assets/Dockerfile docker build -t $(docker_image_name) - < assets/Dockerfile
@ -97,10 +105,22 @@ docker-run :
docker-clean : docker-clean :
docker rmi $(docker_image_name) docker rmi $(docker_image_name)
bootstrap : dir bootstrap : dir
rustup target add aarch64-unknown-linux-gnu
( export t=$$(pwd)/librewolf-$(full_version) && \
cd $(mozbuild) && \
$$t/mach artifact toolchain --from-build sysroot-aarch64-linux-gnu && \
$$t/mach artifact toolchain --from-build linux64-binutils && \
$$t/mach artifact toolchain --from-build linux64-cctools-port && \
true )
(cd librewolf-$(full_version) && ./mach --no-interactive bootstrap --application-choice=browser) (cd librewolf-$(full_version) && ./mach --no-interactive bootstrap --application-choice=browser)
setup-debian : setup-debian :
apt-get -y install mercurial python3 python3-dev python3-pip curl wget dpkg-sig libssl-dev zstd apt-get -y install mercurial python3 python3-dev python3-pip curl wget dpkg-sig libssl-dev zstd

12
flatpak/assets/mozconfig.aarch64
View file

@ -1,19 +1,11 @@
ac_add_options --target=aarch64-pc-linux-gnu
ac_add_options --target=aarch64-linux-gnu ac_add_options --enable-linker=lld
ac_add_options --enable-bootstrap ac_add_options --enable-bootstrap
# taken from manjaro build:
ac_add_options --enable-optimize="-g0 -O2"
export AR=llvm-ar
export NM=llvm-nm
export RANLIB=llvm-ranlib
# --- # ---
# We should fix this one..
#ac_add_options --without-wasm-sandboxed-libraries
# #
# Librewolf specific settings # Librewolf specific settings

7
flatpak/assets/mozconfig.x86_64
View file

@ -1,12 +1,7 @@
#ac_add_options --target=aarch64-linux-gnu ac_add_options --target=x86_64-pc-linux-gnu
ac_add_options --target=x86_64-linux-gnu
ac_add_options --enable-bootstrap ac_add_options --enable-bootstrap
# We should fix this one..
#ac_add_options --without-wasm-sandboxed-libraries
# #
# Librewolf specific settings # Librewolf specific settings
# #