diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-10-26 01:08:27 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-10-26 22:06:25 -0400 |
| commit | 2427904c29e52f4e3c6b249bc228219c0648d1ad (patch) | |
| tree | 7f8609e91b6fccb2d312648be8c80fd08705e0a0 /libre/iceweasel | |
| parent | 61a58d1c70ea5d6fb627bf8e9271e1801cfddc20 (diff) | |
[icecat][iceweasel]: housekeeping
Diffstat (limited to 'libre/iceweasel')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index bb2a7bf77..261e0c84b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -86,12 +86,6 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb ) makedepends+=(python-setuptools python-zstandard python-typing-extensions quilt libxslt imagemagick git jq python-jsonschema) -makedepends+=( python-pydantic=1.9.2 ) # configure error: "pydantic 1.10.2 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not)" -[[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler -[[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin -[[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) -[[ "${CARCH}" == 'i686' ]] && makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0 ) # dustbin -[[ "${CARCH}" == 'i686' ]] && makedepends+=( llvm13 ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -113,11 +107,11 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.bra vendor.js.in zstandard-0.18.0.diff) source_armv7h=(build-arm-libopus.patch) -source_i686=('avoid-libxul-OOM-python-check.patch' - 'rust-static-disable-network-test-on-static-libraries.patch' - 'firefox-106.0.1-fdlibm.patch' - 'simd_avx2.patch' - 'fix-i686-build-moz-1792159.patch') +source_i686=(avoid-libxul-OOM-python-check.patch + rust-static-disable-network-test-on-static-libraries.patch + firefox-106.0.1-fdlibm.patch + simd_avx2.patch + fix-i686-build-moz-1792159.patch) sha256sums=('fb1ed65cd9e6698122885fe38984cfd00018c7a837109f511762b2986b391e25' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') @@ -153,9 +147,28 @@ validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger # _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a # anti-feature +## global tweaks and transient hacks ## + # disable PGO for 32-bit arches _should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely) -[[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] || _should_skip_pgo=1 + +# makedepends+=( python-pydantic=1.9.2 ) # configure error: "pydantic 1.10.2 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not)" + +case "${CARCH}" in +armv7h) + _should_skip_pgo=1 + + makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler + ;; +i686) + _should_skip_pgo=1 + + makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin + makedepends=( ${makedepends[*]/wasi-libc++*/} ) + makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0 ) # dustbin + makedepends+=( llvm13 ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory + ;; +esac ## helpers ## |