[pkgsrc/trunk]: pkgsrc/www Adjust configuration so that it builds on NetBSD/m...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www Adjust configuration so that it builds on NetBSD/m...
From: he <he%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 09:46:45 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5187b9ed7aa
branches:  trunk
changeset: 384052:e5187b9ed7aa
user:      he <he%pkgsrc.org@localhost>
date:      Thu Aug 16 11:49:13 2018 +0000

description:
Adjust configuration so that it builds on NetBSD/macppc as well.
We need to avoid the JIT javascript code, due to missing support,
and also the YARR_JIT code.  Remove special-casing of NetBSD/sparc*,
it should still build (untested).
Bump PKGREVISION.

diffstat:

 www/webkit24-gtk/Makefile                                             |   4 +-
 www/webkit24-gtk/distinfo                                             |   7 +-
 www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h              |  43 ++++-----
 www/webkit24-gtk/patches/patch-Source_autotools_SetupCompilerFlags.m4 |  18 ++++
 www/webkit24-gtk/patches/patch-configure                              |  34 ++++++-
 www/webkit24-gtk3/Makefile                                            |   4 +-
 6 files changed, 73 insertions(+), 37 deletions(-)

diffs (219 lines):

diff -r de181013bc79 -r e5187b9ed7aa www/webkit24-gtk/Makefile
--- a/www/webkit24-gtk/Makefile Thu Aug 16 11:46:24 2018 +0000
+++ b/www/webkit24-gtk/Makefile Thu Aug 16 11:49:13 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2018/07/20 03:33:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2018/08/16 11:49:13 he Exp $
 
-PKGREVISION= 15
+PKGREVISION= 16
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit24-gtk/}
diff -r de181013bc79 -r e5187b9ed7aa www/webkit24-gtk/distinfo
--- a/www/webkit24-gtk/distinfo Thu Aug 16 11:46:24 2018 +0000
+++ b/www/webkit24-gtk/distinfo Thu Aug 16 11:49:13 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/04/24 15:40:12 wiz Exp $
+$NetBSD: distinfo,v 1.7 2018/08/16 11:49:13 he Exp $
 
 SHA1 (webkitgtk-2.4.11.tar.xz) = e425ae86084ab6335dadb368c9e8f53600665d54
 RMD160 (webkitgtk-2.4.11.tar.xz) = e1f72498f911465f5ba152313dd9c62ae8d5eee6
@@ -13,13 +13,14 @@
 SHA1 (patch-Source_JavaScriptCore_runtime_VM.cpp) = ddc2a6edfc43df78b06e215412b2d1af1cf5777a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 1d7954be841df6b99934721706a9deafc69d250b
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 5eabed49099e03ddcf9c973ecca0508174a09ed6
 SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 3e00331ef4ea5dd71a07f0952da089ccd67a9e66
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9
+SHA1 (patch-Source_autotools_SetupCompilerFlags.m4) = 2802b09bc3bcb92a291f471cef4f3dbf6201a582
 SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
 SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f
 SHA1 (patch-aj) = d35a4b26e2104cdf7f3be81b020aabb4779dfaad
 SHA1 (patch-ak) = 477fd5c05abee8f47842a6ad5aba00e3e4628c45
 SHA1 (patch-am) = e0a350feb14d739010000e3887971bd535a647a7
-SHA1 (patch-configure) = 19f28160d9da63d98dac4eadbb30f5e8250ffcbe
+SHA1 (patch-configure) = 3556f360cd65572c60c68f90b4248b5bda9f5798
diff -r de181013bc79 -r e5187b9ed7aa www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h
--- a/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h  Thu Aug 16 11:46:24 2018 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h  Thu Aug 16 11:49:13 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.3 2017/04/24 15:40:12 wiz Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.4 2018/08/16 11:49:13 he Exp $
 
-Add support for sparc and sparc64, disable ASSEMBLER and YARR_JIT for now
+Add support for sparc and sparc64, disable ASSEMBLER for now.
+Turn off YARR_JIT if JIT is turned off.
 
 --- Source/WTF/wtf/Platform.h.orig     2016-04-10 06:48:36.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
@@ -31,25 +32,23 @@
      || CPU(MIPS64) \
      || CPU(PPC64) \
      || CPU(PPC64LE)
-@@ -824,7 +837,7 @@
- #define ENABLE_REGEXP_TRACING 0
- 
- /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
--#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP))
-+#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !CPU(SPARC64) && !CPU(SPARC)
- #define ENABLE_YARR_JIT 1
- 
- /* Setting this flag compares JIT results with interpreter results. */
-@@ -837,10 +850,12 @@
- #if defined(ENABLE_ASSEMBLER) && !ENABLE_ASSEMBLER
- #error "Cannot enable the JIT or RegExp JIT without enabling the Assembler"
- #else
-+#if !CPU(SPARC) && !CPU(SPARC64)
- #undef ENABLE_ASSEMBLER
- #define ENABLE_ASSEMBLER 1
+@@ -668,6 +681,7 @@
+ /* Disable the JITs if we're forcing the cloop to be enabled */
+ #if defined(ENABLE_LLINT_C_LOOP) && ENABLE_LLINT_C_LOOP
+ #define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
+ #define ENABLE_DFG_JIT 0
+ #define ENABLE_FTL_JIT 0
  #endif
