Mon May 5 21:25:11 2014 UTC ()
Fix OpenBSD 5.5 build

* OpenBSD 5.5 has /usr/include/sys/atomic.h, but it is different from NetBSD's
  one


(ryoon)
diff -r1.45 -r1.46 pkgsrc/textproc/icu/distinfo
diff -r1.3 -r1.4 pkgsrc/textproc/icu/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-configure.ac
cvs diff -r1.45 -r1.46 pkgsrc/textproc/icu/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/icu/distinfo 2014/04/07 11:49:57 1.45
+++ pkgsrc/textproc/icu/distinfo 2014/05/05 21:25:11 1.46
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.45 2014/04/07 11:49:57 adam Exp $ 1$NetBSD: distinfo,v 1.46 2014/05/05 21:25:11 ryoon Exp $
2 2
3SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f 3SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
4RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9 4RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
5Size (icu4c-53_1-src.tgz) = 23218952 bytes 5Size (icu4c-53_1-src.tgz) = 23218952 bytes
6SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230 6SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230
7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
9SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17 9SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17
10SHA1 (patch-ad) = 8189e81e9c624e3b7a42f9af65a4b2f334747284 10SHA1 (patch-ad) = 8189e81e9c624e3b7a42f9af65a4b2f334747284
11SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067 11SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067
12SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996 12SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996
13SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 13SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
14SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c 14SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
15SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c 15SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c
16SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 16SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
17SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 17SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
18SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659 18SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659
19SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025 19SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
20SHA1 (patch-configure) = bea560028b869defa7b5eab8c148aaf6f0e8f3ee 20SHA1 (patch-configure) = 6888d11d4e0eb809c50780fec7fbff53861d1901
21SHA1 (patch-configure.ac) = d90bf98e97cb2051dd64b847b97092440c1c03f8 21SHA1 (patch-configure.ac) = 8a273518838ecb38378ca4577f8b93985e4e86b6
22SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1 22SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1
23SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd 23SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd
24SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447 24SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447
25SHA1 (patch-layout_Makefile.in) = 6914279785c618d4078d4595a9097df006043eed 25SHA1 (patch-layout_Makefile.in) = 6914279785c618d4078d4595a9097df006043eed
26SHA1 (patch-layoutex_Makefile.in) = b1284874108d22b1ca6803c98b1ce9bd6d1682fe 26SHA1 (patch-layoutex_Makefile.in) = b1284874108d22b1ca6803c98b1ce9bd6d1682fe
27SHA1 (patch-stubdata_Makefile.in) = 358c84811cd8138fed2e108d33f8bcfdac1ac585 27SHA1 (patch-stubdata_Makefile.in) = 358c84811cd8138fed2e108d33f8bcfdac1ac585
28SHA1 (patch-tools_ctestfw_Makefile.in) = 7d7874baee8785b6f1c889e7db1dd4acff5d5797 28SHA1 (patch-tools_ctestfw_Makefile.in) = 7d7874baee8785b6f1c889e7db1dd4acff5d5797
29SHA1 (patch-tools_toolutil_Makefile.in) = be08c92bef0f367f502a712acbad869952102cc8 29SHA1 (patch-tools_toolutil_Makefile.in) = be08c92bef0f367f502a712acbad869952102cc8
cvs diff -r1.3 -r1.4 pkgsrc/textproc/icu/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-configure 2014/03/04 12:07:16 1.3
+++ pkgsrc/textproc/icu/patches/patch-configure 2014/05/05 21:25:11 1.4
@@ -1,65 +1,71 @@ @@ -1,65 +1,71 @@
1$NetBSD: patch-configure,v 1.3 2014/03/04 12:07:16 obache Exp $ 1$NetBSD: patch-configure,v 1.4 2014/05/05 21:25:11 ryoon Exp $
2 2
3Portability fix. 3Portability fix.
4Solaris seems to need -std=c99 with recent pkgsrc so keep it 4Solaris seems to need -std=c99 with recent pkgsrc so keep it
5and at the same time fix a typo involving CXXFLAGS. 5and at the same time fix a typo involving CXXFLAGS.
6 6
7--- configure.orig 2013-10-04 20:54:58.000000000 +0000 7--- configure.orig 2013-12-09 17:32:25.000000000 +0000
8+++ configure 8+++ configure
9@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; } 9@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; }
10 if test "$GCC" = yes 10 if test "$GCC" = yes
11 then 11 then
12 case "${host}" in 12 case "${host}" in
13- *-*-solaris*) 13- *-*-solaris*)
14- # Don't use -std=c99 option on Solaris/GCC 14- # Don't use -std=c99 option on Solaris/GCC
15- ;; 15- ;;
16 *) 16 *)
17 # Do not use -ansi. It limits us to C90, and it breaks some platforms. 17 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
18 # We use -std=c99 to disable the gnu99 defaults and its associated warnings 18 # We use -std=c99 to disable the gnu99 defaults and its associated warnings
19@@ -4578,7 +4575,7 @@ fi 19@@ -4578,7 +4575,7 @@ fi
20 if test "$CAN_BUILD_64" != yes; then 20 if test "$CAN_BUILD_64" != yes; then
21 # Nope. back out changes. 21 # Nope. back out changes.
22 CFLAGS="${CFLAGS_OLD}" 22 CFLAGS="${CFLAGS_OLD}"
23- CXXFLAGS="${CFLAGS_OLD}" 23- CXXFLAGS="${CFLAGS_OLD}"
24+ CXXFLAGS="${CXXFLAGS_OLD}" 24+ CXXFLAGS="${CXXFLAGS_OLD}"
25 # 2. try xarch=v9 [deprecated] 25 # 2. try xarch=v9 [deprecated]
26 ## TODO: cross compile: the following won't work. 26 ## TODO: cross compile: the following won't work.
27 SPARCV9=`isainfo -n 2>&1 | grep sparcv9` 27 SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
28@@ -5452,6 +5449,23 @@ if test "x$ac_cv_header_elf_h" = "xyes"; 28@@ -5452,6 +5449,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
29 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; 29 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
30 fi 30 fi
31  31
32+# check if sys/atomic.h is present. 32+# check if sys/atomic.h is present.
33+for ac_header in sys/atomic.h 33+for ac_header in sys/atomic.h
34+do : 34+do :
35+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default" 35+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
36+if test "x$ac_cv_header_sys_atomic_h" = xyes; then : 36+if test "x$ac_cv_header_sys_atomic_h" = xyes; then :
37+ cat >>confdefs.h <<_ACEOF 37+ cat >>confdefs.h <<_ACEOF
38+#define HAVE_SYS_ATOMIC_H 1 38+#define HAVE_SYS_ATOMIC_H 1
39+_ACEOF 39+_ACEOF
40+ 40+
41+fi 41+fi
42+ 42+
43+done 43+done
44+ 44+
 45+case "${host}" in
 46+*-netbsd*)
