blob: 2117b398b88159a92fedad3fed2ab979464807d9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
  | 
require 'formula'
class P11Kit < Formula
  homepage 'http://p11-glue.freedesktop.org'
  url 'http://p11-glue.freedesktop.org/releases/p11-kit-0.18.1.tar.gz'
  sha256 '6e87e72b7768288384de2ca1929b3cb45502e9e944fc075a8ce5df8f08f1ab29'
  option :universal
  depends_on 'pkg-config' => :build
  depends_on 'libtasn1'
  def patches; DATA; end
  def install
    ENV.universal_binary if build.universal?
    system "./configure", "--disable-debug",
                          "--disable-dependency-tracking",
                          "--prefix=#{prefix}",
                          "--without-trust-paths"
    system "make"
    system "make check"
    system "make install"
  end
end
__END__
diff --git a/configure.ac b/configure.ac
index b3c7610..6614ae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,7 +398,17 @@ echo $PACKAGE_VERSION | tr '.' ' ' | while read major minor unused; do
	break
 done
 
-eval SHLEXT=$shrext_cmds
+case "$host" in
+*-*-darwin*)
+	# It seems like libtool lies about this see:
+	# https://bugs.freedesktop.org/show_bug.cgi?id=57714
+	SHLEXT='.so'
+	;;
+*)
+	eval SHLEXT=$shrext_cmds
+	;;
+esac
+
 AC_DEFINE_UNQUOTED(SHLEXT, ["$SHLEXT"], [File extension for shared libraries])
 AC_SUBST(SHLEXT)
 
--- a/configure
+++ b/configure
@@ -17315,7 +17201,17 @@
        break
 done
-eval SHLEXT=$shrext_cmds
+case "$host" in
+*-*-darwin*)
+       # It seems like libtool lies about this see:
+       # https://bugs.freedesktop.org/show_bug.cgi?id=57714
+       SHLEXT='.so'
+       ;;
+*)
+       eval SHLEXT=$shrext_cmds
+       ;;
+esac
+
 cat >>confdefs.h <<_ACEOF
 #define SHLEXT "$SHLEXT"
--- p11-kit-0.18.1/common/library.c	2013-04-03 08:30:32.000000000 -0700
+++ p11-kit-0.18.1.new/common/library.c	2013-04-23 17:54:08.000000000 -0700
@@ -60,7 +60,7 @@
 p11_mutex_t p11_library_mutex;
 
 #ifdef OS_UNIX
-pthread_once_t p11_library_once;
+pthread_once_t p11_library_once = PTHREAD_ONCE_INIT;
 #endif
 
 static char *
  |