Skip to content

Commit

Permalink
Audit Log: Correct building of linux audit-userspace
Browse files Browse the repository at this point in the history
The library install path for the audit-userspace libraries is
architecture dependent. Corrected how this is determined.

Signed-off-by: Janet Adkins <[email protected]>
  • Loading branch information
jeaaustx committed Feb 22, 2024
1 parent 10c01f7 commit 7a0c95c
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions scripts/build-unit-test-docker
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ except Exception:
prefix = "/usr/local"
proc_count = nproc().strip()

# Determine the library path based on architecture
arch = uname("-m").strip()
if arch == "ppc64le":
libbase = "powerpc64le-linux-gnu/"
else:
# All others use architecture name
libbase = f"{arch}-linux-gnu/"

class PackageDef(TypedDict, total=False):
"""Package Definition for packages dictionary."""
Expand Down Expand Up @@ -165,8 +172,10 @@ packages = {
),
build_type="make",
custom_post_dl=["./autogen.sh",
f"./configure --prefix={prefix} --enable-gssapi-krb5=no \
--libdir={prefix}/lib/x86_64-linux-gnu \
f"./configure --prefix={prefix} \
--exec-prefix={prefix} \
--libdir={prefix}/lib/{libbase} \
--enable-gssapi-krb5=no \
--with-libcap-ng=no \
--with-python3=no \
--with-python=no \
Expand Down Expand Up @@ -693,7 +702,6 @@ if username == "root":
uid = 0

# Determine the architecture for Docker.
arch = uname("-m").strip()
if arch == "ppc64le":
docker_base = "ppc64le/"
elif arch == "x86_64":
Expand Down

0 comments on commit 7a0c95c

Please sign in to comment.