[gtk-osx] Patch gnutls to remove -Wl,no_weak_imports from LDFLAGS.



commit e848933567245a7c6cf4a746ebeb2c7f68f08c11
Author: John Ralls <jralls ceridwen us>
Date:   Tue Apr 14 09:56:20 2020 -0700

    Patch gnutls to remove -Wl,no_weak_imports from LDFLAGS.
    
    Breaks build with Xcode 11.4, see http://ww.openradar.appspot.com/FB7647406.

 modulesets-stable/gtk-osx-network.modules   |  4 +++-
 modulesets-unstable/gtk-osx-network.modules |  4 +++-
 modulesets/gtk-osx-network.modules          |  4 +++-
 patches/gnutls-yes-weak-imports.patch       | 20 ++++++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 83a1f7c..95e945a 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -72,7 +72,9 @@
              autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <branch repo="gnutls" version="3.6.12"
             hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz"/>
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index e8c623f..5edb43e 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -81,7 +81,9 @@
              autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <branch repo="gnutls" version="3.6.12"
             hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz"/>
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index df6bc4c..31c149e 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -81,7 +81,9 @@
     <!--branch repo="gitlab" module="gnutls/gnutls"/-->
     <branch repo="gnutls" version="3.6.12"
             hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz"/>
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz">
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
diff --git a/patches/gnutls-yes-weak-imports.patch b/patches/gnutls-yes-weak-imports.patch
new file mode 100644
index 0000000..65b1614
--- /dev/null
+++ b/patches/gnutls-yes-weak-imports.patch
@@ -0,0 +1,20 @@
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.15-x86_64/src/gnutls-3.6.12/configure.ac\~ 
/Users/john/Development/gtk-build/gtk-stable-10.15-x86_64/src/gnutls-3.6.12/configure.ac
+--- a/configure.ac     2020-01-31 15:14:22.000000000 -0800
++++ b/configure.ac     2020-04-14 09:36:10.000000000 -0700
+@@ -122,14 +122,6 @@
+   ;;
+   *darwin*)
+     have_macosx=yes
+-    save_LDFLAGS="$LDFLAGS"
+-    dnl Try to use -no_weak_imports if available. This makes sure we
+-    dnl error out when linking to a function that doesn't exist in the
+-    dnl intended minimum runtime version.
+-    LDFLAGS="$LDFLAGS -Wl,-no_weak_imports"
+-    AC_MSG_CHECKING([whether the linker supports -Wl,-no_weak_imports])
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+-      [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); LDFLAGS="$save_LDFLAGS"])
+   ;;
+   *solaris*)
+     have_elf=yes
+
+Diff finished.  Tue Apr 14 09:48:42 2020


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]