move patch to conanfile, it needs to be optional

conan-io · Nov 17, 2022 · 270ecd1 · 270ecd1
1 parent 4f32af7
commit 270ecd1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/recipes/krb5/all/conandata.yml b/recipes/krb5/all/conandata.yml
@@ -5,5 +5,4 @@ sources:
 patches:
   "1.18.2":
     - patch_file: "patches/1.18.2-0001-use-PKG_CHECK_MODULES-for-openssl.patch"
-    - patch_file: "patches/1.18.2-0002-avoid-conflicting-symbols.patch"
     - patch_file: "patches/1.18.2-0003-no-html+tests.patch"
diff --git a/recipes/krb5/all/conanfile.py b/recipes/krb5/all/conanfile.py
@@ -164,6 +164,28 @@ def _build_msvc(self):
                 self.run("nmake {}".format(" ".join(self._nmake_args)), run_environment=True, win_bash=tools.os_info.is_windows)
 
     def build(self):
+        if not self.options.shared:
+            with chdir(self, os.path.join(self.source_folder,"src", "kadmin", "dbutil")):
+                replace_in_file(self, "kdb5_util.c",
+                                "krb5_keyblock master_keyblock;",
+                                "extern krb5_keyblock master_keyblock;")
+            with chdir(self, os.path.join(self.source_folder,"src", "tests", "create")):                    
+                replace_in_file(self, "kdb5_mkdums.c",
+                                "krb5_keyblock master_keyblock;",
+                                "extern krb5_keyblock master_keyblock;")
+                replace_in_file(self, "kdb5_mkdums.c",
+                                "krb5_principal master_princ;",
+                                "static krb5_principal master_princ;")
+                replace_in_file(self, "kdb5_mkdums.c",
+                                "krb5_pointer master_random;",
+                                "static krb5_pointer master_random;")                                                
+            with chdir(self, os.path.join(self.source_folder,"src", "tests", "verify")):
+                replace_in_file(self, "kdb5_verify.c",
+                                "krb5_keyblock master_keyblock;",
+                                "extern krb5_keyblock master_keyblock;")
+                replace_in_file(self, "kdb5_verify.c",
+                                "krb5_principal master_princ;",
+                                "static krb5_principal master_princ;")                                                    
         apply_conandata_patches(self)
         if is_msvc(self):
             self._build_msvc()