[csw-devel] SF.net SVN: gar:[18429] csw/mgar/pkg/monit/trunk

[bdwalton at users.sourceforge.net]

Revision: 18429
          http://gar.svn.sourceforge.net/gar/?rev=18429&view=rev
Author:   bdwalton
Date:     2012-06-16 02:20:22 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
monit/trunk: add patch to remove hard coded compiler options; build for sol10 only with gcc

Modified Paths:
--------------
    csw/mgar/pkg/monit/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch

Modified: csw/mgar/pkg/monit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/monit/trunk/Makefile	2012-06-15 21:00:42 UTC (rev 18428)
+++ csw/mgar/pkg/monit/trunk/Makefile	2012-06-16 02:20:22 UTC (rev 18429)
@@ -1,13 +1,6 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
-# ! Early stage recipe, doesn't build yet
 #
-#gmake[3]: Entering directory `/home/skayser/mgar/pkg/monit/trunk/work/solaris9-sparc/build-isa-sparcv8/monit-5.3.1/libmonit'
-#/bin/bash ./libtool --tag=CC   --mode=compile /opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I./src -I./src -I./src/exceptions -I./src/io -I./src/net -I./src/util -I./src/thread -I/opt/csw/include  -I/opt/csw/include  -xO3 -m32 -xarch=v8 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -mtune=v9 -c -o src/Bootstrap.lo src/Bootstrap.c
-#libtool: compile:  /opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I./src -I./src -I./src/exceptions -I./src/io -I./src/net -I./src/util -I./src/thread -I/opt/csw/include -I/opt/csw/include -xO3 -m32 -xarch=v8 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -mtune=v9 -c src/Bootstrap.c  -KPIC -DPIC -o src/.libs/Bootstrap.o
-#cc: Warning: illegal option -mtune=v9
-#cc: -xarch=v8 is 32-bit only
-#
 NAME = monit
 VERSION = 5.3.1
 GARTYPE = v2
@@ -18,10 +11,15 @@
   Long description
 endef
 
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
+
 VENDOR_URL = http://mmonit.com/monit/
 MASTER_SITES = http://mmonit.com/monit/dist/
 DISTFILES  = $(DISTNAME).tar.gz
+PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch
 
+GARCOMPILER = GNU
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Added: csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch
===================================================================
--- csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch	                        (rev 0)
+++ csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch	2012-06-16 02:20:22 UTC (rev 18429)
@@ -0,0 +1,82 @@
+From 66286914b5363a48bb4984f02748a7ce2a58c160 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 16 Jun 2012 04:03:55 +0200
+Subject: [PATCH] Drop some build flags that get hard coded by configure
+
+We set sane build flags, so don't rely on the hard coded stuff that
+gets in the way.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure          |   20 ++++++++++----------
+ libmonit/configure |    8 ++++----
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/configure b/configure
+index 976698c..b7566ee 100755
+--- a/configure
++++ b/configure
+@@ -12703,8 +12703,8 @@ architecture=`uname`
+ if test "$architecture" = "SunOS"
+ then
+    ARCH="SOLARIS"
+-   CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64"
+-   LDFLAGS="$LDFLAGS -m64"
++   CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__"
++   LDFLAGS="$LDFLAGS"
+    test_kstat="true"
+ 
+ $as_echo "#define HAVE_CPU_WAIT 1" >>confdefs.h
+@@ -12713,20 +12713,20 @@ $as_echo "#define HAVE_CPU_WAIT 1" >>confdefs.h
+    then
+       if test "x$GCC" = "xyes"
+       then
+-            CFLAGS="$CFLAGS -mtune=opteron"
+-            LDFLAGS="$LDFLAGS -mtune=opteron"
++            CFLAGS="$CFLAGS"
++            LDFLAGS="$LDFLAGS"
+       else
+-            CFLAGS="$CFLAGS -xarch=sse2"
+-            LDFLAGS="$LDFLAGS -xarch=sse2"
++            CFLAGS="$CFLAGS"
++            LDFLAGS="$LDFLAGS"
+       fi
+    else
+       if test "x$GCC" = "xyes"
+       then
+-            CFLAGS="$CFLAGS -mtune=v9"
+-            LDFLAGS="$LDFLAGS -mtune=v9"
++            CFLAGS="$CFLAGS"
++            LDFLAGS="$LDFLAGS"
+       else
+-            CFLAGS="$CFLAGS -xarch=sparc"
+-            LDFLAGS="$LDFLAGS -xarch=sparc"
++            CFLAGS="$CFLAGS"
++            LDFLAGS="$LDFLAGS"
+       fi
+    fi
+ elif test "$architecture" = "Linux"
+diff --git a/libmonit/configure b/libmonit/configure
+index 8e69bfd..aba7f8c 100755
+--- a/libmonit/configure
++++ b/libmonit/configure
+@@ -10877,12 +10877,12 @@ $as_echo "#define DARWIN 1" >>confdefs.h
+ elif test "$architecture" = "SunOS"
+ then
+    LIBS="$LIBS -lsocket -lnsl"
+-   CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64"
+-   LDFLAGS="$LDFLAGS -m64"
++   CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__"
++   LDFLAGS="$LDFLAGS"
+    if test `uname -m` != "i86pc"
+    then
+-       CFLAGS="$CFLAGS -mtune=v9"
+-       LDFLAGS="$LDFLAGS -mtune=v9"
++       CFLAGS="$CFLAGS"
++       LDFLAGS="$LDFLAGS"
+    fi
+ 
+ $as_echo "#define SOLARIS 1" >>confdefs.h
+-- 
+1.7.10.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.