[csw-devel] SF.net SVN: gar:[14457] csw/mgar/pkg/libcurl4/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14457
          http://gar.svn.sourceforge.net/gar/?rev=14457&view=rev
Author:   dmichelsen
Date:     2011-04-29 10:01:30 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
libcurl4: Dynamically generate curlbuild.h

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

Removed Paths:
-------------
    csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2011-04-29 09:41:42 UTC (rev 14456)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2011-04-29 10:01:30 UTC (rev 14457)
@@ -15,7 +15,6 @@
 
 MASTER_SITES = http://curl.haxx.se/download/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += curlbuild.h
 
 # Use patch until this is fixed:
 #   https://sourceforge.net/tracker/?func=detail&aid=3294509&group_id=976&atid=100976
@@ -103,20 +102,12 @@
 
 BUILD64 = 1
 
+# There are some failing tests, ignore for now
+SKIPTEST ?= 1
 
-SKIPTEST = 1
+# We do special 32/64 merging for this one, see post-merge
+EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h
 
-# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full
-
-# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h
-# 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 = $(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"
@@ -150,5 +141,10 @@
 	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
-	ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h
+	pwd
+	gdiff -D 64bit \
+		$(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)-features-minimal$(includedir)/curl/curlbuild.h \
+		$(WORKROOTDIR)/install-isa-$(ISA_DEFAULT)-features-minimal$(includedir)/curl/curlbuild.h \
+		| sed -e 's/ifndef 64bit/if defined __amd64 || defined __x86_64 || defined __sparcv9/' \
+		> $(PKGROOT)$(includedir)/curl/curlbuild.h
 	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h	2011-04-29 09:41:42 UTC (rev 14456)
+++ csw/mgar/pkg/libcurl4/trunk/files/curlbuild.h	2011-04-29 10:01:30 UTC (rev 14457)
@@ -1,6 +0,0 @@
-/* Allow 32 and 64 bit headers to coexist */
-#if defined __amd64 || defined __x86_64 || defined __sparcv9
-#include "curlbuild-64.h"
-#else
-#include "curlbuild-32.h"
-#endif


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