Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
textproc/icu/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.84 2013/06/04 06:39:45 adam Exp $
# $NetBSD: Makefile,v 1.87 2013/12/04 21:02:23 richard Exp $
DISTNAME= icu4c-51_2-src
DISTNAME= icu4c-52_1-src
PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
CATEGORIES= textproc
MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
@@ -42,18 +42,19 @@ PLIST_SUBST+= MH_NAME=mh-solaris
BUILDLINK_TRANSFORM+= rm:-D__STDC__=0
. endif
BUILDLINK_TRANSFORM+= rm:-ansi
CFLAGS.SunOS+= -std=c99
.elif ${OPSYS} == "IRIX"
PLIST_SUBST+= MH_NAME=mh-irix
.elif ${OPSYS} == "Darwin"
PLIST_SUBST+= MH_NAME=mh-darwin
.elif ${OPSYS} == "Cygwin"
PLIST_SUBST+= MH_NAME=mh-cygwin
.else
# For unknown systems, set the filename to mh-unknown so that the user
# gets a warning about missing files.
PLIST_SUBST+= MH_NAME=mh-unknown
.endif
.if ${OPSYS} == "Darwin"
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
INSTALL_UNSTRIPPED= yes
.endif
@@ -66,4 +67,11 @@ CFLAGS+= -march=i486
. endif
.endif
INSTALLATION_DIRS= bin
.if ${OPSYS} == "Cygwin"
post-install:
mv ${DESTDIR}${PREFIX}/lib/cygicudata.dll ${DESTDIR}${PREFIX}/bin/
.endif
.include "../../mk/bsd.pkg.mk"

21
textproc/icu/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.29 2013/06/04 06:39:45 adam Exp $
@comment $NetBSD: PLIST,v 1.30 2013/10/19 08:47:36 adam Exp $
bin/derb
bin/genbrk
bin/gencfu
@@ -138,6 +138,7 @@ include/unicode/udateintervalformat.h
include/unicode/udatpg.h
include/unicode/udisplaycontext.h
include/unicode/uenum.h
include/unicode/uformattable.h
include/unicode/ugender.h
include/unicode/uidna.h
include/unicode/uiter.h
@@ -156,9 +157,11 @@ include/unicode/unistr.h
include/unicode/unorm.h
include/unicode/unorm2.h
include/unicode/unum.h
include/unicode/unumsys.h
include/unicode/uobject.h
include/unicode/upluralrules.h
include/unicode/uregex.h
include/unicode/uregion.h
include/unicode/urename.h
include/unicode/urep.h
include/unicode/ures.h
@@ -193,35 +196,35 @@ lib/icu/current
lib/icu/pkgdata.inc
lib/libicudata.a
lib/libicudata.so
lib/libicudata.so.51
lib/libicudata.so.52
lib/libicudata.so.${PKGVERSION}
lib/libicui18n.a
lib/libicui18n.so
lib/libicui18n.so.51
lib/libicui18n.so.52
lib/libicui18n.so.${PKGVERSION}
lib/libicuio.a
lib/libicuio.so
lib/libicuio.so.51
lib/libicuio.so.52
lib/libicuio.so.${PKGVERSION}
lib/libicule.a
lib/libicule.so
lib/libicule.so.51
lib/libicule.so.52
lib/libicule.so.${PKGVERSION}
lib/libiculx.a
lib/libiculx.so
lib/libiculx.so.51
lib/libiculx.so.52
lib/libiculx.so.${PKGVERSION}
lib/libicutest.a
lib/libicutest.so
lib/libicutest.so.51
lib/libicutest.so.52
lib/libicutest.so.${PKGVERSION}
lib/libicutu.a
lib/libicutu.so
lib/libicutu.so.51
lib/libicutu.so.52
lib/libicutu.so.${PKGVERSION}
lib/libicuuc.a
lib/libicuuc.so
lib/libicuuc.so.51
lib/libicuuc.so.52
lib/libicuuc.so.${PKGVERSION}
lib/pkgconfig/icu-i18n.pc
lib/pkgconfig/icu-io.pc

