Attachment 156755 Details for Bug 198302 – Fix ntopng build linking against shared library

[patch] Fix ntopng build linking against shared library

ntopng.diff (text/plain), 2.94 KB, created by Renato Botelho on 2015-05-13 18:39:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2015-05-13 18:39:15 UTC

Size: 2.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 386233)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ntopng
> PORTVERSION=	1.2.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> MASTER_SITES=	SF/ntop/${PORTNAME}
> 
>@@ -13,12 +13,10 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN=		Fails to link
>-
> LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool \
> 		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
> 		libndpi.so:${PORTSDIR}/net/ndpi \
>-		libzmq.so:${PORTSDIR}/net/libzmq3
>+		libzmq.so:${PORTSDIR}/net/libzmq4
> 
> GNU_CONFIGURE=	yes
> USE_SQLITE=	yes
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 386233)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2014-09-07 01:22:11.756545075 +0600
>-+++ Makefile.in	2014-09-07 01:45:36.496401797 +0600
>-@@ -6,67 +6,32 @@
>+--- Makefile.in.orig	2015-05-13 13:29:47.790658000 -0500
>++++ Makefile.in	2015-05-13 13:30:08.207655000 -0500
>+@@ -6,68 +6,28 @@
>  INSTALL_DIR=@INSTALL_DIR@
>  MAN_DIR=@MAN_DIR@
>  ######
>@@ -70,19 +70,17 @@
> -	else
> -		ZEROMQ_LIB = $(ZMQ_STATIC)
> -	endif
>-+ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
>-+ZMQ_STATIC=/usr/local/lib/libzmq.a
>-+ifeq ($(wildcard $(ZMQ_STATIC)),)
>-+	ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
>- else
>+-else
> -	ZEROMQ_HOME=./third-party/zeromq-3.2.4
> -	ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
> -	ZEROMQ_LIB=$(ZEROMQ_HOME)/src/.libs/libzmq.a
>-+	ZEROMQ_LIB = $(ZMQ_STATIC)
>- endif
>+-endif
>++ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
>++ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
>  ######
>  EWH_HOME=third-party/EWAHBoolArray
>-@@ -91,22 +56,6 @@
>+ EWH_INC=$(EWH_HOME)/headers
>+@@ -91,22 +51,6 @@
>  
>  LIB_TARGETS =
>  
>@@ -105,7 +103,7 @@
>  .PHONY: default all clean docs test
>  
>  .NOTPARALLEL: default all
>-@@ -129,24 +78,6 @@
>+@@ -129,24 +73,6 @@
>  $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
>  	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
>  
>@@ -130,7 +128,7 @@
>  clean:
>  	-rm -f *.o *~ svn-commit.* #config.h
>  	-rm -f $(TARGET)
>-@@ -156,10 +87,6 @@
>+@@ -156,10 +82,6 @@
>  	cat privkey.pem cert.pem > httpdocs/ssl/ntopng-cert.pem
>  	/bin/rm -f privkey.pem cert.pem
>  
>@@ -141,7 +139,7 @@
>  geoip: httpdocs/geoip/GeoLiteCity.dat httpdocs/geoip/GeoLiteCityv6.dat httpdocs/geoip/GeoIPASNum.dat httpdocs/geoip/GeoIPASNumv6.dat
>  
>  httpdocs/geoip/GeoLiteCity.dat:
>-@@ -189,7 +116,6 @@
>+@@ -189,7 +111,6 @@
>  	cp -r doc *.cpp *.h configure COPYING README.* *.in ntopng.8 httpdocs scripts packages third-party ntopng-@NTOPNG_VERSION@
>  	find ntopng-@NTOPNG_VERSION@ -name ".svn" | xargs /bin/rm -rf
>  	-rm ntopng-@NTOPNG_VERSION@/httpdocs/geoip/*
>@@ -149,7 +147,7 @@
>  	tar cvfz ntopng-@NTOPNG_VERSION@.tgz ntopng-@NTOPNG_VERSION@
>  	#
>  	rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(RPM_PKG)
>-@@ -232,21 +158,8 @@
>+@@ -232,21 +153,8 @@
>  dist:
>  	rm -rf ntopng-@NTOPNG_VERSION@
>  	mkdir ntopng-@NTOPNG_VERSION@

Actions: View | Diff

Attachments on bug 198302: 156755