Title: [opsview-base] [51] Don't use fgrep when making WMI ?\226?\128?\148 Solaris doesn't like it.
Revision
51
Author
pknight
Date
2012-11-07 11:57:01 +0000 (Wed, 07 Nov 2012)

Log Message

Don't use fgrep when making WMI ?\226?\128?\148 Solaris doesn't like it.

Modified Paths

Added Paths

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-11-06 16:44:07 UTC (rev 50)
+++ trunk/Makefile	2012-11-07 11:57:01 UTC (rev 51)
@@ -409,6 +409,7 @@
 $(error ZENHOME is not set)
 endif
 	tar xjf ${WMI}.tar.bz2
+	cd ${WMI} && patch -p1 < ../patches/wmi_fgrep.patch
 	cd ${WMI} && make -f GNUmakefile
 
 ${HYPERGRAPH}:

Added: trunk/patches/wmi_fgrep.patch
===================================================================
--- trunk/patches/wmi_fgrep.patch	                        (rev 0)
+++ trunk/patches/wmi_fgrep.patch	2012-11-07 11:57:01 UTC (rev 51)
@@ -0,0 +1,14 @@
+diff -ur wmi-1.3.16.orig/GNUmakefile wmi-1.3.16/GNUmakefile
+--- wmi-1.3.16.orig/GNUmakefile	2012-11-07 11:47:45.000000000 +0000
++++ wmi-1.3.16/GNUmakefile	2012-11-07 11:45:02.000000000 +0000
+@@ -48,8 +48,8 @@
+ #-------------------------------------------------------------------------#
+ LIBASYNC_WMI_LIB_BASENAME    = libasync_wmi_lib
+ WMI_CONFIG_MK                = $(SAMBA_SRCDIR)/wmi/config.mk
+-LIBASYNC_WMI_LIB_VERSION_nnn = $(shell fgrep -A1 "[LIBRARY::async_wmi_lib]" $(WMI_CONFIG_MK) | sed -e "s/^VERSION=\(.*\)/\1/g"    | tail -1)
+-LIBASYNC_WMI_LIB_VERSION_n   = $(shell fgrep -A2 "[LIBRARY::async_wmi_lib]" $(WMI_CONFIG_MK) | sed -e "s/^SO_VERSION=\(.*\)/\1/g" | tail -1)
++LIBASYNC_WMI_LIB_VERSION_nnn = 0.0.2
++LIBASYNC_WMI_LIB_VERSION_n   = 0
+ ifeq ($(shell uname), Darwin)
+ LIBASYNC_WMI_LIB             = $(LIBASYNC_WMI_LIB_BASENAME).dylib.$(LIBASYNC_WMI_LIB_VERSION_nnn)
+ else

_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to