4
textproc/icu/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.23 2013/05/09 07:10:08 adam Exp $
# $NetBSD: buildlink3.mk,v 1.24 2013/10/19 09:06:55 adam Exp $
BUILDLINK_TREE+= icu
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= icu
ICU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.icu+= icu>=3.4
BUILDLINK_ABI_DEPENDS.icu+= icu>=51.1
BUILDLINK_ABI_DEPENDS.icu+= icu>=52.1
BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu
.endif # ICU_BUILDLINK3_MK

33
textproc/icu/distinfo
View File

@@ -1,14 +1,29 @@
$NetBSD: distinfo,v 1.35 2013/06/04 06:39:45 adam Exp $
$NetBSD: distinfo,v 1.44 2014/03/04 12:07:16 obache Exp $
SHA1 (icu4c-51_2-src.tgz) = 074a28dfc96d37ce72c831f3e3e2d686f1f76a14
RMD160 (icu4c-51_2-src.tgz) = ef1256bb87b3dcec1cf40b32b11c5c3f1bd48af6
Size (icu4c-51_2-src.tgz) = 21841928 bytes
SHA1 (icu4c-52_1-src.tgz) = 6de440b71668f1a65a9344cdaf7a437291416781
RMD160 (icu4c-52_1-src.tgz) = cbfbb18c3991ba55ebb50c607d5208cbfeb9fce3
Size (icu4c-52_1-src.tgz) = 23875368 bytes
SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230
SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
SHA1 (patch-ad) = 75e57734ad508140e87513b37ade4b295821696e
SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842
SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810
SHA1 (patch-common_unicode_platform.h) = 36cb68164fcf9b2858acabe95f0206e8088bfbaa
SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17
SHA1 (patch-ad) = 8189e81e9c624e3b7a42f9af65a4b2f334747284
SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067
SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996
SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c
SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a
SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659
SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
SHA1 (patch-configure) = bea560028b869defa7b5eab8c148aaf6f0e8f3ee
SHA1 (patch-configure.ac) = d90bf98e97cb2051dd64b847b97092440c1c03f8
SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1
SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd
SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447
SHA1 (patch-layout_Makefile.in) = 6914279785c618d4078d4595a9097df006043eed
SHA1 (patch-layoutex_Makefile.in) = b1284874108d22b1ca6803c98b1ce9bd6d1682fe
SHA1 (patch-stubdata_Makefile.in) = 358c84811cd8138fed2e108d33f8bcfdac1ac585
SHA1 (patch-tools_ctestfw_Makefile.in) = 7d7874baee8785b6f1c889e7db1dd4acff5d5797
SHA1 (patch-tools_toolutil_Makefile.in) = be08c92bef0f367f502a712acbad869952102cc8

4
textproc/icu/hacks.mk
View File

@@ -1,10 +1,10 @@
# $NetBSD: hacks.mk,v 1.1 2013/02/01 03:44:22 jmcneill Exp $
# $NetBSD: hacks.mk,v 1.2 2013/08/07 10:19:04 jmcneill Exp $
.if !defined(ICU_HACKS_MK)
ICU_HACKS_MK= # defined
# NetBSD arm gcc <= 4.5 missing builtin atomics
.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm"
.if ${OPSYS} == "NetBSD" && (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "earm")
. if !empty(CC_VERSION:Mgcc-4.[0-5].*)
PKG_HACKS+= arm-gcc-atomics
CFLAGS+= -DU_HAVE_GCC_ATOMICS=0

26
textproc/icu/patches/patch-acinclude.m4 Normal file
View File

