patches/ganglia-01-solaris.diff
author daymobrew
Wed, 21 Mar 2007 14:23:31 +0000
changeset 184 790c21a09e3e
permissions -rw-r--r--
2007-03-21 Damien Carbery <[email protected]> * SFEgrip.spec: Correct %files perms and add l10n package for l10n. * SFEganglia.spec: Add patch, ganglia-01-solaris, to build on Solaris. * patches/ganglia-01-solaris.diff: Added, to fix build issues. * SFEethereal.spec: Add BuildRequires SUNWbinutils and set PATH during %install to pick up GNU strip which is required (it uses --strip-unneeded parameter). * SFEdevhelp.spec: Removed, now in spec-files repository on svn.opensolaris.org.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
184
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     1
--- ganglia-3.0.3/srclib/confuse/tests/check_confuse.c.orig	2007-03-21 12:46:02.919469000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     2
+++ ganglia-3.0.3/srclib/confuse/tests/check_confuse.c	2007-03-21 12:47:06.754208000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     3
@@ -1,5 +1,5 @@
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     4
 #include <check.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     5
-#include "confuse.h"
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     6
+#include "../src/confuse.h"
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     7
 
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     8
 Suite *single_suite(void);
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
     9
 Suite *dup_suite(void);
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    10
--- ganglia-3.0.3/srclib/confuse/tests/suite_single.c.orig	2007-03-21 12:46:41.346888000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    11
+++ ganglia-3.0.3/srclib/confuse/tests/suite_single.c	2007-03-21 12:46:52.111031000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    12
@@ -6,7 +6,7 @@
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    13
 #include <sys/socket.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    14
 #include <netinet/in.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    15
 #include <arpa/inet.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    16
-#include <net/ethernet.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    17
+#include <sys/ethernet.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    18
 #ifdef linux
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    19
 # include <netinet/ether.h>
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    20
 #endif
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    21
--- ganglia-3.0.3/srclib/confuse/tests/Makefile.am.orig	2007-03-21 12:48:33.614813000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    22
+++ ganglia-3.0.3/srclib/confuse/tests/Makefile.am	2007-03-21 12:48:46.528978000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    23
@@ -3,7 +3,7 @@
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    24
 check_confuse_SOURCES=check_confuse.c suite_single.c suite_dup.c suite_list.c suite_validate.c \
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    25
 					  suite_func.c
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    26
 check_confuse_INCLUDES=-I$(top_srcdir)/src @CHECK_CFLAGS@
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    27
-check_confuse_LDADD=-L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL)
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    28
+check_confuse_LDADD=-L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL) -lsocket -lnsl
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    29
 EXTRA_DIST=a.conf b.conf
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    30
 CLEANFILES=*~ \#*\#
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    31
 
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    32
--- ganglia-3.0.3/srclib/confuse/tests/Makefile.in.orig	2007-03-21 13:13:37.173036000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    33
+++ ganglia-3.0.3/srclib/confuse/tests/Makefile.in	2007-03-21 13:14:18.391115000 +0000
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    34
@@ -209,7 +209,7 @@
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    35
 					  suite_func.c
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    36
 
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    37
 check_confuse_INCLUDES = -I$(top_srcdir)/src @CHECK_CFLAGS@
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    38
-check_confuse_LDADD = -L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL)
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    39
+check_confuse_LDADD = -L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL)  -lsocket -lnsl
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    40
 EXTRA_DIST = a.conf b.conf
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    41
 CLEANFILES = *~ \#*\#
790c21a09e3e 2007-03-21 Damien Carbery <[email protected]>
daymobrew
parents:
diff changeset
    42
 all: all-am