[csw-devel] SF.net SVN: gar:[7881] csw/mgar/pkg/libproxy/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Jan 5 21:43:05 CET 2010


Revision: 7881
          http://gar.svn.sourceforge.net/gar/?rev=7881&view=rev
Author:   dmichelsen
Date:     2010-01-05 20:43:05 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
libproxy: Add patches

Modified Paths:
--------------
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/libproxy/trunk/checksums
    csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch
    csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch

Added Paths:
-----------
    csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig
    csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig

Modified: csw/mgar/pkg/libproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile	2010-01-05 20:21:32 UTC (rev 7880)
+++ csw/mgar/pkg/libproxy/trunk/Makefile	2010-01-05 20:43:05 UTC (rev 7881)
@@ -19,7 +19,15 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+EXTRA_LINKER_FLAGS = -lnsl
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
+TEST_TARGET = check
+
 include gar/category.mk
+
+# There is actually the cpp executable in /usr/lib
+PATH := $(PATH):/usr/lib

Modified: csw/mgar/pkg/libproxy/trunk/checksums
===================================================================
--- csw/mgar/pkg/libproxy/trunk/checksums	2010-01-05 20:21:32 UTC (rev 7880)
+++ csw/mgar/pkg/libproxy/trunk/checksums	2010-01-05 20:43:05 UTC (rev 7881)
@@ -1,3 +1,3 @@
-70b8c804d1e0a5e98a1e708bd3102329  0001-Use-xc99-for-Sun-Studio-compiler.patch
-d5847505f454b61bd3ddc32b7f00eb7b  0002-Dont-preset-CFLAGS.patch
+ce2d836df293fa8183265176459cf87e  0001-Use-xc99-for-Sun-Studio-compiler.patch
+acd3e61f107ff188722fb1335e0ed37c  0002-Dont-preset-CFLAGS.patch
 6ded75a6c6aef53be657ece207cc26c4  libproxy-0.3.0.tar.gz

Modified: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch	2010-01-05 20:21:32 UTC (rev 7880)
+++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch	2010-01-05 20:43:05 UTC (rev 7881)
@@ -12,17 +12,6 @@
  src/modules/Makefile.in |    2 +-
  6 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
-index 0248879..9c7633e 100644
---- a/src/bin/Makefile.am
-+++ b/src/bin/Makefile.am
-@@ -2,5 +2,5 @@ bin_PROGRAMS  = proxy
- 
- # Command line interface to libproxy
- proxy_SOURCES = proxy.c
--proxy_CPPFLAGS  = -I$(top_srcdir)/src/lib -std=c99
-+proxy_CPPFLAGS  = -I$(top_srcdir)/src/lib -xc99
- proxy_LDADD   = ../lib/libproxy.la
 diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
 index 625fbb3..ed8cd56 100644
 --- a/src/bin/Makefile.in
@@ -36,19 +25,6 @@
  proxy_LDADD = ../lib/libproxy.la
  all: all-am
  
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 626d1c4..b1c6b80 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \
- 						strdict.c strdict.h \
- 						url.c url.h
- 
--libproxy_la_CFLAGS  = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
-+libproxy_la_CFLAGS  = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
- libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
- 
- include_HEADERS     = proxy.h
 diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
 index 77bb2da..73e087c 100644
 --- a/src/lib/Makefile.in
@@ -62,17 +38,6 @@
  libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
  include_HEADERS = proxy.h
  all: all-am
-diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
-index 170791b..84bd0b5 100644
---- a/src/modules/Makefile.am
-+++ b/src/modules/Makefile.am
-@@ -1,5 +1,5 @@
- moduledir = @MODULEDIR@
--AM_CFLAGS    = -std=c99
-+AM_CFLAGS    = -xc99
- AM_LDFLAGS   = -module -avoid-version -no-undefined
- 
- 
 diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
 index 6965056..45c9c57 100644
 --- a/src/modules/Makefile.in