45+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then 47+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
46+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; 48+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
47+fi 49+fi
 50+;;
 51+*)
 52+;;
 53+esac
48+ 54+
49 U_ENABLE_DYLOAD=1 55 U_ENABLE_DYLOAD=1
50 enable=yes 56 enable=yes
51 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5 57 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
52@@ -7442,13 +7456,13 @@ fi 58@@ -7442,13 +7462,13 @@ fi
53 # Now that we're done using CPPFLAGS etc. for tests, we can change it 59 # Now that we're done using CPPFLAGS etc. for tests, we can change it
54 # for build. 60 # for build.
55  61
56-if test "${CC}" == "clang"; then 62-if test "${CC}" == "clang"; then
57+if test "${CC}" = "clang"; then 63+if test "${CC}" = "clang"; then
58 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" 64 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
59 else 65 else
60 CLANGCFLAGS="" 66 CLANGCFLAGS=""
61 fi 67 fi
62  68
63-if test "${CXX}" == "clang++"; then 69-if test "${CXX}" == "clang++"; then
64+if test "${CXX}" = "clang++"; then 70+if test "${CXX}" = "clang++"; then
65 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" 71 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-configure.ac 2014/03/04 12:07:16 1.1
+++ pkgsrc/textproc/icu/patches/patch-configure.ac 2014/05/05 21:25:11 1.2
@@ -1,34 +1,40 @@ @@ -1,34 +1,40 @@
1$NetBSD: patch-configure.ac,v 1.1 2014/03/04 12:07:16 obache Exp $ 1$NetBSD: patch-configure.ac,v 1.2 2014/05/05 21:25:11 ryoon Exp $
2 2
3* Detect NetBSD libatomic 3* Detect NetBSD libatomic
4* test(1) portability fix 4* test(1) portability fix
5 5
6--- configure.ac.orig 2013-10-04 20:54:58.000000000 +0000 6--- configure.ac.orig 2013-12-09 17:32:25.000000000 +0000
7+++ configure.ac 7+++ configure.ac
8@@ -407,6 +407,12 @@ if test "x$ac_cv_header_elf_h" = "xyes"; 8@@ -407,6 +407,18 @@ if test "x$ac_cv_header_elf_h" = "xyes";
9 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; 9 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
10 fi 10 fi
11  11
12+# check if sys/atomic.h is present. 12+# check if sys/atomic.h is present.
13+AC_CHECK_HEADERS([sys/atomic.h]) 13+AC_CHECK_HEADERS([sys/atomic.h])
 14+case "${host}" in
 15+*-netbsd*)
14+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then 16+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
15+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; 17+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
16+fi 18+fi
 19+;;
 20+*)
 21+;;
 22+esac
17+ 23+
18 U_ENABLE_DYLOAD=1 24 U_ENABLE_DYLOAD=1
19 enable=yes 25 enable=yes
20 AC_MSG_CHECKING([whether to enable dynamic loading of plugins]) 26 AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
21@@ -1249,13 +1255,13 @@ fi 27@@ -1249,13 +1261,13 @@ fi
22 # Now that we're done using CPPFLAGS etc. for tests, we can change it 28 # Now that we're done using CPPFLAGS etc. for tests, we can change it
23 # for build. 29 # for build.
24  30
25-if test "${CC}" == "clang"; then 31-if test "${CC}" == "clang"; then
26+if test "${CC}" = "clang"; then 32+if test "${CC}" = "clang"; then
27 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" 33 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
28 else 34 else
29 CLANGCFLAGS="" 35 CLANGCFLAGS=""
30 fi 36 fi
31  37
32-if test "${CXX}" == "clang++"; then 38-if test "${CXX}" == "clang++"; then
33+if test "${CXX}" = "clang++"; then 39+if test "${CXX}" = "clang++"; then
34 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" 40 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"