[csw-devel] SF.net SVN: gar:[7259] csw/mgar/pkg/euler/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7259
          http://gar.svn.sourceforge.net/gar/?rev=7259&view=rev
Author:   dmichelsen
Date:     2009-11-13 11:43:23 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
euler: Fix linkage and set dependencies

Modified Paths:
--------------
    csw/mgar/pkg/euler/trunk/Makefile
    csw/mgar/pkg/euler/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch

Modified: csw/mgar/pkg/euler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/euler/trunk/Makefile	2009-11-12 23:55:55 UTC (rev 7258)
+++ csw/mgar/pkg/euler/trunk/Makefile	2009-11-13 11:43:23 UTC (rev 7259)
@@ -16,10 +16,24 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
+PATCHFILES = 0001-Remove-static-setting-of-CFLAGS.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tz
 
+REQUIRED_PKGS = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2
+REQUIRED_PKGS += CSWlibatk CSWlibcairo CSWlibxext CSWpango
+PREREQUISITE_PKGS = $(REQUIRED_PKGS)
+PREREQUISITE_PKGS += CSWglib2devel CSWgtk2devel
+PREREQUISITE_PKGS += CSWlibcairodevel CSWlibxextdevel CSWpangodevel
+
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+
+EXTRA_LDFLAGS = -lm /usr/openwin/lib/libXext.so
+
+BUILD_OVERRIDE_DIRS = CFLAGS
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/euler/trunk/checksums
===================================================================
--- csw/mgar/pkg/euler/trunk/checksums	2009-11-12 23:55:55 UTC (rev 7258)
+++ csw/mgar/pkg/euler/trunk/checksums	2009-11-13 11:43:23 UTC (rev 7259)
@@ -1 +1,2 @@
+6a755d3f19921a0527b84e615fcfb8f6  0001-Remove-static-setting-of-CFLAGS.patch
 4a45d7aaba2b73c7978e6d5623141103  euler-1.61.0.tgz

Added: csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch
===================================================================
--- csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch	                        (rev 0)
+++ csw/mgar/pkg/euler/trunk/files/0001-Remove-static-setting-of-CFLAGS.patch	2009-11-13 11:43:23 UTC (rev 7259)
@@ -0,0 +1,43 @@
+From f860746c9111658622bf8f524c421fb9fc6a4064 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 13 Nov 2009 12:31:27 +0100
+Subject: [PATCH] Remove static setting of CFLAGS
+
+---
+ src/Makefile.am |    4 ----
+ src/Makefile.in |    4 ----
+ 2 files changed, 0 insertions(+), 8 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d061923..38006c7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,10 +7,6 @@
+ INCLUDES = \
+ 	$(GTK_CFLAGS)
+ 
+-AM_CFLAGS =\
+-	 -Wall\
+-	 -O3
+-
+ bin_PROGRAMS = euler
+ 
+ euler_SOURCES = \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index f4fbb7b..db80e65 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -193,10 +193,6 @@ target_alias = @target_alias@
+ INCLUDES = \
+ 	$(GTK_CFLAGS)
+ 
+-AM_CFLAGS = \
+-	 -Wall\
+-	 -O3
+-
+ euler_SOURCES = \
+ 	main.c\
+ 	binary.c\
+-- 
+1.6.5.1
+


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