@@ -0,0 +1,26 @@
$NetBSD: patch-acinclude.m4,v 1.1 2013/12/04 21:02:23 richard Exp $
Solaris seems to need -std=c99 with recent pkgsrc so keep it
and at the same time fix a typo involving CXXFLAGS.
--- acinclude.m4.orig 2013-10-04 20:54:58.000000000 +0000
+++ acinclude.m4
@@ -262,7 +262,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
if test "$CAN_BUILD_64" != yes; then
# Nope. back out changes.
CFLAGS="${CFLAGS_OLD}"
- CXXFLAGS="${CFLAGS_OLD}"
+ CXXFLAGS="${CXXFLAGS_OLD}"
# 2. try xarch=v9 [deprecated]
## TODO: cross compile: the following won't work.
SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
@@ -457,9 +457,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
if test "$GCC" = yes
then
case "${host}" in
- *-*-solaris*)
- # Don't use -std=c99 option on Solaris/GCC
- ;;
*)
# Do not use -ansi. It limits us to C90, and it breaks some platforms.
# We use -std=c99 to disable the gnu99 defaults and its associated warnings

14
textproc/icu/patches/patch-ad
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-ad,v 1.11 2012/11/07 20:59:51 adam Exp $
$NetBSD: patch-ad,v 1.13 2013/10/19 08:47:36 adam Exp $
--- icudefs.mk.in.orig 2010-12-07 12:14:06.000000000 +0000
--- icudefs.mk.in.orig 2013-10-04 20:54:58.000000000 +0000
+++ icudefs.mk.in
@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
@@ -18,3 +18,13 @@ $NetBSD: patch-ad,v 1.11 2012/11/07 20:59:51 adam Exp $
LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
A = a
SOBJ = $(SO)
@@ -311,5 +311,9 @@ ifneq ($(TEST_STATUS_FILE),)
TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)"
endif
+ifeq ($(DSO_LIBDIR),)
+DSO_LIBDIR= $(DESTDIR)$(libdir)
+endif
+
# optional include at top
-include $(top_builddir)/icudefs.local

10
textproc/icu/patches/patch-af
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-af,v 1.12 2012/11/07 20:59:51 adam Exp $
$NetBSD: patch-af,v 1.13 2013/10/19 08:47:36 adam Exp $
--- runConfigureICU.orig 2011-07-19 21:19:38.000000000 +0000
--- runConfigureICU.orig 2013-10-04 20:54:58.000000000 +0000
+++ runConfigureICU
@@ -284,7 +284,7 @@ case $platform in
RELEASE_CFLAGS='-O3'
RELEASE_CXXFLAGS='-O3'
@@ -315,7 +315,7 @@ case $platform in
CXXFLAGS="--std=c++03"
export CXXFLAGS
;;
- *BSD)
+ *BSD | DragonFly)

13
textproc/icu/patches/patch-common_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-common_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- common/Makefile.in.orig 2013-10-03 18:02:27.484530600 +0000
+++ common/Makefile.in
@@ -146,7 +146,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

19
textproc/icu/patches/patch-common_putilimp.h
View File

