From 9a453b2e7418aa5d307ed99d65d8bf9e8570955a Mon Sep 17 00:00:00 2001
From: AMD Toolchain Support
 <73240730+amd-toolchain-support@users.noreply.github.com>
Date: Wed, 31 Mar 2021 16:52:04 +0530
Subject: [PATCH] adding AOCC support for CP2K 7.1 (#22641)

---
 var/spack/repos/builtin/packages/cp2k/package.py  |  1 +
 var/spack/repos/builtin/packages/libxc/package.py | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py
index 1ce16336eb9..161606d48f9 100644
--- a/var/spack/repos/builtin/packages/cp2k/package.py
+++ b/var/spack/repos/builtin/packages/cp2k/package.py
@@ -272,6 +272,7 @@ def edit(self, spec, prefix):
         elif '%aocc' in spec:
             fcflags += [
                 '-ffree-form',
+                '-Mbackslash',
             ]
         elif '%pgi' in spec or '%nvhpc' in spec:
             fcflags += ['-Mfreeform', '-Mextend']
diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py
index f902b730e03..f324ddc8651 100644
--- a/var/spack/repos/builtin/packages/libxc/package.py
+++ b/var/spack/repos/builtin/packages/libxc/package.py
@@ -80,6 +80,9 @@ def setup_build_environment(self, env):
         if '%intel' in self.spec and which('xiar'):
             env.set('AR', 'xiar')
 
+        if '%aocc' in self.spec:
+            env.append_flags('FCFLAGS', '-fPIC')
+
         if '+cuda' in self.spec:
             nvcc = self.spec['cuda'].prefix.bin.nvcc
             env.set('CCLD', '{0} -ccbin {1}'.format(nvcc, spack_cc))
@@ -100,6 +103,15 @@ def configure_args(self):
 
         return args
 
+    @run_after('configure')
+    def patch_libtool(self):
+        """AOCC support for LIBXC"""
+        if '%aocc' in self.spec:
+            filter_file(
+                r'\$wl-soname \$wl\$soname',
+                r'-fuse-ld=ld -Wl,-soname,\$soname',
+                'libtool', string=True)
+
     def check(self):
         # libxc provides a testsuite, but many tests fail
         # http://www.tddft.org/pipermail/libxc/2013-February/000032.html