+@@ -757,9 +771,11 @@
+ /* If the jit is not available, enable the LLInt C Loop: */
+ #if !ENABLE(JIT)
+ #undef ENABLE_LLINT        /* Undef so that we can redefine it. */
++#undef ENABLE_YARR_JIT     /* Undef so that we can redefine it. */
+ #undef ENABLE_LLINT_C_LOOP /* Undef so that we can redefine it. */
+ #undef ENABLE_DFG_JIT      /* Undef so that we can redefine it. */
+ #define ENABLE_LLINT 1
++#define ENABLE_YARR_JIT 0
+ #define ENABLE_LLINT_C_LOOP 1
+ #define ENABLE_DFG_JIT 0
  #endif
-+#endif
- 
- /* If the Disassembler is enabled, then the Assembler must be enabled as well: */
- #if ENABLE(DISASSEMBLER)
diff -r de181013bc79 -r e5187b9ed7aa www/webkit24-gtk/patches/patch-Source_autotools_SetupCompilerFlags.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_autotools_SetupCompilerFlags.m4     Thu Aug 16 11:49:13 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-Source_autotools_SetupCompilerFlags.m4,v 1.1 2018/08/16 11:49:13 he Exp $
+
+NetBSD doesn't have -latomic.
+
+--- Source/autotools/SetupCompilerFlags.m4.orig        2016-04-10 06:48:38.000000000 +0000
++++ Source/autotools/SetupCompilerFlags.m4
+@@ -69,6 +69,9 @@ int main() {
+ }
+ ]])], has_atomic=yes, has_atomic=no)
+ AC_LANG_POP([C++])
+-if test "$has_atomic" = "no"; then
+-   LIBS="$LIBS -latomic"
++if test "`(uname -s)`" != "NetBSD"; then
++   # no -latomic on NetBSD...
++   if test "$has_atomic" = "no"; then
++      LIBS="$LIBS -latomic"
++   fi
+ fi
diff -r de181013bc79 -r e5187b9ed7aa www/webkit24-gtk/patches/patch-configure
--- a/www/webkit24-gtk/patches/patch-configure  Thu Aug 16 11:46:24 2018 +0000
+++ b/www/webkit24-gtk/patches/patch-configure  Thu Aug 16 11:49:13 2018 +0000
@@ -1,8 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2015/07/12 00:37:47 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2018/08/16 11:49:13 he Exp $
+
+Adapt to 64-bit off_t.
+Workaround HP/UX 9 which writes to sscanf strings...
+Skip test for shm_open on OpenBSD and NetBSD.
+Don't have -latomic on NetBSD.
 
 --- configure.orig     2015-05-20 09:29:21.000000000 +0000
 +++ configure
-@@ -4709,7 +4709,7 @@ else
+@@ -4729,7 +4729,7 @@ else
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -11,7 +16,7 @@
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
-@@ -4755,7 +4755,7 @@ else
+@@ -4775,7 +4775,7 @@ else
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -20,7 +25,7 @@
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
-@@ -4779,7 +4779,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -4799,7 +4799,7 @@ rm -f core conftest.err conftest.$ac_obj
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -29,7 +34,7 @@
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
-@@ -4824,7 +4824,7 @@ else
+@@ -4844,7 +4844,7 @@ else
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -38,7 +43,7 @@
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
-@@ -4848,7 +4848,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -4868,7 +4868,7 @@ rm -f core conftest.err conftest.$ac_obj
      We can't simply define LARGE_OFF_T to be 9223372036854775807,
      since some C++ compilers masquerading as C compilers
      incorrectly reject 9223372036854775807.  */
@@ -47,7 +52,7 @@
    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
-@@ -17318,10 +17318,13 @@ int
+@@ -17991,10 +17991,13 @@ int
  main ()
  {
    unsigned int major, minor, micro;
@@ -62,7 +67,7 @@
       printf("%s, bad version string\n", "$min_glib_version");
       exit(1);
     }
-@@ -21217,7 +21220,7 @@ fi
+@@ -21890,7 +21893,7 @@ fi
  
  
      # On some Linux/Unix platforms, shm_* may only be available if linking against librt
@@ -71,3 +76,16 @@
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
  $as_echo_n "checking for library containing shm_open... " >&6; }
  if ${ac_cv_search_shm_open+:} false; then :
+@@ -22685,9 +22688,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++if test "`uname -s`" != "NetBSD"; then
++# no -latomic on NetBSD
+ if test "$has_atomic" = "no"; then
+    LIBS="$LIBS -latomic"
+ fi
++fi
+ 
+ # Configuration flags that are used throughout WebKitGTK+.
+ 
diff -r de181013bc79 -r e5187b9ed7aa www/webkit24-gtk3/Makefile
--- a/www/webkit24-gtk3/Makefile        Thu Aug 16 11:46:24 2018 +0000
+++ b/www/webkit24-gtk3/Makefile        Thu Aug 16 11:49:13 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2018/07/20 03:33:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2018/08/16 11:49:14 he Exp $
 
-PKGREVISION= 15
+PKGREVISION= 16
 .include "../../www/webkit24-gtk/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit24-gtk3/}
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note revision bump of www/webkit24-gtk3 and www/we...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated fonts/harfbuzz to 1.8.7
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note revision bump of www/webkit24-gtk3 and www/we...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated fonts/harfbuzz to 1.8.7
Indexes:
Home | Main Index | Thread Index | Old Index