From fd2bd9e3df276301f867b05bd9f47ab3ab7b4ef4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 21 Feb 2011 16:25:06 -0300 Subject: quagga: fix build with snmp support Closes #3277 Quagga's snmp support tries to link with libcrypto from openssl by default. That's a bad no no since snmp might have ssl support disabled and openssl won't be around. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- CHANGES | 9 +++++---- package/quagga/quagga.mk | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 3858296f8..687561eee 100644 --- a/CHANGES +++ b/CHANGES @@ -11,10 +11,10 @@ libcgicc, libdaemon, libdrm, libevent, libgail, libglib2, libgpg-error, libmicrohttpd, librsvg, libsoup, libxcp, makedevs, matchbox-fakekey, matchbox-startup-monitor, mdadm, - metacity, mpd, nasm, nfs-utils, olsr, popt, pthread-stubs, - quagga, rpm, samba, sdl, sdl_gfx, sdl_image, sdl_mixer, - sdl_sound, sdl_ttf, squashfs, taglib, tcpreplay, tiff, - wpa_supplicant, xcb-util, + metacity, mpd, nasm, nfs-utils, olsr, openssl, popt, + pthread-stubs, quagga, rpm, samba, sdl, sdl_gfx, sdl_image, + sdl_mixer, sdl_sound, sdl_ttf, squashfs, taglib, tcpreplay, + tiff, wpa_supplicant, xcb-util, xdriver_xf86-input-{acepad,aiptek,evdev,joystick,keyboard}, xdriver_xf86-input-{mouse,synaptics,void}, xdriver_xf86-video-{chips,dummy,geode,glide,intel,nv,wsfb}, @@ -27,6 +27,7 @@ Issues resolved (http://bugs.uclibc.org): #3205: Failing chmod when running "make" in buildroot (openssl)... + #3277: quagga fails to build with SNMP support #3283: See why nfs-utils needs fakeroot, and convert to autotools 2011.02-rc1, Released February 14th, 2011: diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index d2b14440c..a807f0f4a 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -67,6 +67,10 @@ endif ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) QUAGGA_CONF_OPT+=--enable-snmp QUAGGA_DEPENDENCIES+=netsnmp +# SNMP support tries -lcrypto by default, disable it if we ain't got openssl +ifneq ($(BR2_PACKAGE_OPENSSL),y) +QUAGGA_CONF_OPT+=--without-crypto +endif else QUAGGA_CONF_OPT+=--disable-snmp endif -- cgit v1.2.3