Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports-gnome
 Path: blob/main/irc/hexchat/files/patch-meson.build
16134 views
1
--- meson.build.orig	2019-12-21 06:38:06 UTC

2
+++ meson.build

3
@@ -16,11 +16,21 @@ cc = meson.get_compiler('c')

4
 libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')

5
 libgmodule_dep = dependency('gmodule-2.0')

6
 global_deps = []

7
+libssl_dep_found = false

8
 if cc.get_id() == 'msvc'

9
   libssl_dep = cc.find_library('libeay32')

10
 else

11
   libssl_dep = dependency('openssl', version: '>= 0.9.8',

12
-                          required: get_option('with-ssl'))

13
+                          required: false)

14
+  if not libssl_dep.found()

15
+    libssl_dep = [

16
+        cc.find_library('ssl', required: get_option('with-ssl')),

17
+        cc.find_library('crypto', required: get_option('with-ssl'))

18
+    ]

19
+    libssl_dep_found = libssl_dep[0].found()

20
+  else

21
+    libssl_dep_found = libssl_dep.found()

22
+  endif

23
 endif

24
 

25
 config_h = configuration_data()

26
@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSIO

27
 config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr'))

28
 config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h'))

29
 

30
-if libssl_dep.found()

31
+if libssl_dep_found

32
   config_h.set('HAVE_X509_GET_SIGNATURE_NID',

33
     cc.has_function('X509_get_signature_nid', dependencies: libssl_dep)

34
   )

35
@@ -129,9 +139,6 @@ global_ldflags = []

36
 test_ldflags = [

37
   '-Wl,-z,relro',

38
   '-Wl,-z,now',

39
-  # mingw

40
-  '-Wl,--dynamicbase',

41
-  '-Wl,--nxcompat',

42
 ]

43
 foreach ldflag : test_ldflags

44
   if meson.version().version_compare('>= 0.46.0')

45


46