| 1 |
commit: c6410bbd72268c09e5dba50f4bdd5eadba1c1419 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 25 13:58:54 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 25 13:58:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6410bbd |
| 7 |
|
| 8 |
sys-libs/db-6.0.35-r1: fix for x86-winnt |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3 |
| 11 |
|
| 12 |
sys-libs/db/db-6.0.35-r1.ebuild | 12 +++- |
| 13 |
sys-libs/db/files/db-6.0.35-winnt.patch | 110 ++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 121 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild |
| 17 |
index a9aafa91ce..7f2530ae61 100644 |
| 18 |
--- a/sys-libs/db/db-6.0.35-r1.ebuild |
| 19 |
+++ b/sys-libs/db/db-6.0.35-r1.ebuild |
| 20 |
@@ -27,7 +27,7 @@ done |
| 21 |
|
| 22 |
LICENSE="AGPL-3" |
| 23 |
SLOT="$(get_version_component_range 1-2)" |
| 24 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 25 |
+KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 26 |
IUSE="doc java cxx tcl test" |
| 27 |
|
| 28 |
REQUIRED_USE="test? ( tcl )" |
| 29 |
@@ -93,6 +93,8 @@ src_prepare() { |
| 30 |
# core, ~300MB each. This patch uses links instead, saves a lot of space. |
| 31 |
epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch |
| 32 |
|
| 33 |
+ epatch "${FILESDIR}"/${PN}-6.0.35-winnt.patch |
| 34 |
+ |
| 35 |
# Upstream release script grabs the dates when the script was run, so lets |
| 36 |
# end-run them to keep the date the same. |
| 37 |
export REAL_DB_RELEASE_DATE="$(awk \ |
| 38 |
@@ -167,6 +169,14 @@ multilib_src_configure() { |
| 39 |
myconf+=(--disable-tcl ) |
| 40 |
fi |
| 41 |
|
| 42 |
+ if [[ ${CHOST} == *-winnt* ]]; then |
| 43 |
+ # this one should really sound --enable-windows, but |
| 44 |
+ # seems the db devs only support mingw ... doesn't enable |
| 45 |
+ # anything too specific to mingw. |
| 46 |
+ myconf+=(--enable-mingw) |
| 47 |
+ myconf+=(--with-mutex=win32) |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
# sql_compat will cause a collision with sqlite3 |
| 51 |
# --enable-sql_compat |
| 52 |
# Don't --enable-sql* because we don't want to use bundled sqlite. |
| 53 |
|
| 54 |
diff --git a/sys-libs/db/files/db-6.0.35-winnt.patch b/sys-libs/db/files/db-6.0.35-winnt.patch |
| 55 |
new file mode 100644 |
| 56 |
index 0000000000..7b452960a7 |
| 57 |
--- /dev/null |
| 58 |
+++ b/sys-libs/db/files/db-6.0.35-winnt.patch |
| 59 |
@@ -0,0 +1,110 @@ |
| 60 |
+--- db-6.0.35/dist/aclocal/cxx.m4.orig 2017-09-21 14:38:27.091198600 +0200 |
| 61 |
++++ db-6.0.35/dist/aclocal/cxx.m4 2017-09-21 14:38:38.481785600 +0200 |
| 62 |
+@@ -171,6 +171,7 @@ |
| 63 |
+ |
| 64 |
+ t44 = t4; |
| 65 |
+ t55 = t5; |
| 66 |
++ return 0; |
| 67 |
+ } |
| 68 |
+ |
| 69 |
+ template <typename T4> |
| 70 |
+@@ -178,6 +179,7 @@ |
| 71 |
+ { |
| 72 |
+ T4 t44 = t4; |
| 73 |
+ std::vector<T4> abc = t55; |
| 74 |
++ return 0; |
| 75 |
+ } |
| 76 |
+ |
| 77 |
+ // maximum of two int values |
| 78 |
+--- db-6.0.35/dist/aclocal/tls.m4.orig 2017-09-21 15:41:28.325565600 +0200 |
| 79 |
++++ db-6.0.35/dist/aclocal/tls.m4 2017-09-21 15:41:56.388089900 +0200 |
| 80 |
+@@ -21,10 +21,10 @@ |
| 81 |
+ class TLSClass2 { |
| 82 |
+ public: static ] $ax_tls_decl_keyword [int tlsvar; |
| 83 |
+ }; |
| 84 |
+- template<typename T> ] $ax_tls_defn_keyword [ T* TLSClass<T>::tlsvar = NULL;] |
| 85 |
++ template<typename T> ] $ax_tls_defn_keyword [ T* TLSClass<T>::tlsvar = 0;] |
| 86 |
+ $ax_tls_defn_keyword [int TLSClass2::tlsvar = 1; |
| 87 |
+ static $ax_tls_decl_keyword int x = 0;], |
| 88 |
+- [TLSClass<int>::tlsvar = NULL; TLSClass2::tlsvar = 1;], |
| 89 |
++ [TLSClass<int>::tlsvar = 0; TLSClass2::tlsvar = 1;], |
| 90 |
+ [ac_cv_tls=modifier ; break]) |
| 91 |
+ done |
| 92 |
+ test "$ac_cv_tls" = none || break |
| 93 |
+@@ -39,7 +39,7 @@ |
| 94 |
+ static pthread_key_t key; |
| 95 |
+ |
| 96 |
+ static void init_once(void) { |
| 97 |
+- pthread_key_create(&key, NULL); |
| 98 |
++ pthread_key_create(&key, 0); |
| 99 |
+ } |
| 100 |
+ static void *get_tls() { |
| 101 |
+ return (void *)pthread_getspecific(&key); |
| 102 |
+--- db-6.0.35/dist/configure.ac.orig 2017-09-21 16:12:45.638028200 +0200 |
| 103 |
++++ db-6.0.35/dist/configure.ac 2017-09-21 16:13:11.731822700 +0200 |
| 104 |
+@@ -371,11 +371,11 @@ |
| 105 |
+ INSTALLER="\$(LIBTOOL) --mode=install cp -p" |
| 106 |
+ |
| 107 |
+ MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" |
| 108 |
+-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" |
| 109 |
+-MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" |
| 110 |
++MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -no-undefined -avoid-version" |
| 111 |
++MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -no-undefined" |
| 112 |
+ MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" |
| 113 |
+-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" |
| 114 |
+-MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" |
| 115 |
++MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -no-undefined -avoid-version" |
| 116 |
++MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -no-undefined" |
| 117 |
+ |
| 118 |
+ |
| 119 |
+ case "$host_os" in |
| 120 |
+@@ -411,9 +411,6 @@ |
| 121 |
+ o=".lo" |
| 122 |
+ fi |
| 123 |
+ INSTALL_LIBS="$DEFAULT_LIB" |
| 124 |
+-if test "$enable_static" = "yes"; then |
| 125 |
+- INSTALL_LIBS="$INSTALL_LIBS \$(libdb)" |
| 126 |
+-fi |
| 127 |
+ |
| 128 |
+ # Optional C++ API. |
| 129 |
+ if test "$db_cv_cxx" = "yes"; then |
| 130 |
+@@ -424,9 +421,6 @@ |
| 131 |
+ DEFAULT_LIB_CXX="\$(libxso_target)" |
| 132 |
+ fi |
| 133 |
+ INSTALL_LIBS="$INSTALL_LIBS $DEFAULT_LIB_CXX" |
| 134 |
+- if test "$enable_static" = "yes"; then |
| 135 |
+- INSTALL_LIBS="$INSTALL_LIBS \$(libcxx)" |
| 136 |
+- fi |
| 137 |
+ fi |
| 138 |
+ |
| 139 |
+ # Optional Java API / JDBC. |
| 140 |
+@@ -553,9 +547,6 @@ |
| 141 |
+ DEFAULT_LIB_SQL="\$(libsqlso_target)" |
| 142 |
+ fi |
| 143 |
+ INSTALL_LIBS="$INSTALL_LIBS $DEFAULT_LIB_SQL" |
| 144 |
+- if test "$enable_static" = "yes"; then |
| 145 |
+- INSTALL_LIBS="$INSTALL_LIBS \$(libsql)" |
| 146 |
+- fi |
| 147 |
+ |
| 148 |
+ if test "$db_cv_test" = "yes"; then |
| 149 |
+ subdirs="$subdirs sql" |
| 150 |
+@@ -593,9 +584,6 @@ |
| 151 |
+ if test "$enable_shared" = "yes"; then |
| 152 |
+ INSTALL_LIBS_EXTRA="$INSTALL_LIBS_EXTRA \$(libsqliteso)" |
| 153 |
+ fi |
| 154 |
+- if test "$enable_static" = "yes"; then |
| 155 |
+- INSTALL_LIBS="$INSTALL_LIBS \$(libsqlite)" |
| 156 |
+- fi |
| 157 |
+ fi |
| 158 |
+ |
| 159 |
+ # Optional SQL code generation tool. |
| 160 |
+@@ -619,9 +607,6 @@ |
| 161 |
+ ADDITIONAL_INCS="$ADDITIONAL_INCS \$(topdir)/lang/cxx/stl/$f" |
| 162 |
+ done |
| 163 |
+ INSTALL_LIBS="$INSTALL_LIBS $DEFAULT_LIB_STL" |
| 164 |
+- if test "$enable_static" = "yes"; then |
| 165 |
+- INSTALL_LIBS="$INSTALL_LIBS \$(libstl)" |
| 166 |
+- fi |
| 167 |
+ fi |
| 168 |
+ |
| 169 |
+ # Checks for include files, structures, C types. |
Archives