From patchwork Sat Nov 28 09:51:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1407499 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MeXXSGGX; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cjmzz6g4gz9sRR for ; Sat, 28 Nov 2020 20:54:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7C2E187A49; Sat, 28 Nov 2020 09:54:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b3LFi3Iz-V1r; Sat, 28 Nov 2020 09:54:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2EDDA87A26; Sat, 28 Nov 2020 09:54:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 65F4B1BF369 for ; Sat, 28 Nov 2020 09:54:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6209887A26 for ; Sat, 28 Nov 2020 09:54:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 936mbiwIbkX2 for ; Sat, 28 Nov 2020 09:54:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 49C1F87A14 for ; Sat, 28 Nov 2020 09:54:18 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id k10so600482wmi.3 for ; Sat, 28 Nov 2020 01:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fuz1W0TLXyIfzd9vAKMmOGCTVVz6f5evMzC1TLR2jWA=; b=MeXXSGGXOMEMcGhG2MtjoZa4J9sFMHRbQNKVoZqHXu+6XtusQ/fSxSUO9RvE19jzFG xvmYJiqxC5BAS39t0J3F1uAKjaHQIsifiAXX2R+taCoQZfy08PFQ940KCok+wa1PzEP6 Yak3xQKdWxdMDdgVMCZf+P3MyYkR8FmFRr/3+isHDY2W/OyhzJ9hCeMQKQr8t7vC/yUa H7o64i6kl0o60vt5UgWFAfsyfjXKSvbhVuHZsT4s3T9KZj17ogoI7hQOBpYw2xCkapP5 w/wl2Tmki7j96+b/m1gkEDOWdBQAt2tvGtDGCRC4tiisMZBNf41M9BqIsUvUHmJ3SyMy n9Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fuz1W0TLXyIfzd9vAKMmOGCTVVz6f5evMzC1TLR2jWA=; b=Cj9KogHnz7qYzTw3bl1+Y6ctRfHMsdSgAT0vPRkPrMfxsGUF56AsqyXDUZ92W2Ybx9 0TJ4hpo+PYT8zZRuIiGg17XMrzND1FV8VXlkMz0EF0iolictPB4YWiKjbTSQO0Ftlils x3nC/eUV5lj0x7coM/fkV1qAE3wKfrCU3kcebZYAI/dsCrm3w0muxgf/lVse2Zk1aNsK +oIHYJukUfpuAJbFCm9/T3mF+0cow3iGrPxp76IQAw49yugSq0QRjImfFqdSwEZt83P5 HRo9+OJJqQo5gHDm5iqn541eQF3baTZcUfln8jrDXtmb0WNOLPy36L+e3Opqx1jVvMFV GzfQ== X-Gm-Message-State: AOAM531/rB0RNd8zeAle0VYYosLoCaeTJ9SrbTLaz9nspEgkDzlJGf4Y tk3OShwYLg8Gevg+HxGYuh4VCnPeVbsD6Q== X-Google-Smtp-Source: ABdhPJwmtJDW13kCDVn64lwCsiFthx1tkPT+ST7u3iFyKtL3fOz8UsMOPgHaOzpLvPOw0uZsin9bng== X-Received: by 2002:a1c:dc82:: with SMTP id t124mr13603828wmg.94.1606557256342; Sat, 28 Nov 2020 01:54:16 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id s25sm16304961wmh.16.2020.11.28.01.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 01:54:15 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 28 Nov 2020 10:51:08 +0100 Message-Id: <20201128095108.1069483-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: fix build with netsnmp X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Alexander Egorenkov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fix the following build failure: /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' Moreover, replace perl-net-snmp dependency by netsnmp as osasnmpd is an SNMP subagent for the net-snmp package: https://github.com/ibm-s390-tools/s390-tools/blob/master/osasnmpd/osasnmpd.8 Fixes: - http://autobuild.buildroot.org/results/00796f2ebd5fb0e08ac7a05a9ee566f2bc4bd1c3 Signed-off-by: Fabrice Fontaine Reviewed-by: Alexander Egorenkov --- ...snmpd-Makefile-fix-cross-compilation.patch | 41 +++++++++++++++++++ package/s390-tools/s390-tools.mk | 8 ++-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch diff --git a/package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch b/package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch new file mode 100644 index 0000000000..8e3d1399f2 --- /dev/null +++ b/package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch @@ -0,0 +1,41 @@ +From d7faa31a871d14ab02b290bdf2b2fa085766d2ac Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 +[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 + diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 5a3bcffba9..34750bea71 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -72,9 +72,11 @@ else S390_TOOLS_MAKE_OPTS += HAVE_FUSE=0 endif -ifeq ($(BR2_PACKAGE_PERL_NET_SNMP),y) -S390_TOOLS_DEPENDENCIES += perl-net-snmp -S390_TOOLS_MAKE_OPTS += HAVE_SNMP=1 +ifeq ($(BR2_PACKAGE_NETSNMP),y) +S390_TOOLS_DEPENDENCIES += netsnmp +S390_TOOLS_MAKE_OPTS += \ + NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config \ + HAVE_SNMP=1 else S390_TOOLS_MAKE_OPTS += HAVE_SNMP=0 endif