[csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sun Aug 7 22:48:07 CEST 2011
Revision: 15281
http://gar.svn.sourceforge.net/gar/?rev=15281&view=rev
Author: dmichelsen
Date: 2011-08-07 20:48:06 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
libiconv: Update to 1.14, remove old unused stuff
Modified Paths:
--------------
csw/mgar/pkg/libiconv/trunk/Makefile
csw/mgar/pkg/libiconv/trunk/checksums
csw/mgar/pkg/libiconv/trunk/files/changelog.CSW
Removed Paths:
-------------
csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README
csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec
csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff
csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff
Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-08-07 20:48:06 UTC (rev 15281)
@@ -4,7 +4,7 @@
# the upstream name and split off a devel pkg.
#
NAME = libiconv
-VERSION = 1.13.1
+VERSION = 1.14
CATEGORIES = lib
DESCRIPTION = GNU iconv library
@@ -19,8 +19,7 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+DISTFILES = $(DISTNAME).tar.gz
PACKAGES += CSWlibiconv2
CATALOGNAME_CSWlibiconv2 = libiconv2
@@ -57,23 +56,13 @@
# matter in any way as this library is only used for LD_PRELOAD and is never being
# linked against during compile time.
CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so
-CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0
+CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch
RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8
OBSOLETED_BY_CSWlibiconv-utils += CSWiconv
-NOISAEXEC = 1
BUILD64 = 1
-# Optimize. -fast causes ./configure on Sparc to hang on the stdbool.h test.
-# Patch the stdbool test away, stdbool is only available in C99 anyway.
-#
-# See the following posts for details
-# - http://lists.opencsw.org/pipermail/maintainers/2009-July/003152.html
-# - http://forums.sun.com/thread.jspa?threadID=5397065&tstart=0
-OPT_FLAGS_SOS = -fast -xnolibmopt
-PATCHFILES += patch-configure-stdbool.diff
-
# 'gmake test' shows three errors of coredumping printf's
#
# ./check-translitfailure . TranslitFail1 ISO-8859-1 ASCII
@@ -86,15 +75,12 @@
# 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
EXTRA_CPPFLAGS = -D_REENTRANT
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-rpath
-MERGE_DIRS_isa-extra = $(libdir)
-
include gar/category.mk
post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)
Modified: csw/mgar/pkg/libiconv/trunk/checksums
===================================================================
--- csw/mgar/pkg/libiconv/trunk/checksums 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/checksums 2011-08-07 20:48:06 UTC (rev 15281)
@@ -1 +1 @@
-7ab33ebd26687c744a37264a330bbe9a libiconv-1.13.1.tar.gz
+e34509b1623cec449dfeb73d7ce9c6c6 libiconv-1.14.tar.gz
Deleted: csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README 2011-08-07 20:48:06 UTC (rev 15281)
@@ -1,3 +0,0 @@
-Note: iconv is a transitional meta-package that pulls in libiconv and
-libiconvdevel. Please consider switching to one or both of these pkgs
-as iconv may be dropped in the future.
Deleted: csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec 2011-08-07 20:48:06 UTC (rev 15281)
@@ -1,4 +0,0 @@
-%var bitname libiconv
-%var pkgname CSWlibiconv
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYRIGHT
Modified: csw/mgar/pkg/libiconv/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/changelog.CSW 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/files/changelog.CSW 2011-08-07 20:48:06 UTC (rev 15281)
@@ -1,5 +1,13 @@
+libiconv (1.14,REV=2011.08.07)
+
+ * Fixed #4726
+ * Update to 1.14
+
+ -- Dagobert Michelsen <dam at opencsw.org> Sun, 08 Aug 2011 22:39:02 +0200
+
libiconv (1.13.1,REV=2009.07.31)
+
* Adopted and updated to 1.13.1. (Closes #2973, #3524, #3662)
-- Sebastian Kayser <skayser at opencsw.org> Fri, 31 Jul 2009 11:07:44 +0200
Deleted: csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff 2011-08-07 20:48:06 UTC (rev 15281)
@@ -1,135 +0,0 @@
-diff --speed-large-files --minimal -Nru libiconv-1.13.orig/configure libiconv-1.13/configure
---- libiconv-1.13.orig/configure 2009-03-26 13:10:59.000000000 +0100
-+++ libiconv-1.13/configure 2009-07-18 15:01:23.206092991 +0200
-@@ -20233,121 +20233,6 @@
- REPLACE_GETLINE=0;
- REPLACE_PERROR=0;
-
--{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
--$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
--if test "${ac_cv_header_stdbool_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
-- #include <stdbool.h>
-- #ifndef bool
-- "error: bool is not defined"
-- #endif
-- #ifndef false
-- "error: false is not defined"
-- #endif
-- #if false
-- "error: false is not 0"
-- #endif
-- #ifndef true
-- "error: true is not defined"
-- #endif
-- #if true != 1
-- "error: true is not 1"
-- #endif
-- #ifndef __bool_true_false_are_defined
-- "error: __bool_true_false_are_defined is not defined"
-- #endif
--
-- struct s { _Bool s: 1; _Bool t; } s;
--
-- char a[true == 1 ? 1 : -1];
-- char b[false == 0 ? 1 : -1];
-- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-- char d[(bool) 0.5 == true ? 1 : -1];
-- bool e = &s;
-- char f[(_Bool) 0.0 == false ? 1 : -1];
-- char g[true];
-- char h[sizeof (_Bool)];
-- char i[sizeof s.t];
-- enum { j = false, k = true, l = false * true, m = true * 256 };
-- _Bool n[m];
-- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-- #if defined __xlc__ || defined __GNUC__
-- /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-- reported by James Lemley on 2005-10-05; see
-- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-- This test is not quite right, since xlc is allowed to
-- reject this program, as the initializer for xlcbug is
-- not one of the forms that C requires support for.
-- However, doing the test right would require a run-time
-- test, and that would make cross-compilation harder.
-- Let us hope that IBM fixes the xlc bug, and also adds
-- support for this kind of constant expression. In the
-- meantime, this test will reject xlc, which is OK, since
-- our stdbool.h substitute should suffice. We also test
-- this with GCC, where it should work, to detect more
-- quickly whether someone messes up the test in the
-- future. */
-- char digs[] = "0123456789";
-- int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-- #endif
-- /* Catch a bug in an HP-UX C compiler. See
-- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-- */
-- _Bool q = true;
-- _Bool *pq = &q;
--
--int
--main ()
--{
--
-- *pq |= q;
-- *pq |= ! q;
-- /* Refer to every declared value, to avoid compiler optimizations. */
-- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-- + !m + !n + !o + !p + !q + !pq);
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_header_stdbool_h=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_header_stdbool_h=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
- $as_echo "$ac_cv_header_stdbool_h" >&6; }
- { $as_echo "$as_me:$LINENO: checking for _Bool" >&5
-@@ -20525,7 +20525,7 @@
-
- fi
-
-- if test $ac_cv_header_stdbool_h = yes; then
-+ if test "$ac_cv_header_stdbool_h" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_STDBOOL_H 1
-
Deleted: csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff
===================================================================
--- csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff 2011-08-06 10:14:21 UTC (rev 15280)
+++ csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff 2011-08-07 20:48:06 UTC (rev 15281)
@@ -1,17 +0,0 @@
-diff --speed-large-files --minimal -Nru libiconv-1.12.orig/configure libiconv-1.12/configure
---- libiconv-1.12.orig/configure 2007-11-11 17:46:26.000000000 +0100
-+++ libiconv-1.12/configure 2008-02-29 12:28:46.258785000 +0100
-@@ -25733,13 +25733,6 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Test preprocessor. */
-- #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-- error in preprocessor;
-- #endif
-- #if ! (18446744073709551615ULL <= -1ull)
-- error in preprocessor;
-- #endif
- /* Test literals. */
- long long int ll = 9223372036854775807ll;
- long long int nll = -9223372036854775807LL;
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