Added: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig	                        (rev 0)
+++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig	2010-01-05 20:43:05 UTC (rev 7881)
@@ -0,0 +1,91 @@
+From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 5 Jan 2010 15:29:01 +0100
+Subject: [PATCH] Use xc99 for Sun Studio compiler
+
+---
+ src/bin/Makefile.am     |    2 +-
+ src/bin/Makefile.in     |    2 +-
+ src/lib/Makefile.am     |    2 +-
+ src/lib/Makefile.in     |    2 +-
+ src/modules/Makefile.am |    2 +-
+ src/modules/Makefile.in |    2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
+index 0248879..9c7633e 100644
+--- a/src/bin/Makefile.am
++++ b/src/bin/Makefile.am
+@@ -2,5 +2,5 @@ bin_PROGRAMS  = proxy
+ 
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS  = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS  = -I$(top_srcdir)/src/lib -xc99
+ proxy_LDADD   = ../lib/libproxy.la
+diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
+index 625fbb3..ed8cd56 100644
+--- a/src/bin/Makefile.in
++++ b/src/bin/Makefile.in
+@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@
+ 
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99
+ proxy_LDADD = ../lib/libproxy.la
+ all: all-am
+ 
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 626d1c4..b1c6b80 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \
+ 						strdict.c strdict.h \
+ 						url.c url.h
+ 
+-libproxy_la_CFLAGS  = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS  = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+ 
+ include_HEADERS     = proxy.h
+diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
+index 77bb2da..73e087c 100644
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
+@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \
+ 						strdict.c strdict.h \
+ 						url.c url.h
+ 
+-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+ include_HEADERS = proxy.h
+ all: all-am
+diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
+index 170791b..84bd0b5 100644
+--- a/src/modules/Makefile.am
++++ b/src/modules/Makefile.am
+@@ -1,5 +1,5 @@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS    = -std=c99
++AM_CFLAGS    = -xc99
+ AM_LDFLAGS   = -module -avoid-version -no-undefined
+ 
+ 
+diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
+index 6965056..45c9c57 100644
+--- a/src/modules/Makefile.in
++++ b/src/modules/Makefile.in
+@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@
+ xmu_CFLAGS = @xmu_CFLAGS@
+ xmu_LIBS = @xmu_LIBS@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS = -xc99
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+ 
+ # Which modules to build
+-- 
+1.6.6
+

Modified: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch	2010-01-05 20:21:32 UTC (rev 7880)
+++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch	2010-01-05 20:43:05 UTC (rev 7881)
@@ -14,21 +14,6 @@
  ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs"
  
  cat >confcache <<\_ACEOF
-diff --git a/configure.ac b/configure.ac
-index c9e0bb9..4139f95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -238,7 +238,7 @@ case $host in
-      AC_CHECK_LIB(ws2_32, main)
- esac
- 
--CFLAGS="-g -Wall -pedantic $CFLAGS"
-+#CFLAGS="-g -Wall -pedantic $CFLAGS"
- AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile
-                  src/modules/Makefile src/bin/Makefile src/bindings/Makefile
-                  src/bindings/python/Makefile src/bindings/java/Makefile
-diff --git a/src/lib/Makefile b/src/lib/Makefile
-index 867b01b..0ba55f6 100644
 
 -- 
 1.6.6

Added: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig	                        (rev 0)
+++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig	2010-01-05 20:43:05 UTC (rev 7881)
@@ -0,0 +1,35 @@
+From 6677cc7bc95aeeee76c7741ee9edd03469b7936e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 5 Jan 2010 15:35:21 +0100
+Subject: [PATCH 2/2] Initial commit
+
+--- a/configure
++++ b/configure
+@@ -14683,7 +14683,7 @@ fi
+ 
+ esac
+ 
+-CFLAGS="-g -Wall -pedantic $CFLAGS"
++# CFLAGS="-g -Wall -pedantic $CFLAGS"
+ ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs"
+ 
+ cat >confcache <<\_ACEOF
+diff --git a/configure.ac b/configure.ac
+index c9e0bb9..4139f95 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,7 +238,7 @@ case $host in
+      AC_CHECK_LIB(ws2_32, main)
+ esac
+ 
+-CFLAGS="-g -Wall -pedantic $CFLAGS"
++#CFLAGS="-g -Wall -pedantic $CFLAGS"
+ AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile
+                  src/modules/Makefile src/bin/Makefile src/bindings/Makefile
+                  src/bindings/python/Makefile src/bindings/java/Makefile
+diff --git a/src/lib/Makefile b/src/lib/Makefile
+index 867b01b..0ba55f6 100644
+
+-- 
+1.6.6
+


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



More information about the devel mailing list