[csw-devel] SF.net SVN: gar:[8006] csw/mgar/pkg/libproxy
hson at users.sourceforge.net
hson at users.sourceforge.net
Fri Jan 15 03:35:56 CET 2010
Revision: 8006
http://gar.svn.sourceforge.net/gar/?rev=8006&view=rev
Author: hson
Date: 2010-01-15 02:35:56 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
libproxy: Fixes for Solaris 8 compatibility
Modified Paths:
--------------
csw/mgar/pkg/libproxy/trunk/Makefile
csw/mgar/pkg/libproxy/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libproxy/Makefile
csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch
csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch
csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch
csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch
Added: csw/mgar/pkg/libproxy/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/Makefile (rev 0)
+++ csw/mgar/pkg/libproxy/Makefile 2010-01-15 02:35:56 UTC (rev 8006)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Modified: csw/mgar/pkg/libproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 02:07:19 UTC (rev 8005)
+++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 02:35:56 UTC (rev 8006)
@@ -13,21 +13,65 @@
MASTER_SITES = http://libproxy.googlecode.com/files/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch
+#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch
PATCHFILES += 0002-Dont-preset-CFLAGS.patch
+# For Solaris 10 targets
+#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch
+#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch
+#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch
+#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch
+#For Solaris 8 targets
+PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch
+PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch
+PATCHFILES_isa-sparcv8 += stdfiles.patch
+PATCHFILES_isa-sparcv8 += proxy.c.patch
+PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch
+PATCHFILES_isa-sparcv9 += stdfiles.patch
+PATCHFILES_isa-sparcv9 += proxy.c.patch
+PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch
+PATCHFILES_isa-i386 += stdfiles.patch
+PATCHFILES_isa-i386 += proxy.c.patch
-# We define upstream file regex so we can be notifed of new upstream software release
+PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev
+#Disable Mozilla plugin until there is a 64-bit version
+#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey
+
+REQUIRED_PKGS += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt
+
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
EXTRA_LINKER_FLAGS = -lnsl
BUILD64 = 1
+
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib
+EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib
+
+
CONFIGURE_ARGS = $(DIRPATHS)
+#Disable Mozilla plugin until there is a 64-bit version
+CONFIGURE_ARGS += --without-mozjs
+CONFIGURE_ARGS += --with-python
+CONFIGURE_ARGS += --disable-silent-rules
TEST_TARGET = check
include gar/category.mk
+#pre-configure-modulated:
+# @echo " ==> Regenerating build tools..."
+# @(cd $(WORKSRC) ; \
+# aclocal && \
+# autoconf && \
+# libtoolize --automake --force && \
+# aclocal && \
+# automake -a )
+# @$(MAKECOOKIE)
+
+
# 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-15 02:07:19 UTC (rev 8005)
+++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-15 02:35:56 UTC (rev 8006)
@@ -1,3 +1,6 @@
-ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch
acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch
+dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch
+95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch
6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz
+647cefd3bb414eb269cb59aace9eb35b proxy.c.patch
+7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch
Added: csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch (rev 0)
+++ csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch 2010-01-15 02:35:56 UTC (rev 8006)
@@ -0,0 +1,134 @@
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am
+--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100
+@@ -2,5 +2,5 @@
+
+ # 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
+ proxy_LDADD = ../lib/libproxy.la
+diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am
+--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100
+@@ -10,8 +10,8 @@
+ 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@\"
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+
+ include_HEADERS = proxy.h
+
+diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in
+--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100
+@@ -277,7 +277,7 @@
+ 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@\"
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+ include_HEADERS = proxy.h
+ all: all-am
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am
+--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100
+@@ -1,5 +1,5 @@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS =
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+
+@@ -50,7 +50,7 @@
+
+ # GConf/GNOME Config Module
+ config_gnome_la_SOURCES = config_gnome.c xhasclient.c
+-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
+ config_gnome_la_LIBADD = ../lib/libproxy.la
+ config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@
+
+@@ -77,12 +77,12 @@
+
+ # IP Ignore Module
+ ignore_ip_la_SOURCES = ignore_ip.c
+-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L
++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib
+ ignore_ip_la_LIBADD = ../lib/libproxy.la
+
+ # WebKit (JavaScriptCore) based PAC runner
+ pacrunner_webkit_la_SOURCES = pacrunner_webkit.c
+-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@
+ pacrunner_webkit_la_LIBADD = ../lib/libproxy.la
+ if MINGW32
+ pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la
+@@ -92,7 +92,7 @@
+
+ # Mozilla (Spidermonkey) based PAC runner
+ pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c
+-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@
+ pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la
+ pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@
+ nodist_pacrunner_mozjs_la_SOURCES = pacutils.h
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in
+--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100
+@@ -359,7 +359,7 @@
+ xmu_CFLAGS = @xmu_CFLAGS@
+ xmu_LIBS = @xmu_LIBS@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS =
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+ # Which modules to build
+@@ -385,7 +385,7 @@
+
+ # GConf/GNOME Config Module
+ config_gnome_la_SOURCES = config_gnome.c xhasclient.c
+-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
+ config_gnome_la_LIBADD = ../lib/libproxy.la
+ config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@
+
+@@ -412,19 +412,19 @@
+
+ # IP Ignore Module
+ ignore_ip_la_SOURCES = ignore_ip.c
+-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L
++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib
+ ignore_ip_la_LIBADD = ../lib/libproxy.la
+
+ # WebKit (JavaScriptCore) based PAC runner
+ pacrunner_webkit_la_SOURCES = pacrunner_webkit.c
+-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@
+ pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10)
+ pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@
+ nodist_pacrunner_webkit_la_SOURCES = pacutils.h
+
+ # Mozilla (Spidermonkey) based PAC runner
+ pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c
+-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@
+ pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la
+ pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@
+ nodist_pacrunner_mozjs_la_SOURCES = pacutils.h
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in
+--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100
+@@ -239,7 +239,7 @@
+
+ # 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
+ proxy_LDADD = ../lib/libproxy.la
+ all: all-am
+
Added: csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch (rev 0)
+++ csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch 2010-01-15 02:35:56 UTC (rev 8006)
@@ -0,0 +1,69 @@
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am
+--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100
+@@ -2,5 +2,5 @@
+
+ # 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 -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am
+--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100
+@@ -10,8 +10,8 @@
+ 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 -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in
+--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100
+@@ -277,7 +277,7 @@
+ 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 -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am
+--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100
+@@ -1,5 +1,5 @@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS = -xc99
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in
+--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100
+@@ -359,7 +359,7 @@
+ 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
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in
+--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100
+@@ -239,7 +239,7 @@
+
+ # 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
+
Added: csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch (rev 0)
+++ csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch 2010-01-15 02:35:56 UTC (rev 8006)
@@ -0,0 +1,40 @@
+diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c
+--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100
+@@ -162,17 +162,37 @@
+ if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error;
+
+ /* If we have a config file, load the config order from it */
++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++ char *envp;
++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3);
++ sprintf(envp,"_PX_CONFIG_ORDER=");
++ putenv(envp);
++#else
+ setenv("_PX_CONFIG_ORDER", "", 1);
++#endif
+ pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf");
+ if (cf)
+ {
+ char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order");
+ px_config_file_free(cf);
++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++ if (tmp) {
++ int retval;
++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2);
++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp);
++ retval = putenv(envp);
++ if(retval) {
++ px_free(tmp);
++ goto error;
++ }
++ }
++#else
+ if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1))
+ {
+ px_free(tmp);
+ goto error;
+ }
++#endif
+ px_free(tmp);
+ }
Added: csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch (rev 0)
+++ csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch 2010-01-15 02:35:56 UTC (rev 8006)
@@ -0,0 +1,34 @@
+diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h
+--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100
++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100
+@@ -0,0 +1,17 @@
++#ifndef _STDBOOL_H
++#ifndef _MY_STDBOOL_H
++#define _MY_STDBOOL_H
++
++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++
++#ifndef bool
++#define bool int
++#define false 0
++#define true 1
++#endif /* bool */
++
++#endif /* Compiler has bool */
++
++
++#endif /* _MY_BOOL_H_*/
++#endif /* _STDBOOL_H_*/
+diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h
+--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100
++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100
+@@ -0,0 +1,9 @@
++#ifndef _STDINT_H
++#ifndef _MY_STDINT_H
++#define _MY_STDINT_H
++
++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++#include <sys/inttypes.h>
++#endif /* Compiler has stdint.h */
++#endif /* _MY_STDINT_H */
++#endif /* _STDINT_H */
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