Skip to content

Commit

Permalink
try patching differently
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc-André Moreau committed Feb 6, 2024
1 parent b8a48e9 commit 432e0dd
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions recipes/openssh/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@ def source(self):
git.clone("https://github.com/Devolutions/openssh-distro")
git.checkout('openssh-update')
version_dir = 'v%s' % (self.version)
patches_dir = os.path.join("openssh-distro", "patches", version_dir)
patches_dir = os.path.join(os.getcwd(), "openssh-distro", "patches", version_dir)
if os.path.isdir(patches_dir):
for patch_file in sorted([f for f in os.listdir(patches_dir) if f.endswith('.patch')]):
patch_files = sorted([f for f in os.listdir(patches_dir) if f.endswith('.patch')])
os.chdir(self.name)
for patch_file in patch_files:
patch_path = os.path.join(patches_dir, patch_file)
tools.patch(base_path=folder, patch_file=patch_path)
git.run('am --whitespace=nowarn %s' % patch_file)
#tools.patch(base_path=folder, patch_file=patch_path)

def build(self):
cmake = CMake(self)
Expand Down

0 comments on commit 432e0dd

Please sign in to comment.