[58655] trunk/dports/devel/icu
nox at macports.org
nox at macports.org
Fri Oct 2 04:09:31 PDT 2009
Revision: 58655
http://trac.macports.org/changeset/58655
Author: nox at macports.org
Date: 2009-10-02 04:09:28 -0700 (Fri, 02 Oct 2009)
Log Message:
-----------
icu:
* Enable universal support (closes #21421).
* Enable parallel building (was fixed upstream in ICU 4.3).
Modified Paths:
--------------
trunk/dports/devel/icu/Portfile
Added Paths:
-----------
trunk/dports/devel/icu/files/patch-config-mh-darwin.diff
trunk/dports/devel/icu/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/devel/icu/files/patch-source_configure.diff
Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile 2009-10-02 07:54:13 UTC (rev 58654)
+++ trunk/dports/devel/icu/Portfile 2009-10-02 11:09:28 UTC (rev 58655)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
name icu
set my_name icu4c
@@ -23,7 +24,6 @@
distname ${my_name}-[join [split ${version} .] _]
extract.suffix .tgz
distfiles [suffix ${distname}-src]
-patchfiles patch-source_configure.diff
checksums ${distname}-src.tgz \
md5 10d1cdc843f8e047fc308ec49d3d0543 \
@@ -37,6 +37,9 @@
worksrcdir ${name}/source
set docdir ${prefix}/share/doc/${name}-${version}
+patchfiles patch-configure.diff \
+ patch-config-mh-darwin.diff
+
post-patch {
reinplace "s;install_name ;install_name ${prefix}/lib/;" ${worksrcpath}/config/mh-darwin
}
@@ -56,7 +59,7 @@
build.type gnu
-use_parallel_build no
+use_parallel_build yes
test.run yes
test.target check
@@ -66,15 +69,10 @@
file attributes ${dylib} -permissions 0755
}
- # The following line is a workaround to avoid installing improper (stub) version of libsicudata.a.
- xinstall -m 0644 ${worksrcpath}/lib/libsicudata.a ${destroot}${prefix}/lib
-
xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath}/.. readme.html ${destroot}${docdir}
}
-universal_variant no
-
variant doc description {Install extra documentation} {
extract.only [suffix ${distname}-src]
distfiles-append ${distname}-docs.zip
Added: trunk/dports/devel/icu/files/patch-config-mh-darwin.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-config-mh-darwin.diff (rev 0)
+++ trunk/dports/devel/icu/files/patch-config-mh-darwin.diff 2009-10-02 11:09:28 UTC (rev 58655)
@@ -0,0 +1,12 @@
+--- config/mh-darwin.orig 2009-10-02 12:56:30.000000000 +0200
++++ config/mh-darwin 2009-10-02 12:57:01.000000000 +0200
+@@ -31,6 +31,9 @@
+ LD_RPATH=
+ LD_RPATH_PRE=
+
++# The stubdata directory is the same directory as the normal data library.
++STUBDATA_LIBDIR = $(LIBDIR)/
++
+ ## Environment variable to set a runtime search path
+ LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH
+
Added: trunk/dports/devel/icu/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-configure.diff (rev 0)
+++ trunk/dports/devel/icu/files/patch-configure.diff 2009-10-02 11:09:28 UTC (rev 58655)
@@ -0,0 +1,75 @@
+--- configure.orig 2009-10-02 11:50:49.000000000 +0200
++++ configure 2009-10-02 11:54:38.000000000 +0200
+@@ -7034,52 +7034,6 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_c_bigendian=unknown
+- # See if we're dealing with a universal compiler.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifndef __APPLE_CC__
+- not a universal capable compiler
+- #endif
+- typedef int dummy;
+-
+-_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
+-
+- # Check for potential -arch flags. It is not universal unless
+- # there are some -arch flags. Note that *ppc* also matches
+- # ppc64. This check is also rather less than ideal.
+- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
+- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+- esac
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -7418,19 +7372,6 @@
+ ;; #(
+ no)
+ ;; #(
+- universal)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
+-_ACEOF
+-
+- ;; #(
+- *)
+- { { $as_echo "$as_me:$LINENO: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-$as_echo "$as_me: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+- { (exit 1); exit 1; }; } ;;
+ esac
+
+ if test $ac_cv_c_bigendian = no; then
Deleted: trunk/dports/devel/icu/files/patch-source_configure.diff
===================================================================
--- trunk/dports/devel/icu/files/patch-source_configure.diff 2009-10-02 07:54:13 UTC (rev 58654)
+++ trunk/dports/devel/icu/files/patch-source_configure.diff 2009-10-02 11:09:28 UTC (rev 58655)
@@ -1,15 +0,0 @@
---- ./configure.orig 2009-07-02 03:51:26.000000000 +0900
-+++ ./configure 2009-08-16 16:15:49.000000000 +0900
-@@ -7058,11 +7058,8 @@
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
-- # Check for potential -arch flags. It is not universal unless
-- # there are some -arch flags. Note that *ppc* also matches
-- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
-- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-+ *-arch*ppc*) ac_cv_c_bigendian=yes;;
- esac
- else
- $as_echo "$as_me: failed program was:" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091002/7b348672/attachment.html>
More information about the macports-changes
mailing list