xymon

Check-in [aec56f28b7]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Backport trunk r7330/1: c-ares to 1.10.0, allowing build-specified CFLAGS to be passed down git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7589 44351d6e-118b-4698-b696-ce33095ecaa4
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | origin/4.3.19
Files: files | file ages | folders
SHA3-256: aec56f28b773e7f0a4b02b014d6bc8cde44f23c3e137e6e01e3b839dc91bd752
User & Date: jccleaver@users.sf.net 2015-02-26 07:41:56
Context
2015-02-26
21:28
Pedantic calloc arg fix git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7591 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: 7e7ecaed99 user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
07:41
Backport trunk r7330/1: c-ares to 1.10.0, allowing build-specified CFLAGS to be passed down git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7589 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: aec56f28b7 user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
2015-02-25
20:17
Add EXTIME= options for analysis and alert rules git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7588 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: ee632ae4db user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to build/Makefile.rules.

47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
ifndef INSTALLWEBDIR
INSTALLWEBDIR = $(XYMONHOME)/web
endif
ifndef INSTALLWWWDIR
INSTALLWWWDIR = $(XYMONHOME)/www
endif

ARESVER = 1.7.3
FPINGVER = 3.0

IDTOOL := $(shell if test `uname -s` = "SunOS"; then echo /usr/xpg4/bin/id; else echo id; fi)

ifdef RPATH
RPATHOPT := $(RPATH)$(shell echo $(RPATHVAL) | sed -e 's/ / $(RPATH)/g')
endif







|







47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
ifndef INSTALLWEBDIR
INSTALLWEBDIR = $(XYMONHOME)/web
endif
ifndef INSTALLWWWDIR
INSTALLWWWDIR = $(XYMONHOME)/www
endif

ARESVER = 1.10.0
FPINGVER = 3.0

IDTOOL := $(shell if test `uname -s` = "SunOS"; then echo /usr/xpg4/bin/id; else echo id; fi)

ifdef RPATH
RPATHOPT := $(RPATH)$(shell echo $(RPATHVAL) | sed -e 's/ / $(RPATH)/g')
endif

Changes to xymonnet/Makefile.

60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
	ranlib c-ares/.libs/libcares.a || echo "ranlib failure - ignored"
	cp c-ares/.libs/libcares.a .

c-ares/.libs/libcares.a: c-ares/Makefile
	(cd c-ares && $(MAKE))

c-ares/Makefile: c-ares/configure
	(cd c-ares && CFLAGS="$(CFLAGS)" ./configure --disable-shared)

c-ares/configure: c-ares-$(ARESVER).tar.gz
	gzip -dc $< | tar xf -
	mv c-ares-$(ARESVER) c-ares
	# Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file.
	touch c-ares/configure








|







60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
	ranlib c-ares/.libs/libcares.a || echo "ranlib failure - ignored"
	cp c-ares/.libs/libcares.a .

c-ares/.libs/libcares.a: c-ares/Makefile
	(cd c-ares && $(MAKE))

c-ares/Makefile: c-ares/configure
	(cd c-ares && ../c-ares-shim.sh ./configure --disable-shared)

c-ares/configure: c-ares-$(ARESVER).tar.gz
	gzip -dc $< | tar xf -
	mv c-ares-$(ARESVER) c-ares
	# Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file.
	touch c-ares/configure

Added xymonnet/c-ares-1.10.0.tar.gz.

cannot compute difference between binary files

Deleted xymonnet/c-ares-1.7.3.tar.gz.

cannot compute difference between binary files

Added xymonnet/c-ares-shim.sh.







































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
#!/bin/sh

# Separate $CFLAGS and $CPPFLAGS for c-ares, which is now a bit more strict about things
# 
# This will be moot if we get around to autoconfiscating the build process.
# 

for i in $CFLAGS; do
   if [ `echo $i | grep -c -e '-I' -e '-D' -e '-L'` -eq 0 ]; then
        CFF="$CFF $i"
   elif [ `echo $i | grep -c -e '-L'` -eq 0 ]; then
        CPF="$CPF $i"
   else
        echo "REJECTING '${i}' in CFLAGS"
   fi
done

CFLAGS="$CFF" CPPFLAGS="$CPF" $*