< sthen> ld.lld: error: 
/pobj/webkitgtk4-2.28.4/build-i386/lib/libjavascriptcoregtk-4.0.so: undefined 
reference to WTF::Optional<unsigned long> JSC::parse<unsigned long>(char const*)

cwen did hit this too on powerpc when it was switched to clang,
I propose to extend the workaround to all archs.  Disclaimer: diff not
tested on i386, no build regression on amd64.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.125
diff -u -p -r1.125 Makefile
--- Makefile    7 Aug 2020 14:30:10 -0000       1.125
+++ Makefile    8 Aug 2020 21:09:58 -0000
@@ -16,7 +16,7 @@ COMMENT =             GTK+ port of the WebKit rende
 V =                    2.28.4
 DISTNAME =             webkitgtk-${V}
 PKGNAME =              webkitgtk4-${V}
-REVISION =             0
+REVISION =             1
 EXTRACT_SUFX =         .tar.xz
 API =                  4.0
 SUBST_VARS =           API
Index: patches/patch-Source_JavaScriptCore_runtime_Options_cpp
===================================================================
RCS file: 
/cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_Options_cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Source_JavaScriptCore_runtime_Options_cpp
--- patches/patch-Source_JavaScriptCore_runtime_Options_cpp     18 Apr 2020 
16:14:28 -0000      1.3
+++ patches/patch-Source_JavaScriptCore_runtime_Options_cpp     8 Aug 2020 
21:09:58 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Source_JavaScriptCore_runtime_Options_cpp,v 1.3 2020/04/18 
16:14:28 cwen Exp $
 
-powerpc fix for:
+powerpc and i386 fix for:
 undefined reference to `WTF::Optional<unsigned long>
 JSC::parse<unsigned long>(char const*)'
 
@@ -12,7 +12,7 @@ Index: Source/JavaScriptCore/runtime/Opt
  }
  
 -#if CPU(ADDRESS64) || OS(DARWIN)
-+#if CPU(ADDRESS64) || OS(DARWIN) || ( defined(__OpenBSD__) && 
defined(__powerpc__) )
++#if CPU(ADDRESS64) || OS(DARWIN) || OS(OPENBSD)
  template<>
  Optional<OptionsStorage::Size> parse(const char* string)
  {
@@ -21,7 +21,7 @@ Index: Source/JavaScriptCore/runtime/Opt
      return WTF::nullopt;
  }
 -#endif // CPU(ADDRESS64) || OS(DARWIN)
-+#endif // CPU(ADDRESS64) || OS(DARWIN) || ( defined(__OpenBSD__) && 
defined(__powerpc__) )
++#endif // CPU(ADDRESS64) || OS(DARWIN) || OS(OPENBSD)
  
  template<>
  Optional<OptionsStorage::Double> parse(const char* string)


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to