diff options
| -rw-r--r-- | repos/extra/librewolf/.checksum | 6 | ||||
| -rw-r--r-- | repos/extra/librewolf/abuild | 8 | ||||
| -rw-r--r-- | repos/extra/librewolf/depflags.patch | 17 | ||||
| -rw-r--r-- | repos/extra/librewolf/fix-rust-target.patch | 31 | ||||
| -rw-r--r-- | repos/extra/librewolf/libcxx18.patch | 18 | ||||
| -rw-r--r-- | repos/extra/librewolf/visibility.patch | 13 |
6 files changed, 43 insertions, 50 deletions
diff --git a/repos/extra/librewolf/.checksum b/repos/extra/librewolf/.checksum index fd7e8352..d668ad2c 100644 --- a/repos/extra/librewolf/.checksum +++ b/repos/extra/librewolf/.checksum @@ -1,3 +1,3 @@ -504da8aa33992b09a74d8ec262ec6c99752e64fb1d03441f86a49a21a874f95e fix-rust-target.patch -c07c4fec7680ab99dae4d2051a6c65ec4d8735ff4486a3ff187a96d9dfbeaa97 librewolf-142.0.1-1.source.tar.gz -30889a96df16927cca69826f3ca94b9f751819c2fcae07001a7108847ff25cb6 visibility.patch +960af1855b7b5760731ee37ee555c488433acee0da5865aa3d3c14cb04211737 depflags.patch +1a8b337a849c5020835735b37f741855655a837fa4b202fe40dd01957e0e5de4 libcxx18.patch +5107a6ea74fcc5bf5d13d30eff168da8d44a65b2479021d3d1cae60c575c9ffa librewolf-143.0-1.source.tar.gz diff --git a/repos/extra/librewolf/abuild b/repos/extra/librewolf/abuild index 3ad521ce..875ca3c9 100644 --- a/repos/extra/librewolf/abuild +++ b/repos/extra/librewolf/abuild @@ -1,12 +1,12 @@ name=librewolf -version=142.0.1.1 +version=143.0.1 _ver=${version%.*} _sion=${version##*.} _version=${_ver}-${_sion} release=1 source="https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${_version}/librewolf-${_version}.source.tar.gz - visibility.patch - fix-rust-target.patch" + libcxx18.patch + depflags.patch" build() { cat > mozconfig << EOF @@ -49,6 +49,8 @@ ac_add_options --disable-system-extension-dirs ac_add_options --disable-default-browser-agent ac_add_options --disable-backgroundtasks ac_add_options --disable-webspeech +ac_add_options --target=x86_64-unknown-linux-musl +ac_add_options --host=x86_64-unknown-linux-musl EOF if [ -f $SPM_PKGDB/libx11 ] && [ ! -f $SPM_PKGDB/wayland ]; then diff --git a/repos/extra/librewolf/depflags.patch b/repos/extra/librewolf/depflags.patch new file mode 100644 index 00000000..2e8b5359 --- /dev/null +++ b/repos/extra/librewolf/depflags.patch @@ -0,0 +1,17 @@ +having the depend cflags like -MF .deps/whatever in the +host flags just completely wrecks cc-rs ability to compile +anything, so like half the crates fail to build lol + +--- a/config/config.mk ++++ b/config/config.mk +@@ -180,8 +180,8 @@ COMPILE_CMMFLAGS = $(MOZ_LTO_CFLAGS) $(OS_COMPILE_CMMFLAGS) $(MOZBUILD_CMMFLAGS) + ASFLAGS = $(COMPUTED_ASFLAGS) + SFLAGS = $(COMPUTED_SFLAGS) + +-HOST_CFLAGS = $(COMPUTED_HOST_CFLAGS) $(_HOST_DEPEND_CFLAGS) +-HOST_CXXFLAGS = $(COMPUTED_HOST_CXXFLAGS) $(_HOST_DEPEND_CFLAGS) ++HOST_CFLAGS = $(COMPUTED_HOST_CFLAGS) ++HOST_CXXFLAGS = $(COMPUTED_HOST_CXXFLAGS) + HOST_C_LDFLAGS = $(COMPUTED_HOST_C_LDFLAGS) + HOST_CXX_LDFLAGS = $(COMPUTED_HOST_CXX_LDFLAGS) + diff --git a/repos/extra/librewolf/fix-rust-target.patch b/repos/extra/librewolf/fix-rust-target.patch deleted file mode 100644 index 9342063c..00000000 --- a/repos/extra/librewolf/fix-rust-target.patch +++ /dev/null @@ -1,31 +0,0 @@ -Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's -weird custom build system... - ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -225,7 +225,9 @@ - data.setdefault(key, []).append(namespace(rust_target=t, target=info)) - return data - -- -+@imports('os') -+@imports(_from='mozbuild.util', _import='ensure_unicode') -+@imports(_from='mozbuild.util', _import='system_encoding') - def detect_rustc_target( - host_or_target, compiler_info, arm_target, rust_supported_targets - ): -@@ -340,13 +342,13 @@ - - return None - -- rustc_target = find_candidate(candidates) -+ rustc_target = os.environ['RUST_TARGET'] - - if rustc_target is None: - die("Don't know how to translate {} for rustc".format(host_or_target.alias)) - -- return rustc_target -+ return ensure_unicode(rustc_target, system_encoding) - - - @imports('os') diff --git a/repos/extra/librewolf/libcxx18.patch b/repos/extra/librewolf/libcxx18.patch new file mode 100644 index 00000000..8dc03019 --- /dev/null +++ b/repos/extra/librewolf/libcxx18.patch @@ -0,0 +1,18 @@ +Patch-Source: https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-124-patches-04.tar.xz + +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -2454,10 +2454,10 @@ set_define("_LIBCPP_ALWAYS_INLINE", libcxx_override_visibility.empty) + set_define("_LIBCPP_HIDE_FROM_ABI", libcxx_override_visibility.hide_from_abi) + + +-@depends(target, build_environment) +-def visibility_flags(target, env): ++@depends(target, build_environment, c_compiler) ++def visibility_flags(target, env, c_compiler): + if target.os != "WINNT": +- if target.kernel in ("Darwin", "FreeBSD", "OpenBSD"): ++ if target.kernel in ("Darwin", "FreeBSD", "OpenBSD") or (c_compiler.type == "clang" and c_compiler.version >= "17.0.0"): + return ("-fvisibility=hidden", "-fvisibility-inlines-hidden") + return ( + "-I%s/system_wrappers" % os.path.join(env.dist), diff --git a/repos/extra/librewolf/visibility.patch b/repos/extra/librewolf/visibility.patch deleted file mode 100644 index 5084ae90..00000000 --- a/repos/extra/librewolf/visibility.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -2186,7 +2186,7 @@ --@depends(target, build_environment) -+@depends(target, c_compiler, build_environment) --def visibility_flags(target, env): -+def visibility_flags(target, c_compiler, env): - if target.os != "WINNT": -- if target.kernel == "Darwin": -+ if target.kernel == "Darwin" or c_compiler.type == "clang": - return ("-fvisibility=hidden", "-fvisibility-inlines-hidden") - return ( - "-I%s/system_wrappers" % os.path.join(env.dist), |