[csw-devel] SF.net SVN: gar:[14452] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Apr 28 22:56:31 CEST 2011
Revision: 14452
http://gar.svn.sourceforge.net/gar/?rev=14452&view=rev
Author: dmichelsen
Date: 2011-04-28 20:56:30 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
libcurl4: Split off soname specific library, massive move ahead
Modified Paths:
--------------
csw/mgar/pkg/libcurl4/branches/curl-7.21.2/Makefile
csw/mgar/pkg/libcurl4/trunk/Makefile
csw/mgar/pkg/libcurl4/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libcurl4/
csw/mgar/pkg/libcurl4/branches/curl-7.21.2/
csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch
Removed Paths:
-------------
csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.i
csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.s
csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.i
csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.s
Modified: csw/mgar/pkg/libcurl4/branches/curl-7.21.2/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile 2010-12-08 03:48:13 UTC (rev 11840)
+++ csw/mgar/pkg/libcurl4/branches/curl-7.21.2/Makefile 2011-04-28 20:56:30 UTC (rev 14452)
@@ -15,10 +15,6 @@
MASTER_SITES = http://curl.haxx.se/download/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += libcurl.so.3.0.0.s
-DISTFILES += libcurl.so.2.0.2.s
-DISTFILES += libcurl.so.3.0.0.i
-DISTFILES += libcurl.so.2.0.2.i
DISTFILES += curlbuild.h
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -43,7 +39,12 @@
EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir)
EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps
+EXTRA_LDFLAGS = -L$(libdir)/libnet-new
+
+EXTRA_LD_OPTIONS = -f libcurl-full.so.4.2.0
+
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-static --enable-shared
CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl
CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs
CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES))
@@ -127,22 +128,10 @@
# end checkpkg happiness section
+#build-modulated: EXTRA_LD_OPTIONS=$(EXTRA_LD_OPTIONS_features-$(FEATURES))
+
include gar/category.mk
-post-install-isa-sparcv8-features-minimal:
- ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0
- ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2
- ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
- ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
- @$(MAKECOOKIE)
-
-post-install-isa-i386-features-minimal:
- cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0
- cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2
- ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
- ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
- @$(MAKECOOKIE)
-
post-merge:
ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile 2011-04-28 00:39:23 UTC (rev 14426)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile 2011-04-28 20:56:30 UTC (rev 14452)
@@ -1,8 +1,8 @@
NAME = curl
-VERSION = 7.21.2
+VERSION = 7.21.6
CATEGORIES = net
-DESCRIPTION = Command line tool and library for client-side URL transfers.
+DESCRIPTION = Command line tool and library for client-side URL transfers
define BLURB
curl and libcurl is a tool for transferring files using URL syntax. It
supports HTTP, HTTPS, FTP, FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as
@@ -15,34 +15,87 @@
MASTER_SITES = http://curl.haxx.se/download/
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += libcurl.so.3.0.0.s
-DISTFILES += libcurl.so.2.0.2.s
-DISTFILES += libcurl.so.3.0.0.i
-DISTFILES += libcurl.so.2.0.2.i
DISTFILES += curlbuild.h
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+# Use patch until this is fixed:
+# https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976
+PATCHFILES += 0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch
-PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel
-CATALOGNAME_CSWcurl = curl
-CATALOGNAME_CSWcurlrt = curl_rt
-CATALOGNAME_CSWcurlrtfull = curl_rt_full
-CATALOGNAME_CSWcurldevel = curl_devel
+FOREIGN_PACKAGES += CSWlibcurl2
+OBSOLETED_BY_CSWlibcurl2 += CSWcurlrt
+CATALOGNAME_CSWcurlrt = curl_rt_stub
-SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers
-SPKG_DESC_CSWcurlrt = Curl Runtime Libraries (minimal dependencies)
-SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured)
-SPKG_DESC_CSWcurldevel = Curl Developer Files
+FOREIGN_PACKAGES += CSWlibcurl3
+OBSOLETED_BY_CSWlibcurl3 += CSWcurlrt
-SPKG_SOURCEURL = http://curl.haxx.se
+PACKAGES += CSWlibcurl4
+CATALOGNAME_CSWlibcurl4 = libcurl4
+SPKG_DESC_CSWlibcurl4 = Library for client-side URL transfers, libcurl.so.4
+PKGFILES_CSWlibcurl4 = $(call pkgfiles_lib,libcurl.so.4)
+OBSOLETED_BY_CSWlibcurl4 = CSWcurlrt
+RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWlibidn
+RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibcurl4 += CSWzlib
+PACKAGES += CSWlibcurl4-feature
+CATALOGNAME_CSWlibcurl4-feature = libcurl4_feature
+SPKG_DESC_CSWlibcurl4-feature = Full-features library for client-side URL transfers superseding libcurl.so.4
+PKGFILES_CSWlibcurl4-feature = $(call pkgfiles_lib,libcurl-feature.so.4)
+OBSOLETED_BY_CSWlibcurl4-feature = CSWcurlrtfull
+CATALOGNAME_CSWcurlrtfull = curl_rt_full_stub
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibidn
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWosslrt
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWzlib
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibcares
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibssh2
+RUNTIME_DEP_PKGS_CSWcurl-feature += CSWlibfbopenssl
+
+PACKAGES += CSWlibcurl-dev
+CATALOGNAME_CSWlibcurl-dev = libcurl_dev
+SPKG_DESC_CSWlibcurl-dev = Development files for libcurl.so.4
+PKGFILES_CSWlibcurl-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibcurl-dev = CSWlibcurl4
+OBSOLETED_BY_CSWlibcurl-dev = CSWcurldevel
+CATALOGNAME_CSWcurldevel = curl_devel_stub
+
+PACKAGES += CSWcurl
+CATALOGNAME_CSWcurl = curl
+SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibnet
+RUNTIME_DEP_PKGS_CSWcurl += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWcurl += CSWzlib
+RUNTIME_DEP_PKGS_CSWcurl += CSWsasl
+RUNTIME_DEP_PKGS_CSWcurl += CSWcurlrt
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibcares
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibssh2
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibfbopenssl
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4
+
+BUILD_DEP_PKGS += CSWoldapdevel
+BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibcaresdevel
+BUILD_DEP_PKGS += CSWlibssh2devel
+
+VENDOR_URL = http://curl.haxx.se
+
EXTRA_MODULATORS = FEATURES
MODULATIONS_FEATURES = minimal full
-EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares
-EXTRA_CONFIGURE_ARGS_features-full = --enable-ares --with-spnego=$(libdir)
-EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap --enable-ldaps
+EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ldap
+EXTRA_CONFIGURE_ARGS_features-minimal += --without-libssh2
+EXTRA_CONFIGURE_ARGS_features-minimal += --disable-ares
+EXTRA_CONFIGURE_ARGS_features-full += --enable-ares
+EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir)
+EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap
+EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps
+
+# Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet
+EXTRA_LDFLAGS = -L$(libdir)/libnet-new
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl
CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs
@@ -50,17 +103,7 @@
BUILD64 = 1
-# We are doing 64 bit only for the libs
-NOISAEXEC = 1
-RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2
-RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib
-RUNTIME_DEP_PKGS_CSWcurlrtfull = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl
-RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl
-
-BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurlrtfull) $(RUNTIME_DEP_PKGS_CSWcurldevel))
-BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel
-
SKIPTEST = 1
# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full
@@ -69,10 +112,16 @@
# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw
EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p"
EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p"
-EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p"
-EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p"
EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL))
+# EXTRA_PAX_ARGS_32 += -s ",.*/libcurl\.so(\.\d+)?$$,$(libdir)/libcurl-$(FEATURES).so.4.2.0,p"
+# EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p"
+
+EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
+EXTRA_PAX_ARGS_isa-amd64-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
+
# We select pkgconfig for minimal library bindings. As libneon is self-contained (links
# to all necessary libs directly) the full version can simly be linked in.
EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,,"
@@ -86,62 +135,21 @@
MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only
MERGE_DIRS_isa-default64-features-full = $(libdir)
-ALTERNATIVES_CSWcurlrt = minimal
-ALTERNATIVES_CSWcurlrtfull = full
-ALTERNATIVE_minimal = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-minimal.so.4.2.0 100
-ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-minimal.so.4.2.0
-ALTERNATIVE_full = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-full.so.4.2.0 200
-ALTERNATIVE_full += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-full.so.4.2.0
-
-PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWcurlrt = $(PKGFILES_RT)
-PKGFILES_CSWcurlrtfull = .*-full.*
-
-# recompile curl to link to new ldap, and temporarily include
-# the following block to make checkpkg happy. nothing in the curl
-# package changed, so it should be ok, no?
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet
-CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4']
-CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt
-CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives
-CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives
-CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']|
-
-# end checkpkg happiness section
-
include gar/category.mk
-post-install-isa-sparcv8-features-minimal:
- ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0
- ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2
- ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
- ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
+post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4
+post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal:
+ rm -f $(WORKSRC)/lib/libcurl.la
+ $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS)
@$(MAKECOOKIE)
-post-install-isa-i386-features-minimal:
- cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0
- cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2
- ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
- ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
- @$(MAKECOOKIE)
+post-merge:
+ @# This is needed because the substitutions from pax args do not change the
+ @# contents of the symlink
+ rm -f $(PKGROOT)$(libdir)/libcurl-feature.so.4
+ ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4
+ rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4
+ ln -s libcurl-feature.so.4.2.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4
post-merge:
ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h
Modified: csw/mgar/pkg/libcurl4/trunk/checksums
===================================================================
--- csw/mgar/pkg/curl/trunk/checksums 2011-04-28 00:39:23 UTC (rev 14426)
+++ csw/mgar/pkg/libcurl4/trunk/checksums 2011-04-28 20:56:30 UTC (rev 14452)
@@ -1 +1 @@
-ca96df88e044c7c25d19692ec8b250b2 curl-7.21.2.tar.bz2
+6611989a81ebd7b03a35adc3001ddee0 curl-7.21.6.tar.bz2
Added: csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch (rev 0)
+++ csw/mgar/pkg/libcurl4/trunk/files/0001-Use-stdint.h-only-when-it-is-available-fall-back-to-.patch 2011-04-28 20:56:30 UTC (rev 14452)
@@ -0,0 +1,30 @@
+From d3924ea3a11fe747edf84bd4e907ce17f61beaad Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 28 Apr 2011 19:34:10 +0200
+Subject: [PATCH] Use stdint.h only when it is available, fall back to inttypes.h
+
+---
+ docs/examples/anyauthput.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c
+index 6b3d74a..679b0f3 100644
+--- a/docs/examples/anyauthput.c
++++ b/docs/examples/anyauthput.c
+@@ -27,7 +27,12 @@
+ # ifdef __VMS
+ typedef int intptr_t;
+ # else
+-# include <stdint.h>
++# ifdef CURL_PULL_STDINT_H
++# include <stdint.h>
++# endif
++# ifdef CURL_PULL_INTTYPES_H
++# include <inttypes.h>
++# endif
+ # endif
+ # include <unistd.h>
+ #endif
+--
+1.7.3.2
+
Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.2.0.2.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/libcurl4/trunk/files/libcurl.so.3.0.0.s
===================================================================
(Binary files differ)
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