[csw-devel] SF.net SVN: gar:[12169] csw/mgar/pkg/libicu/branches

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Jan 4 13:06:36 CET 2011


Revision: 12169
          http://gar.svn.sourceforge.net/gar/?rev=12169&view=rev
Author:   dmichelsen
Date:     2011-01-04 12:06:36 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
libicu/libicu42: Make soname-specific branch

Modified Paths:
--------------
    csw/mgar/pkg/libicu/branches/libicu42/Makefile
    csw/mgar/pkg/libicu/branches/libicu42/checksums

Added Paths:
-----------
    csw/mgar/pkg/libicu/branches/libicu42/

Modified: csw/mgar/pkg/libicu/branches/libicu42/Makefile
===================================================================
--- csw/mgar/pkg/libicu/trunk/Makefile	2011-01-04 02:19:21 UTC (rev 12164)
+++ csw/mgar/pkg/libicu/branches/libicu42/Makefile	2011-01-04 12:06:36 UTC (rev 12169)
@@ -1,46 +1,48 @@
 # $Id$
 NAME = libicu
-VERSION = 4.4.1
+VERSION = 4.2.1
 CATEGORIES = lib
 
 DESCRIPTION = International Components for Unicode
 define BLURB
 endef
 
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 4.2.1 4.4.1
-
-SKIP_MODULATIONS  = isa-sparcv9-garversion-4.2.1
-SKIP_MODULATIONS += isa-amd64-garversion-4.2.1
-
-# filename = icu4c-$(shell echo $(1) | tr '.' '_')-src.tgz
 _V-4.2.1 = 4_2_1
-_V-4.4.1 = 4_4_1
 filename = icu4c-$(_V-$(1))-src.tgz
 
-MASTER_SITES = $(addsuffix /,$(addprefix http://download.icu-project.org/files/icu4c/,$(MODULATIONS_VERSION)))
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(call filename,$(VERSION)))
+MASTER_SITES = $(addsuffix /,$(addprefix http://download.icu-project.org/files/icu4c/,$(VERSION)))
+SOURCEFILES = $(call filename,$(VERSION))
 DISTFILES  = $(SOURCEFILES)
 
 # icu-config is broken with ECHO_N/ECHO_C detection:
 #   http://bugs.icu-project.org/trac/ticket/7768
 PATCHFILES = 0001-Add-workaround-for-echo-n.patch
 
-NOEXTRACT = $(filter-out $(call filename,$(VERSION)),$(SOURCEFILES))
-
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:_\d+)*)-src.tgz
 
-PACKAGES = CSWlibicu CSWlibicudevel
+PACKAGES += CSWlibicu42
+CATALOGNAME_CSWlibicu42 = libicu42
+SPKG_DESC_CSWlibicu42 = International Components for Unicode, libicu*.so.42
 
-CATALOGNAME_CSWlibicu      = libicu
-CATALOGNAME_CSWlibicudevel = libicu_devel
+# These are ok. As they are all used and bundled together they are also
+# released together in one soname-specific package.
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicudata.so.42.1|soname=libicudata.so.42|pkgname=CSWlibicu42|expected=CSWlibicudata42
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicui18n.so.42.1|soname=libicui18n.so.42|pkgname=CSWlibicu42|expected=CSWlibicui18n42
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicuio.so.42.1|soname=libicuio.so.42|pkgname=CSWlibicu42|expected=CSWlibicuio42
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicule.so.42.1|soname=libicule.so.42|pkgname=CSWlibicu42|expected=CSWlibicule42
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libiculx.so.42.1|soname=libiculx.so.42|pkgname=CSWlibicu42|expected=CSWlibiculx42
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicutu.so.42.1|soname=libicutu.so.42|pkgname=CSWlibicu42|expected=CSWlibicutu42
+CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicuuc.so.42.1|soname=libicuuc.so.42|pkgname=CSWlibicu42|expected=CSWlibicuuc42
 
-SPKG_DESC_CSWlibicu      = International Components for Unicode
-SPKG_DESC_CSWlibicudevel = Development Files for libicu
+PACKAGES += CSWlibicu
+CATALOGNAME_CSWlibicu = libicu
+SPKG_DESC_CSWlibicu = Stub as contents moved to library-specific legacy CSWlibicu42
+RUNTIME_DEP_PKGS_CSWlibicu = CSWlibicu42
+CHECKPKG_OVERRIDES_CSWlibicu += surplus-dependency|CSWlibicu42
+PKGFILES_CSWlibicu = NOFILES
+ARCHALL_CSWlibicu = 1
 
-RUNTIME_DEP_PKGS_CSWlibicudevel += CSWlibicu
-
 LICENSE = license.html
 
 VENDOR_URL = http://icu-project.org/
@@ -57,26 +59,8 @@
 # packages using the libs will bail out as they assume the libs are self-contained.
 LINKER_FLAGS = -lCrun -lCstd
 
-BUILD64 = 1
-NOISAEXEC = 1
-NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-default-garversion-4.2.1 = copy-only
-MERGE_DIRS_isa-default-garversion-4.2.1 = $(libdir)
+PKGFILES_CSWlibicu42 = $(call baseisadirs,$(libdir),libicu.*\.so\.42(\.\d+)*)
 
-MERGE_SCRIPTS_isa-default-garversion-4.4.1 = copy-all
-MERGE_SCRIPTS_isa-default64-garversion-4.4.1 = copy-relocated-only copy-config-only
-MERGE_DIRS_isa-default64-garversion-4.4.1 = $(libdir)
-
-PKGFILES_CSWlibicu = $(PKGFILES_RT)
-
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicui18n.so.44.1
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicule.so.44.1
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libiculx.so.44.1
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicuuc.so.44.1
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicutu.so.44.1
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicuio.so.44.1
-CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicutest.so.44.1
-
 include gar/category.mk

Modified: csw/mgar/pkg/libicu/branches/libicu42/checksums
===================================================================
--- csw/mgar/pkg/libicu/trunk/checksums	2011-01-04 02:19:21 UTC (rev 12164)
+++ csw/mgar/pkg/libicu/branches/libicu42/checksums	2011-01-04 12:06:36 UTC (rev 12169)
@@ -1,3 +1 @@
-0c9e587cf8dced7405c361c9cd81d98e  0001-Add-workaround-for-echo-n.patch
 e3738abd0d3ce1870dc1fd1f22bba5b1  icu4c-4_2_1-src.tgz
-b6bc0a1153540b2088f8b03e0ba625d3  icu4c-4_4_1-src.tgz


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