Fri Mar 29 07:19:06 2013 UTC ()

Add extra compiler flags to build correctly on Linux.


(sbd)

diff -r1.10 -r1.11 pkgsrc/net/xymon/distinfo
diff -r0 -r1.1 pkgsrc/net/xymon/patches/patch-build_Makefile.Linux

--- pkgsrc/net/xymon/distinfo 2012/10/11 18:42:19 1.10
+++ pkgsrc/net/xymon/distinfo 2013/03/29 07:19:05 1.11

 @@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.10 2012/10/11 18:42:19 spz Exp $
+$NetBSD: distinfo,v 1.11 2013/03/29 07:19:05 sbd Exp $
 SHA1 (xymon-4.3.10.tar.gz) = d37765da5741adc4282e081e3ad59862eb22353f
 RMD160 (xymon-4.3.10.tar.gz) = df5e01ab4528bc1146cdf784bbf69616f743bfa1
 Size (xymon-4.3.10.tar.gz) = 2754807 bytes
 SHA1 (patch-aa) = c74991627bfc4286a67f66e45915c3af69b38c2f
 SHA1 (patch-ab) = 2914624fde86a888639be356c6f28eefd47b5eb6
 SHA1 (patch-ac) = f65831af9899167e291aabd691945e9e4fc1d44b
 SHA1 (patch-ad) = 218ef05eb3d51d779230c357d731b2f904d4559f
 SHA1 (patch-ae) = 7519eaeecab9f5d4b6956e0fd426548ec7990a0b
 SHA1 (patch-af) = e8c3fd4ed1de6f7a74db8fac152534a1fe9f29f5
 SHA1 (patch-ah) = 03fee4b97cc3301339ace1ce459e7b679b83f96a
 SHA1 (patch-build_Makefile.FreeBSD) = e58b50f35068cba6fed89cc21bcc4eb7d30efd23
 SHA1 (patch-build_Makefile.Linux) = eea6d1ced23a622d115aa97dc10d352f9dd622b0
 SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b
 SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f
 SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d
 SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae

$NetBSD: patch-build_Makefile.Linux,v 1.1 2013/03/29 07:19:06 sbd Exp $

--- build/Makefile.Linux.orig	2012-07-23 11:29:13.000000000 +0000
+++ build/Makefile.Linux
@@ -6,12 +6,15 @@ OSDEF = -DLINUX
 NETLIBS =
 
 # Compile flags for normal build
+PKGDIR?=/usr/pkg
 CC = gcc
 GCCVER := $(shell gcc -dumpversion|cut -d. -f1)
 ifeq ($(GCCVER),4)
-   CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF)
+   CFLAGS = -g -O2 -Wall -Wno-unused -Wno-pointer-sign -D_REENTRANT $(LFSDEF) $(OSDEF) \
+       -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
 else
-   CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF)
+   CFLAGS = -g -O2 -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) \
+       -I${PKGDIR}/include -L${PKGDIR}/lib -Wl,--rpath=${PKGDIR}/lib
 endif
 
 ifndef PKGBUILD