Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / webkit2gtk


Commits:
0144a3a0 by Jan Alexander Steffens (heftig) at 2024-10-11T08:26:55+02:00
2.46.1-4: Use clang

See: 
https://gitlab.archlinux.org/archlinux/packaging/packages/webkitgtk-6.0/-/issues/4

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = webkit2gtk
        pkgdesc = Web content engine for GTK
        pkgver = 2.46.1
-       pkgrel = 3
+       pkgrel = 4
        url = https://webkitgtk.org
        arch = x86_64
        license = AFL-2.0 OR GPL-2.0-or-later
@@ -28,12 +28,14 @@ pkgbase = webkit2gtk
        license = OFL-1.1
        license = SunPro
        license = Unicode-TOU
+       makedepends = clang
        makedepends = cmake
        makedepends = gi-docgen
        makedepends = glib2-devel
        makedepends = gobject-introspection
        makedepends = gperf
        makedepends = gst-plugins-bad
+       makedepends = lld
        makedepends = ninja
        makedepends = python
        makedepends = ruby


=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@ pkgname=(
   webkit2gtk-docs
 )
 pkgver=2.46.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Web content engine for GTK"
 url="https://webkitgtk.org";
 arch=(x86_64)
@@ -89,12 +89,14 @@ depends=(
   zlib
 )
 makedepends=(
+  clang
   cmake
   gi-docgen
   glib2-devel
   gobject-introspection
   gperf
   gst-plugins-bad
+  lld
   ninja
   python
   ruby
@@ -135,15 +137,19 @@ build() {
     -DENABLE_MINIBROWSER=ON
   )
 
+  # Upstream prefers Clang
+  # 
https://gitlab.archlinux.org/archlinux/packaging/packages/webkitgtk-6.0/-/issues/4
+  export CC=clang CXX=clang++
+  LDFLAGS+=" -fuse-ld=lld"
+
+  # Skia uses malloc_usable_size
+  CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+  CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+
   # JITted code crashes when CET is used
   CFLAGS+=' -fcf-protection=none'
   CXXFLAGS+=' -fcf-protection=none'
 
-  # Produce minimal debug info: 4.3 GB of debug data makes the
-  # build too slow and is too much to package for debuginfod
-  CFLAGS+=' -g1'
-  CXXFLAGS+=' -g1'
-
   cmake -S webkitgtk-$pkgver -B build -G Ninja "${cmake_options[@]}"
   cmake --build build
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/webkit2gtk/-/commit/0144a3a056458610bcb2d91558de0f95cd57621c

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/webkit2gtk/-/commit/0144a3a056458610bcb2d91558de0f95cd57621c
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to