b82b58a8dd
- Remove patch 0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch which has been merged. - Also update the GitHub URL because the project has been renamed. Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com> [Peter: also update Config.in URL] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From d7faa31a871d14ab02b290bdf2b2fa085766d2ac Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 27 Nov 2020 23:43:15 +0100
|
|
Subject: [PATCH] osasnmpd/Makefile: fix cross-compilation
|
|
|
|
Fix the following build failure by allowing the user to provide
|
|
NET_SNMP_CONFIG:
|
|
|
|
/bin/sh: net-snmp-config: command not found
|
|
/home/buildroot/autobuild/run/instance-2/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/9.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: osasnmpd.o: in function `main':
|
|
osasnmpd.c:(.text.startup+0xcc): undefined reference to `snmp_log_perror'
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/00796f2ebd5fb0e08ac7a05a9ee566f2bc4bd1c3
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/ibm-s390-tools/s390-tools/pull/99]
|
|
---
|
|
osasnmpd/Makefile | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/osasnmpd/Makefile b/osasnmpd/Makefile
|
|
index 15496b2..8ce0932 100644
|
|
--- a/osasnmpd/Makefile
|
|
+++ b/osasnmpd/Makefile
|
|
@@ -1,9 +1,10 @@
|
|
include ../common.mak
|
|
-LDLIBS = `net-snmp-config --agent-libs`
|
|
+NET_SNMP_CONFIG = net-snmp-config
|
|
+LDLIBS = `$(NET_SNMP_CONFIG) --agent-libs`
|
|
# On some Linux systems `net-snmp-config --agent-libs` introduces -pie,
|
|
# therefore add -fPIC to prevent link failures.
|
|
ALL_CFLAGS += -fPIC
|
|
-ALL_CFLAGS += `net-snmp-config --cflags`
|
|
+ALL_CFLAGS += `$(NET_SNMP_CONFIG) --cflags`
|
|
|
|
OBJS = ibmOSAMib.o ibmOSAMibUtil.o osasnmpd.o
|
|
|
|
--
|
|
2.29.2
|
|
|