Fri Jul 18 10:28:11 2014 UTC ()
Fix SCO OpenSrver 5.0.7/3.2 build.
Add configuration for SCOOSR5.
(ryoon)
diff -r1.92 -r1.93 pkgsrc/textproc/icu/Makefile
diff -r1.48 -r1.49 pkgsrc/textproc/icu/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-acinclude.m4
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h
diff -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-config_mh-scoosr5
diff -r1.4 -r1.5 pkgsrc/textproc/icu/patches/patch-configure
diff -r1.2 -r1.3 pkgsrc/textproc/icu/patches/patch-configure.ac
--- pkgsrc/textproc/icu/Makefile 2014/06/08 09:09:01 1.92
+++ pkgsrc/textproc/icu/Makefile 2014/07/18 10:28:11 1.93
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2014/06/08 09:09:01 obache Exp $
+# $NetBSD: Makefile,v 1.93 2014/07/18 10:28:11 ryoon Exp $
DISTNAME= icu4c-53_1-src
PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
@@ -75,6 +75,10 @@
PLIST_SUBST+= MH_NAME=mh-haiku
.elif ${OPSYS} == "IRIX"
PLIST_SUBST+= MH_NAME=mh-irix
+.elif ${OPSYS} == "Cygwin"
+PLIST_SUBST+= MH_NAME=mh-cygwin
+.elif ${OS_VARIANT} == "SCOOSR5"
+PLIST_SUBST+= MH_NAME=mh-scoosr5
.elif ${OPSYS} == "OSF1"
PLIST_SUBST+= MH_NAME=mh-alpha-osf
.elif ${OPSYS} == "QNX"
--- pkgsrc/textproc/icu/distinfo 2014/06/08 09:08:19 1.48
+++ pkgsrc/textproc/icu/distinfo 2014/07/18 10:28:11 1.49
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2014/06/08 09:08:19 obache Exp $
+$NetBSD: distinfo,v 1.49 2014/07/18 10:28:11 ryoon Exp $
SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
@@ -6,14 +6,15 @@
SHA1 (patch-aa) = dc4adcbd6e3115b0f58c7452f408fcab2dd77f45
SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
-SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17
+SHA1 (patch-acinclude.m4) = a6993fefca751d7e63e60130cdcd69f3adbc0589
SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067
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-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
+SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
-SHA1 (patch-configure) = 6888d11d4e0eb809c50780fec7fbff53861d1901
+SHA1 (patch-configure) = aae0978c1eb1b2bafa229ba0f2e9d581554f80b2
-SHA1 (patch-configure.ac) = 8a273518838ecb38378ca4577f8b93985e4e86b6
+SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1
--- pkgsrc/textproc/icu/patches/patch-acinclude.m4 2013/12/04 21:02:23 1.1
+++ pkgsrc/textproc/icu/patches/patch-acinclude.m4 2014/07/18 10:28:11 1.2
@@ -1,11 +1,19 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2013/12/04 21:02:23 richard Exp $
+$NetBSD: patch-acinclude.m4,v 1.2 2014/07/18 10:28:11 ryoon 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.orig 2013-09-13 21:36:38.000000000 +0000
+++ acinclude.m4
-@@ -262,7 +262,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
+@@ -69,6 +69,7 @@ powerpc*-*-linux*)
+ *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
+ *-*-nto*) icu_cv_host_frag=mh-qnx ;;
+ *-ncr-*) icu_cv_host_frag=mh-mpras ;;
++*-*-sco3.2v5*) icu_cv_host_frag=mh-scoosr5 ;;
+ *) icu_cv_host_frag=mh-unknown ;;
+ esac
+ ]
+@@ -262,7 +263,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
if test "$CAN_BUILD_64" != yes; then
# Nope. back out changes.
CFLAGS="${CFLAGS_OLD}"
@@ -14,7 +22,7 @@
# 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],
+@@ -457,9 +458,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
if test "$GCC" = yes
then
case "${host}" in
--- pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h 2012/05/08 16:10:39 1.1
+++ pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h 2014/07/18 10:28:11 1.2
@@ -1,12 +1,23 @@
-$NetBSD: patch-common_uposixdefs.h,v 1.1 2012/05/08 16:10:39 hans Exp $
+$NetBSD: patch-common_uposixdefs.h,v 1.2 2014/07/18 10:28:11 ryoon Exp $
---- common/uposixdefs.h.orig 2012-04-05 22:46:18.000000000 +0200
-+++ common/uposixdefs.h 2012-05-08 15:28:20.516380420 +0200
-@@ -52,9 +52,11 @@
+--- common/uposixdefs.h.orig 2013-10-04 20:49:24.000000000 +0000
++++ common/uposixdefs.h
+@@ -42,8 +42,10 @@
+ * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__.
+ * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all.
+ */
++#if !defined(_SCO_DS)
+ # define _XOPEN_SOURCE 600
+ #endif
++#endif
+
+ /*
+ * Make sure things like readlink and such functions work.
+@@ -52,9 +54,11 @@
*
* z/OS needs this definition for timeval and to get usleep.
*/
-+#ifndef __sun
++#if !defined(__sun) && !defined(_SCO_DS)
#if !defined(_XOPEN_SOURCE_EXTENDED)
# define _XOPEN_SOURCE_EXTENDED 1
#endif
$NetBSD: patch-config_mh-scoosr5,v 1.1 2014/07/18 10:28:11 ryoon Exp $
--- config/mh-scoosr5.orig 2014-03-07 11:43:35.000000000 +0000
+++ config/mh-scoosr5
@@ -0,0 +1,72 @@
+## -*-makefile-*-
+## SCO OpenServer 5.0.7/3.2-specific setup using gcc
+## Copyright (c) 1999-2010, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+## Flags for position independent code
+SHAREDLIBCFLAGS = -fPIC
+SHAREDLIBCXXFLAGS = -fPIC
+SHAREDLIBCPPFLAGS = -DPIC
+
+## Commands to generate dependency files
+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
+
+## Additional flags when building libraries and with threads
+THREADSCPPFLAGS = -D_REENTRANT
+
+## Compiler switch to embed a runtime search path
+LD_RPATH= -R'$$'ORIGIN
+LD_RPATH_PRE= -R
+
+## Compiler switch to embed a library name
+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+
+## Shared library options
+LD_SOOPTIONS= -Wl,-Bsymbolic
+
+## Shared object suffix
+SO= so
+## Non-shared intermediate object suffix
+STATIC_O = ao
+
+## Compilation rules
+%.$(STATIC_O): $(srcdir)/%.c
+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
+%.o: $(srcdir)/%.c
+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
+
+%.$(STATIC_O): $(srcdir)/%.cpp
+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
+%.o: $(srcdir)/%.cpp
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+
+
+## Dependency rules
+%.d : $(srcdir)/%.c
+ @echo "generating dependency information for $<"
+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \
+ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+ [ -s $@ ] || rm -f $@'
+
+%.d : $(srcdir)/%.cpp
+ @echo "generating dependency information for $<"
+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+ [ -s $@ ] || rm -f $@'
+
+## Versioned libraries rules
+
+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+ $(RM) $@ && ln -s ${<F} $@
+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+
+## Remove shared library 's'
+STATIC_PREFIX_WHEN_USED =
+STATIC_PREFIX =
+
+## End SCO OpenServer 5.0.7/3.2-specific setup
--- pkgsrc/textproc/icu/patches/patch-configure 2014/05/05 21:25:11 1.4
+++ pkgsrc/textproc/icu/patches/patch-configure 2014/07/18 10:28:11 1.5
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.4 2014/05/05 21:25:11 ryoon Exp $
+$NetBSD: patch-configure,v 1.5 2014/07/18 10:28:11 ryoon Exp $
Portability fix.
Solaris seems to need -std=c99 with recent pkgsrc so keep it
@@ -25,7 +25,15 @@
# 2. try xarch=v9 [deprecated]
## TODO: cross compile: the following won't work.
SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
-@@ -5452,6 +5449,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
+@@ -4942,6 +4939,7 @@ rm -f core conftest.err conftest.$ac_obj
+ *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
+ *-*-nto*) icu_cv_host_frag=mh-qnx ;;
+ *-ncr-*) icu_cv_host_frag=mh-mpras ;;
++-*-sco3.2v5*) icu_cv_host_frag=mh-scoosr5 ;;
+ *) icu_cv_host_frag=mh-unknown ;;
+ esac
+
+@@ -5452,6 +5450,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
fi
@@ -55,7 +63,7 @@
U_ENABLE_DYLOAD=1
enable=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
-@@ -7442,13 +7462,13 @@ fi
+@@ -7442,13 +7463,13 @@ fi
# Now that we're done using CPPFLAGS etc. for tests, we can change it
# for build.
--- pkgsrc/textproc/icu/patches/patch-configure.ac 2014/05/05 21:25:11 1.2
+++ pkgsrc/textproc/icu/patches/patch-configure.ac 2014/07/18 10:28:11 1.3
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.2 2014/05/05 21:25:11 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.3 2014/07/18 10:28:11 ryoon Exp $
* Detect NetBSD libatomic
* test(1) portability fix
@@ -24,7 +24,15 @@
U_ENABLE_DYLOAD=1
enable=yes
AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
-@@ -1249,13 +1261,13 @@ fi
+@@ -1232,6 +1244,7 @@ case "${host}" in
+ *-*-beos) platform=U_BEOS ;;
+ *-*-irix*) platform=U_IRIX ;;
+ *-ncr-*) platform=U_MPRAS ;;
++ *-*-sco3.2v5*) platform=USCOOSR5 ;;
+ *) platform=U_UNKNOWN_PLATFORM ;;
+ esac
+ AC_SUBST(ICUDATA_CHAR)
+@@ -1249,13 +1262,13 @@ fi
# Now that we're done using CPPFLAGS etc. for tests, we can change it
# for build.