[csw-devel] SF.net SVN: gar:[2493] csw/branches/dam/automatic-multiarch-compile/lib/ expat
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Dec 9 17:18:17 CET 2008
Revision: 2493
http://gar.svn.sourceforge.net/gar/?rev=2493&view=rev
Author: dmichelsen
Date: 2008-12-09 16:18:16 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
multiISA expat: Move to mGAR v2
Modified Paths:
--------------
csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile
csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums
Added Paths:
-----------
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff
Removed Paths:
-------------
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.depend
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.4.0
csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.5.0
Modified: csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile 2008-12-09 16:17:34 UTC (rev 2492)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile 2008-12-09 16:18:16 UTC (rev 2493)
@@ -1,5 +1,8 @@
GARNAME = expat
-GARVERSION = 2.0.0
+PKGVERSION ?= 2.0.1
+EXTRA_MODULATORS = PKGVERSION
+MODULATIONS_PKGVERSION = 1.95.8 2.0.1
+GARVERSION ?= $(PKGVERSION)
CATEGORIES = lib
DESCRIPTION = XML Parser Toolkit
@@ -10,15 +13,17 @@
endef
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWexpat,depend prototype)
-DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype)
+DISTFILES = $(foreach VERSION,$(MODULATIONS_PKGVERSION),$(GARNAME)-$(VERSION).tar.gz)
+DISTFILES += $(call admfiles,CSWexpat,)
-# Compatibility libraries
-EXTLIBS += libexpat.so.0.4.0
-EXTLIBS += libexpat.so.0.5.0
-DISTFILES += $(EXTLIBS)
+# From
+# https://sourceforge.net/tracker/?func=detail&atid=110127&aid=1217217&group_id=10127
+# http://expat.cvs.sourceforge.net/viewvc/expat/expat/Makefile.in?r1=1.47&r2=1.48
+PATCHFILES-pkgversion-1.95.8 = patch-libexpat-1.95.8-destdir.diff
+PATCHFILES = $(PATCHFILES-pkgversion-$(PKGVERSION))
+BUILD64 = 1
+
# The expat 'check' target tries to compile tests that use GCC
# constructs -- won't compile under Forte without hackery.
TEST_TARGET = check
@@ -26,9 +31,13 @@
CONFIGURE_ARGS = $(DIRPATHS)
+MERGE_SCRIPTS_isa-i386-pkgversion-1.95.8 = copy-only
+MERGE_DIRS_isa-i386-pkgversion-1.95.8 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-pkgversion-1.95.8 = copy-relocated-only
+MERGE_DIRS_isa-amd64-pkgversion-1.95.8 = $(libdir)
+
+MERGE_SCRIPTS_isa-i386-pkgversion-2.0.1 = copy-all
+MERGE_SCRIPTS_isa-amd64-pkgversion-2.0.1 = copy-relocated-only
+MERGE_DIRS_isa-amd64-pkgversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+
include ../category.mk
-
-post-install:
- @for extlib in $(EXTLIBS) ; do \
- install -m 0755 $(WORKDIR)/$$extlib $(DESTDIR)$(libdir) ; \
- done
Modified: csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums 2008-12-09 16:17:34 UTC (rev 2492)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums 2008-12-09 16:18:16 UTC (rev 2493)
@@ -1,9 +1,9 @@
-d945df7f1c0868c5c73cf66ba9596f3f download/expat-2.0.0.tar.gz
+aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz
+ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz
7145f62799b8019b4636811f22eed0dc download/CSWexpat.gspec
-8093298b67861e241b0d2499c9f2ff89 download/CSWexpat.depend
-442c9a9124f9700d5156bf24baf8491b download/CSWexpat.prototype
+d41d8cd98f00b204e9800998ecf8427e download/CSWexpat.depend
+2ee9a8ce89f28371461302eea3a706ce download/CSWexpat.prototype
2fb9c175c9f5d1e21f0531c1cada0994 download/CSWexpat-devel.gspec
-3dfca43e9c14ab646c8aadfc59093ba3 download/CSWexpat-devel.depend
-7638ec36b2ae51da9b300bee9a18d349 download/CSWexpat-devel.prototype
-0d36c0738fa471a0fcae0cd565016295 download/libexpat.so.0.4.0
-b52745e58a5dab5df7a459d25d54d65d download/libexpat.so.0.5.0
+9c8bed940180401cb0bfcd7761ad5c1a download/CSWexpat-devel.depend
+d99c92a8836db5f6baedec6912a968fb download/CSWexpat-devel.prototype
+da9dfd74eb2b44102d137ff1d0993842 download/patch-libexpat-1.95.8-destdir.diff
Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend 2008-12-09 16:17:34 UTC (rev 2492)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend 2008-12-09 16:18:16 UTC (rev 2493)
@@ -1 +0,0 @@
-P CSWexpat expat - XML Parser Toolkit
Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec 2008-12-09 16:17:34 UTC (rev 2492)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec 2008-12-09 16:18:16 UTC (rev 2493)
@@ -1,5 +0,0 @@
-%var bitname expat_devel
-%var pkgname CSWexpat-devel
-%var desc XML Parsing Toolkit - Development Support
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype 2008-12-09 16:17:34 UTC (rev 2492)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype 2008-12-09 16:18:16 UTC (rev 2493)
@@ -1,6 +0,0 @@
-d none /opt/csw/include 0755 root bin
-f none /opt/csw/include/expat.h 0644 root bin
-f none /opt/csw/include/expat_external.h 0644 root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libexpat.a 0644 root bin
-f none /opt/csw/lib/libexpat.la 0755 root bin
Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype 2008-12-09 16:17:34 UTC (rev 2492)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype 2008-12-09 16:18:16 UTC (rev 2493)
@@ -1,13 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/xmlwf 0755 root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libexpat.so.0.4.0 0755 root bin
-f none /opt/csw/lib/libexpat.so.0.5.0 0755 root bin
-s none /opt/csw/lib/libexpat.so.0=libexpat.so.0.5.0
-f none /opt/csw/lib/libexpat.so.1.5.0 0755 root bin
-s none /opt/csw/lib/libexpat.so.1=libexpat.so.1.5.0
-s none /opt/csw/lib/libexpat.so=libexpat.so.1.5.0
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/xmlwf.1 0644 root bin
Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.4.0
===================================================================
(Binary files differ)
Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.5.0
===================================================================
(Binary files differ)
Added: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff (rev 0)
+++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff 2008-12-09 16:18:16 UTC (rev 2493)
@@ -0,0 +1,46 @@
+diff -Naur expat-1.95.8.orig/Makefile.in expat-1.95.8.patch/Makefile.in
+--- expat-1.95.8.orig/Makefile.in 2004-05-07 22:00:48.000000000 +0200
++++ expat-1.95.8.patch/Makefile.in 2008-10-08 21:37:37.308957000 +0200
+@@ -44,6 +44,9 @@
+ APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
+ LIBRARY = libexpat.la
+
++ifndef INSTALL_ROOT
++INSTALL_ROOT=$(DESTDIR)
++endif
+
+ default: buildlib xmlwf/xmlwf
+
+@@ -73,22 +76,22 @@
+ tests/runtests
+
+ install: xmlwf/xmlwf installlib
+- $(mkinstalldirs) $(bindir) $(man1dir)
+- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
+- $(INSTALL_DATA) $(MANFILE) $(man1dir)
++ $(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf
++ $(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir)
+
+ installlib: $(LIBRARY) $(APIHEADER)
+- $(mkinstalldirs) $(libdir) $(includedir)
+- $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
+- $(INSTALL_DATA) $(APIHEADER) $(includedir)
++ $(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir)
++ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY)
++ for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done
+
+ uninstall: uninstalllib
+- $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
+- rm -f $(man1dir)/xmlwf.1
++ $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf
++ rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1
+
+ uninstalllib:
+- $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
+- rm -f $(includedir)/$(APIHEADER)
++ $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY)
++ rm -f $(INSTALL_ROOT)$(includedir)/$(APIHEADER)
+
+ # for VPATH builds (invoked by configure)
+ mkdir-init:
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