[csw-devel] SF.net SVN: gar:[5509] csw/mgar/pkg/libiconv/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Sun Jul 5 01:39:39 CEST 2009
Revision: 5509
http://gar.svn.sourceforge.net/gar/?rev=5509&view=rev
Author: skayser
Date: 2009-07-04 23:39:39 +0000 (Sat, 04 Jul 2009)
Log Message:
-----------
libiconv: simplify build now that ggettext has been bootstrapped
Modified Paths:
--------------
csw/mgar/pkg/libiconv/trunk/Makefile
csw/mgar/pkg/libiconv/trunk/checksums
Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile 2009-07-04 23:28:17 UTC (rev 5508)
+++ csw/mgar/pkg/libiconv/trunk/Makefile 2009-07-04 23:39:39 UTC (rev 5509)
@@ -1,152 +1,69 @@
GARNAME = libiconv
-GARVERSION = 1.12
+GARVERSION = 1.13
CATEGORIES = lib
-GETTEXTNAME = gettext
-GETTEXTVERSION = 0.17
-
DESCRIPTION = GNU iconv library
define BLURB
+ Some programs, like mailers and web browsers, must be able to convert
+ between a given text encoding and the user's encoding. Other programs
+ internally store strings in Unicode, to facilitate internal processing,
+ and need to convert between internal string representation (Unicode) and
+ external string representation (a traditional encoding) when they are
+ doing I/O. GNU libiconv is a conversion library for both kinds of
+ applications.
endef
MASTER_SITES = $(GNU_MIRROR)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(GETTEXTNAME)-$(GETTEXTVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWlibiconv,)
-
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-# Work around Sun Studio Preprocessor bug #6655406
-# http://sunsolve.sun.com/search/document.do?assetkey=1-1-6655406-1
-PATCHFILES = patch-workaround-cc-bug-6655406.diff
+# Package naming is a bit unfortunate CSWiconv vs. libiconv :/ but
+# that's not something i want to change right now. CSWiconv has
+# heaps of dependents.
+PACKAGES = CSWiconv CSWiconvdevel
-# BUILD64 = 1
+CATALOGNAME_CSWiconv = libiconv
+CATALOGNAME_CSWiconvdevel = libiconv_devel
-GETTEXTDISTNAME = $(GETTEXTNAME)-$(GETTEXTVERSION)
+SPKG_DESC_CSWiconv = GNU iconv library
+SPKG_DESC_CSWiconvdevel = GNU iconv library development pacakge
-default: build
- $(DONADA)
+PKGFILES_CSWiconvdevel = $(PKGFILES_DEVEL) *.3.html
+# All other unspecified files go into CSWlibiconv
-# -- Bootstrap --
-# There may not be a working gettext installation on the build system.
-# For a fully working libiconv it must be compiled against gettext which
-# itself has been compiled against libiconv. The bootstrap-compile is
-# therefore done in three steps:
-# 1. standalone libiconv
-# 2. gettext with newly build libiconv
-# 3. libiconv again with fully build gettext
+# Dependencies:
+# Some of the utility programs 'depend' on ggettext.
+# But DO NOT put CSWggettext in depend, or it will break things!!!
+# Read: Circular dependency between ggettextrt and libiconv
-BOOTSTRAPDIR = $(WORKDIR)/bootstrap
-BOOTSTRAPCOOKIEDIR = $(BOOTSTRAPDIR)/cookies
-BOOTSTRAPBUILDDIR = $(BOOTSTRAPDIR)/build
-BOOTSTRAPINSTALLDIR = $(abspath $(BOOTSTRAPDIR)/instroot)
+REQUIRED_PKGS_CSWiconvdevel = CSWiconv
-# Extract libiconv and gettext for bootstrap and apply patches
-extract-bootstrap:
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- EXTRACTDIR=$(BOOTSTRAPBUILDDIR) \
- $(MAKE) extract
- $(MAKECOOKIE)
+# Work around Sun Studio Preprocessor bug #6655406
+# http://sunsolve.sun.com/search/document.do?assetkey=1-1-6655406-1
+#PATCHFILES = patch-workaround-cc-bug-6655406.diff
-patch-libiconv: extract-bootstrap
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- WORKSRC=$(BOOTSTRAPBUILDDIR)/$(DISTNAME) \
- $(MAKE) patch
- $(MAKECOOKIE)
+BUILD64 = 1
-configure-libiconv: patch-libiconv
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- CONFIGURE_ARGS="--prefix=$(BOOTSTRAPINSTALLDIR) --disable-nls" \
- $(MAKE) configure-$(BOOTSTRAPBUILDDIR)/$(DISTNAME)/configure
- $(MAKECOOKIE)
-
-build-libiconv: configure-libiconv
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- $(MAKE) build-$(BOOTSTRAPBUILDDIR)/$(DISTNAME)/Makefile
- $(MAKECOOKIE)
-
-test-libiconv: build-libiconv
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- $(MAKE) test-$(BOOTSTRAPBUILDDIR)/$(DISTNAME)/Makefile
- $(MAKECOOKIE)
-
-install-libiconv: test-libiconv
- cd $(BOOTSTRAPBUILDDIR)/$(DISTNAME) && \
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- $(MAKE) install
- $(MAKECOOKIE)
-
-
-patch-gettext: extract-bootstrap
- @$(MAKECOOKIE)
-
-configure-gettext: install-libiconv patch-gettext
- @# Add -lsec, otherweise acl_trivial can not be found
- @# See gettext bug #21604 for details
- @# http://savannah.gnu.org/bugs/?21604
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- $(MAKE) configure-$(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME)/configure \
- LDFLAGS=-lsec base_prefix=$(BOOTSTRAPINSTALLDIR)
- @$(MAKECOOKIE)
-
-build-gettext: configure-gettext
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- $(MAKE) build-$(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME)/Makefile
- @$(MAKECOOKIE)
-
-test-gettext: build-gettext
- if [ -z "${SKIPTEST}" ]; then \
- cd $(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME) && gmake check; \
- fi
- @$(MAKECOOKIE)
-
-install-gettext: test-gettext
- cd $(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME) && \
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- $(MAKE) install
- @$(MAKECOOKIE)
-
-clean-source-gettext:
- cd $(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME) && \
- COOKIEDIR=$(BOOTSTRAPCOOKIEDIR) \
- gmake clean
- -rm $(COOKIEDIR)/configure-gettext
- -rm $(BOOTSTRAPCOOKIEDIR)/configure-$(BOOTSTRAPBUILDDIR)/$(GETTEXTDISTNAME)/configure
-
-bootstrap: install-libiconv install-gettext
- @$(MAKECOOKIE)
-
-pre-configure: bootstrap
-
-# Don't use libs in /opt/csw/lib or old libiconv.so will get picked up
-EXT_LDFLAGS =
-EXTRA_CFLAGS = -I$(BOOTSTRAPINSTALLDIR)/include
-EXTRA_LDFLAGS = -L$(BOOTSTRAPINSTALLDIR)/lib
-CONFIGURE_ARGS ?= $(DIRPATHS)
-
# 'gmake test' shows three errors of coredumping printf's
+#
+# ./check-translitfailure . TranslitFail1 ISO-8859-1 ASCII
+# ./check-subst
+# Segmentation Fault - core dumped
+# Segmentation Fault - core dumped
+# Segmentation Fault - core dumped
+# ./test-shiftseq
+#
# This is due to bug #6550204
# http://sunsolve.sun.com/search/document.do?assetkey=1-1-6550204-1
# and can safely be ignored as it is a failure in the testsuite.
TEST_TARGET = check
-CLEAN_SCRIPTS = all bootstrap
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-rpath
-clean-bootstrap:
- @echo " ==> Cleaning bootstrap"
- @rm -rf $(BOOTSTRAPDIR)
-
include gar/category.mk
-# Bootstrap:
-# # Use gxgettext instead of xgettext, gmsgmerge instead of msgmerge
-# PATH=/opt/csw/gnu:$PATH
-# cd libiconv-1.12
-# ./configure --prefix=/root/automatic-multiarch-compile/lib/libiconv/tmp/instroot --disable-nls
-# gmake && gmake install
-# cd ../gettext-0.17
-# # Add -lsec, otherweise acl_trivial can not be found
-# # See bug #21604 for details
-# # http://savannah.gnu.org/bugs/?21604
-# LDFLAGS=-lsec ./configure --prefix=/root/automatic-multiarch-compile/lib/libiconv/tmp/instroot
-# gmake && gmake install
+post-install-modulated:
+ ginstall -D $(WORKSRC)/srcm4/iconv.m4 \
+ $(DESTDIR)$(datadir)/aclocal/iconv.m4
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/libiconv/trunk/checksums
===================================================================
--- csw/mgar/pkg/libiconv/trunk/checksums 2009-07-04 23:28:17 UTC (rev 5508)
+++ csw/mgar/pkg/libiconv/trunk/checksums 2009-07-04 23:39:39 UTC (rev 5509)
@@ -1,4 +1,2 @@
-c2be282595751535a618ae0edeb8f648 download/libiconv-1.12.tar.gz
-58a2bc6d39c0ba57823034d55d65d606 download/gettext-0.17.tar.gz
-84ac87a6e3e82a6749815d030f9f966c download/CSWlibiconv.gspec
+048032a3032ebd182150bdee30a5d533 download/libiconv-1.13.tar.gz
8a4c4cc08a021936cb72538b6e26ce61 download/patch-workaround-cc-bug-6655406.diff
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