From 53fda7ed84a644a4ac06cebf197f3a8095ba98e4 Mon Sep 17 00:00:00 2001 From: sevan Date: Mon, 31 Aug 2015 15:26:18 +0000 Subject: Unbreak on Bitrig by adding necessary parts to autoconf related files Add Bitrig to runConfigure script http://bugs.icu-project.org/trac/ticket/11881 http://bugs.icu-project.org/trac/ticket/11882 --- textproc/icu/Makefile | 4 ++-- textproc/icu/distinfo | 10 +++++----- textproc/icu/patches/patch-acinclude.m4 | 14 ++++++++++++-- textproc/icu/patches/patch-af | 8 +++++--- textproc/icu/patches/patch-configure | 27 +++++++++++++++++++++++---- textproc/icu/patches/patch-configure.ac | 20 +++++++++++++++----- 6 files changed, 62 insertions(+), 21 deletions(-) (limited to 'textproc/icu') diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 59fdb5ebe01..b0ff7295179 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2015/04/06 07:22:54 adam Exp $ +# $NetBSD: Makefile,v 1.98 2015/08/31 15:26:18 sevan Exp $ DISTNAME= icu4c-55_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} @@ -55,7 +55,7 @@ PLIST_SUBST+= MH_NAME=mh-linux-va PLIST_SUBST+= MH_NAME=mh-linux .elif ${OPSYS} == "Cygwin" PLIST_SUBST+= MH_NAME=mh-cygwin -.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" +.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Bitrig" PLIST_SUBST+= MH_NAME=mh-bsd-gcc .elif ${OPSYS} == "AIX" . if !empty(CC_VERSION:Mgcc*) diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 168f525431d..14df3360f2c 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2015/04/06 07:22:54 adam Exp $ +$NetBSD: distinfo,v 1.54 2015/08/31 15:26:18 sevan Exp $ SHA1 (icu4c-55_1-src.tgz) = 3bb301c11be0e239c653e8aa2925c53f6f4dc88d RMD160 (icu4c-55_1-src.tgz) = 94dcaaac13b41de3588b01f39febe1b1cbd5765d @@ -6,9 +6,9 @@ Size (icu4c-55_1-src.tgz) = 25600847 bytes SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 -SHA1 (patch-acinclude.m4) = ab757e9bf7351e44edd92b96edbffc40acb44dae +SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 -SHA1 (patch-af) = 6f41d58f258361e28ce3283e1b46f8a762b7c5dd +SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a SHA1 (patch-common_putil.cpp) = 3d35bdea709ded1ae5926729fb23995ca8734687 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c @@ -16,6 +16,6 @@ SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63 SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 -SHA1 (patch-configure) = 2d17823ee06693ce382745ce345eca37001a0a7c -SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1 +SHA1 (patch-configure) = 430389c77d35b93f1831e0444598eb86f61e315b +SHA1 (patch-configure.ac) = babf9edd0bef353e9fb8c47917658c0a65af5a36 SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e diff --git a/textproc/icu/patches/patch-acinclude.m4 b/textproc/icu/patches/patch-acinclude.m4 index 69e45bbcefb..5ed5c50cbb6 100644 --- a/textproc/icu/patches/patch-acinclude.m4 +++ b/textproc/icu/patches/patch-acinclude.m4 @@ -1,9 +1,19 @@ -$NetBSD: patch-acinclude.m4,v 1.3 2014/10/07 16:09:53 adam Exp $ +$NetBSD: patch-acinclude.m4,v 1.4 2015/08/31 15:26:19 sevan Exp $ Solaris seems to need -std=c99 with recent pkgsrc so keep it. +Add support for Bitrig. ---- acinclude.m4.orig 2014-10-03 16:18:36.000000000 +0000 +--- acinclude.m4.orig Fri Mar 27 21:17:48 2015 +++ acinclude.m4 +@@ -57,7 +57,7 @@ x86_64-*-cygwin) + *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;; + esac + fi ;; +-*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;; ++*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;; + *-*-aix*) + if test "$GCC" = yes; then + icu_cv_host_frag=mh-aix-gcc @@ -82,6 +82,7 @@ x86_64-*-cygwin) *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; *-*-nto*) icu_cv_host_frag=mh-qnx ;; diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af index bede49377f5..0303ff452fe 100644 --- a/textproc/icu/patches/patch-af +++ b/textproc/icu/patches/patch-af @@ -1,13 +1,15 @@ -$NetBSD: patch-af,v 1.14 2014/10/07 16:09:53 adam Exp $ +$NetBSD: patch-af,v 1.15 2015/08/31 15:26:19 sevan Exp $ ---- runConfigureICU.orig 2014-10-03 16:18:36.000000000 +0000 +Add support for DragonFlyBSD & Bitrig + +--- runConfigureICU.orig Fri Mar 27 21:17:48 2015 +++ runConfigureICU @@ -327,7 +327,7 @@ case $platform in DEBUG_CXXFLAGS='-Zi -MDd' DEBUG_LDFLAGS='-DEBUG' ;; - *BSD) -+ *BSD | DragonFly) ++ *BSD | DragonFly | Bitrig) THE_OS="BSD" THE_COMP="the GNU C++" DEBUG_CFLAGS='-g -O0' diff --git a/textproc/icu/patches/patch-configure b/textproc/icu/patches/patch-configure index d0122d6af0a..d14798d9de3 100644 --- a/textproc/icu/patches/patch-configure +++ b/textproc/icu/patches/patch-configure @@ -1,11 +1,21 @@ -$NetBSD: patch-configure,v 1.6 2014/10/07 16:09:53 adam Exp $ +$NetBSD: patch-configure,v 1.7 2015/08/31 15:26:19 sevan Exp $ Portability fix. Solaris seems to need -std=c99 with recent pkgsrc so keep it. +Add support for Bitrig. ---- configure.orig 2014-10-03 16:18:36.000000000 +0000 +--- configure.orig Fri Mar 27 21:17:48 2015 +++ configure -@@ -5172,6 +5172,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -5147,7 +5147,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ + *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;; + esac + fi ;; +-*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;; ++*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;; + *-*-aix*) + if test "$GCC" = yes; then + icu_cv_host_frag=mh-aix-gcc +@@ -5172,6 +5172,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; *-*-nto*) icu_cv_host_frag=mh-qnx ;; *-ncr-*) icu_cv_host_frag=mh-mpras ;; @@ -13,7 +23,7 @@ Solaris seems to need -std=c99 with recent pkgsrc so keep it. *) icu_cv_host_frag=mh-unknown ;; esac -@@ -5682,6 +5683,29 @@ if test "x$ac_cv_header_elf_h" = "xyes"; +@@ -5682,6 +5683,29 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; fi @@ -43,6 +53,15 @@ Solaris seems to need -std=c99 with recent pkgsrc so keep it. U_ENABLE_DYLOAD=1 enable=yes { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5 +@@ -7655,7 +7679,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR + case "${host}" in + *-*-solaris*) platform=U_SOLARIS ;; + *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;; +- *-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;; ++ *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;; + *-*-aix*) platform=U_AIX ;; + *-*-hpux*) platform=U_HPUX ;; + *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; @@ -7691,13 +7715,13 @@ fi # Now that we're done using CPPFLAGS etc. for tests, we can change it # for build. diff --git a/textproc/icu/patches/patch-configure.ac b/textproc/icu/patches/patch-configure.ac index fa193d5c6e8..77581c1802f 100644 --- a/textproc/icu/patches/patch-configure.ac +++ b/textproc/icu/patches/patch-configure.ac @@ -1,11 +1,12 @@ -$NetBSD: patch-configure.ac,v 1.3 2014/07/18 10:28:11 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.4 2015/08/31 15:26:19 sevan Exp $ * Detect NetBSD libatomic * test(1) portability fix +* Add support for Bitrig ---- configure.ac.orig 2013-12-09 17:32:25.000000000 +0000 +--- configure.ac.orig Fri Mar 27 21:17:48 2015 +++ configure.ac -@@ -407,6 +407,18 @@ if test "x$ac_cv_header_elf_h" = "xyes"; +@@ -409,6 +409,18 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; fi @@ -24,7 +25,16 @@ $NetBSD: patch-configure.ac,v 1.3 2014/07/18 10:28:11 ryoon Exp $ U_ENABLE_DYLOAD=1 enable=yes AC_MSG_CHECKING([whether to enable dynamic loading of plugins]) -@@ -1232,6 +1244,7 @@ case "${host}" in +@@ -1234,7 +1246,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR + case "${host}" in + *-*-solaris*) platform=U_SOLARIS ;; + *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;; +- *-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;; ++ *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;; + *-*-aix*) platform=U_AIX ;; + *-*-hpux*) platform=U_HPUX ;; + *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; +@@ -1253,6 +1265,7 @@ case "${host}" in *-*-beos) platform=U_BEOS ;; *-*-irix*) platform=U_IRIX ;; *-ncr-*) platform=U_MPRAS ;; @@ -32,7 +42,7 @@ $NetBSD: patch-configure.ac,v 1.3 2014/07/18 10:28:11 ryoon Exp $ *) platform=U_UNKNOWN_PLATFORM ;; esac AC_SUBST(ICUDATA_CHAR) -@@ -1249,13 +1262,13 @@ fi +@@ -1270,13 +1283,13 @@ fi # Now that we're done using CPPFLAGS etc. for tests, we can change it # for build. -- cgit v1.2.3