@@ -1,13 +1,24 @@
$NetBSD: patch-common_putilimp.h,v 1.2 2012/11/07 20:59:51 adam Exp $
$NetBSD: patch-common_putilimp.h,v 1.4 2013/11/05 15:25:37 ryoon Exp $
--- common/putilimp.h.orig 2012-11-05 17:14:50.000000000 +0000
* GCC for arm does not have __sync_add_and_fetch() etc.
--- common/putilimp.h.orig 2013-10-04 20:49:30.000000000 +0000
+++ common/putilimp.h
@@ -123,6 +123,8 @@ typedef size_t uintptr_t;
@@ -128,6 +128,8 @@ typedef size_t uintptr_t;
/* not defined */
#elif U_PLATFORM == U_PF_OS400
#elif U_PLATFORM == U_PF_IPHONE
/* not defined */
+#elif defined(__MirBSD__)
+ /* not defined */
#else
# define U_TIMEZONE timezone
#endif
@@ -187,7 +189,7 @@ typedef size_t uintptr_t;
/* Use the predefined value. */
#elif U_PLATFORM == U_PF_MINGW
#define U_HAVE_GCC_ATOMICS 0
-#elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__)
+#elif (U_GCC_MAJOR_MINOR >= 404 && !defined(__arm__)) || defined(__clang__)
/* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.)
* Add them for these compilers.
* Note: Clang sets __GNUC__ defines for version 4.2, so misses the 4.4 test here.

41
textproc/icu/patches/patch-common_umutex.h Normal file
View File

@@ -0,0 +1,41 @@
$NetBSD: patch-common_umutex.h,v 1.1 2014/03/04 12:07:16 obache Exp $
* Add NetBSD MI atomic_ops(3) support
--- common/umutex.h.orig 2013-10-04 20:49:16.000000000 +0000
+++ common/umutex.h
@@ -117,6 +117,34 @@ inline int32_t umtx_atomic_dec(u_atomic_
U_NAMESPACE_END
+#elif U_HAVE_NETBSD_ATOMIC_OPS
+/*
+ * NetBSD MI atomic_ops(3)
+ */
+
+U_NAMESPACE_BEGIN
+#include <sys/atomic.h>
+typedef volatile uint32_t u_atomic_int32_t;
+#define ATOMIC_INT32_T_INITIALIZER(val) val
+
+inline int32_t umtx_loadAcquire(u_atomic_int32_t &var) {
+ return atomic_cas_32(&var, 0, 0);
+}
+
+inline void umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
+ atomic_swap_32(&var, val);
+}
+
+inline int32_t umtx_atomic_inc(u_atomic_int32_t *p) {
+ return atomic_inc_32_nv(p);
+}
+
+inline int32_t umtx_atomic_dec(u_atomic_int32_t *p) {
+ return atomic_dec_32_nv(p);
+}
+U_NAMESPACE_END
+
+
#elif U_HAVE_GCC_ATOMICS
/*
* gcc atomic ops. These are available on several other compilers as well.

19
textproc/icu/patches/patch-common_unicode_platform.h
View File

@@ -1,22 +1,27 @@
$NetBSD: patch-common_unicode_platform.h,v 1.3 2012/11/07 20:59:51 adam Exp $
$NetBSD: patch-common_unicode_platform.h,v 1.6 2013/12/03 21:16:06 bsiegert Exp $
--- common/unicode/platform.h.orig 2012-11-05 17:14:34.000000000 +0000
--- common/unicode/platform.h.orig 2013-10-04 20:49:10.000000000 +0000
+++ common/unicode/platform.h
@@ -144,7 +144,7 @@
# include <android/api-level.h>
#elif defined(linux) || defined(__linux__) || defined(__linux)
# define U_PLATFORM U_PF_LINUX
@@ -151,7 +151,7 @@
# else
# define U_PLATFORM U_PF_DARWIN
# endif
-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
# define U_PLATFORM U_PF_BSD
#elif defined(sun) || defined(__sun)
/* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
@@ -381,6 +381,13 @@
@@ -379,6 +379,18 @@
# define U_IS_BIG_ENDIAN 1
#elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN)
# define U_IS_BIG_ENDIAN 0
+#elif U_PLATFORM == U_PF_BSD
+#include <sys/types.h>
+#if defined(__OpenBSD__)
+#include <machine/endian.h>
+#else
+#include <sys/endian.h>
+#endif
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+# define U_IS_BIG_ENDIAN 0
+#else

8
textproc/icu/patches/patch-config_icu-config-bottom
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-config_icu-config-bottom,v 1.2 2012/04/25 18:53:44 adam Exp $
$NetBSD: patch-config_icu-config-bottom,v 1.3 2013/10/19 08:47:36 adam Exp $
--- config/icu-config-bottom.orig 2012-04-05 20:46:38.000000000 +0000
--- config/icu-config-bottom.orig 2013-10-04 20:50:00.000000000 +0000
+++ config/icu-config-bottom
@@ -352,11 +352,11 @@ do
@@ -355,11 +355,11 @@ do
;;
--version)
@@ -14,5 +14,5 @@ $NetBSD: patch-config_icu-config-bottom,v 1.2 2012/04/25 18:53:44 adam Exp $
- echo $ECHO_N $UNICODE_VERSION
+ echo $ECHO_N $UNICODE_VERSION${ECHO_C}
;;
--host)

27
textproc/icu/patches/patch-config_mh-cygwin Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-config_mh-cygwin,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- config/mh-cygwin.orig 2013-10-03 16:25:57.188493800 +0000
+++ config/mh-cygwin
@@ -84,12 +84,11 @@ IMPORT_LIB_EXT = .dll.a
## Versioned target for a shared library.
## Since symbolic links don't work the same way on Windows,
## we only use the version major number.
-#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
-FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
+FINAL_SO_TARGET=$(SO_TARGET)
MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
IMPORT_LIB = $(subst cyg,lib,$(FINAL_SO_TARGET)).$(A)#M#
-MIDDLE_IMPORT_LIB = $(subst cyg,lib,$(basename $(SO_TARGET)))$(SO_TARGET_VERSION_MAJOR).$(SO).$(A)#M#
+MIDDLE_IMPORT_LIB = $(IMPORT_LIB)#M#
FINAL_IMPORT_LIB = $(IMPORT_LIB)#M#
# The following is for Makefile.inc's use.
@@ -103,6 +102,7 @@ ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJ
## Install libraries as executable
INSTALL-L=$(INSTALL_PROGRAM)
+DSO_LIBDIR = $(DESTDIR)$(bindir)
## Bind internal references

18
textproc/icu/patches/patch-config_mh-solaris-gcc Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-config_mh-solaris-gcc,v 1.1 2013/12/04 21:02:23 richard Exp $
sys/feature_tests.h needs hints found in CFLAGS/CXXFLAGS while
generating depency files.
--- config/mh-solaris-gcc.orig 2013-10-04 20:50:00.000000000 +0000
+++ config/mh-solaris-gcc
@@ -9,8 +9,8 @@ SHAREDLIBCXXFLAGS = -fPIC
SHAREDLIBCPPFLAGS = -DPIC
## Commands to generate dependency files
-GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
-GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) $(CFLAGS)
+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
## These are the library specific LDFLAGS
LDFLAGSICUDT=-nodefaultlibs -nostdlib

67
textproc/icu/patches/patch-configure Normal file
View File

@@ -0,0 +1,67 @@
$NetBSD: patch-configure,v 1.3 2014/03/04 12:07:16 obache Exp $
Portability fix.
Solaris seems to need -std=c99 with recent pkgsrc so keep it
and at the same time fix a typo involving CXXFLAGS.
--- configure.orig 2013-10-04 20:54:58.000000000 +0000
+++ configure
@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; }
if test "$GCC" = yes
then
case "${host}" in
- *-*-solaris*)
- # Don't use -std=c99 option on Solaris/GCC
- ;;
*)
# Do not use -ansi. It limits us to C90, and it breaks some platforms.
# We use -std=c99 to disable the gnu99 defaults and its associated warnings
@@ -4578,7 +4575,7 @@ fi
if test "$CAN_BUILD_64" != yes; then
# Nope. back out changes.
CFLAGS="${CFLAGS_OLD}"
- CXXFLAGS="${CFLAGS_OLD}"
+ CXXFLAGS="${CXXFLAGS_OLD}"
# 2. try xarch=v9 [deprecated]
## TODO: cross compile: the following won't work.
SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
@@ -5452,6 +5449,23 @@ if test "x$ac_cv_header_elf_h" = "xyes";
CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
fi
+# check if sys/atomic.h is present.
+for ac_header in sys/atomic.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_atomic_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ATOMIC_H 1
+_ACEOF
+
+fi
+
+done
+
+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
+fi
+
U_ENABLE_DYLOAD=1
enable=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
@@ -7442,13 +7456,13 @@ fi
# Now that we're done using CPPFLAGS etc. for tests, we can change it
# for build.
-if test "${CC}" == "clang"; then
+if test "${CC}" = "clang"; then
CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
else
CLANGCFLAGS=""
fi
-if test "${CXX}" == "clang++"; then
+if test "${CXX}" = "clang++"; then
CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
else
CLANGCXXFLAGS=""

36
textproc/icu/patches/patch-configure.ac Normal file
View File

@@ -0,0 +1,36 @@
$NetBSD: patch-configure.ac,v 1.1 2014/03/04 12:07:16 obache Exp $
* Detect NetBSD libatomic
* test(1) portability fix
--- configure.ac.orig 2013-10-04 20:54:58.000000000 +0000
+++ configure.ac
@@ -407,6 +407,12 @@ if test "x$ac_cv_header_elf_h" = "xyes";
CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
fi
+# check if sys/atomic.h is present.
+AC_CHECK_HEADERS([sys/atomic.h])
+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
+fi
+
U_ENABLE_DYLOAD=1
enable=yes
AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
@@ -1249,13 +1255,13 @@ fi
# Now that we're done using CPPFLAGS etc. for tests, we can change it
# for build.
-if test "${CC}" == "clang"; then
+if test "${CC}" = "clang"; then
CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
else
CLANGCFLAGS=""
fi
-if test "${CXX}" == "clang++"; then
+if test "${CXX}" = "clang++"; then
CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
else
CLANGCXXFLAGS=""

18
textproc/icu/patches/patch-data_Makefile.in Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-data_Makefile.in,v 1.2 2013/10/05 11:43:32 tron Exp $
--- data/Makefile.in.orig 2013-05-23 20:06:20.000000000 +0000
+++ data/Makefile.in
@@ -24,9 +24,13 @@ LIB_STATIC_ICUDATA_NAME=$(LIBSICU)$(DATA
ifeq ($(PKGDATA_OPTS),)
PKGDATA_OPTS = -O $(top_builddir)/data/icupkg.inc
endif
+ifneq ($(OPSYS),Cygwin)
ifeq ($(PKGDATA_VERSIONING),)
PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION)
endif
+else
+PKGDATA_VERSIONING =
+endif
# This allows all the data to be in one directory
ifeq ($(PKGDATA_MODE),dll)

13
textproc/icu/patches/patch-i18n_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-i18n_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- i18n/Makefile.in.orig 2013-10-03 16:26:29.194516200 +0000
+++ i18n/Makefile.in
@@ -125,7 +125,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

13
textproc/icu/patches/patch-io_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-io_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- io/Makefile.in.orig 2013-10-03 16:27:26.937546600 +0000
+++ io/Makefile.in
@@ -99,7 +99,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

13
textproc/icu/patches/patch-layout_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-layout_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- layout/Makefile.in.orig 2013-10-03 16:27:26.927532200 +0000
+++ layout/Makefile.in
@@ -183,7 +183,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

13
textproc/icu/patches/patch-layoutex_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-layoutex_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- layoutex/Makefile.in.orig 2013-10-03 16:27:26.917517800 +0000
+++ layoutex/Makefile.in
@@ -100,7 +100,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

13
textproc/icu/patches/patch-stubdata_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-stubdata_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- stubdata/Makefile.in.orig 2013-10-03 16:27:26.907503400 +0000
+++ stubdata/Makefile.in
@@ -85,7 +85,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

13
textproc/icu/patches/patch-tools_ctestfw_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-tools_ctestfw_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- tools/ctestfw/Makefile.in.orig 2013-10-03 16:26:50.324900200 +0000
+++ tools/ctestfw/Makefile.in
@@ -81,7 +81,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))

13
textproc/icu/patches/patch-tools_toolutil_Makefile.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-tools_toolutil_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
--- tools/toolutil/Makefile.in.orig 2013-10-03 16:26:46.529442600 +0000
+++ tools/toolutil/Makefile.in
@@ -92,7 +92,7 @@ ifneq ($(ENABLE_STATIC),)
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
endif
ifneq ($(ENABLE_SHARED),)
- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_LIBDIR)
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))