summaryrefslogtreecommitdiff
path: root/databases/tdb1413/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/tdb1413/files')
-rw-r--r--databases/tdb1413/files/patch-buildtools_wafsamba_samba__install.py11
-rw-r--r--databases/tdb1413/files/patch-buildtools_wafsamba_wscript15
-rw-r--r--databases/tdb1413/files/patch-lib_replace_wscript11
-rw-r--r--databases/tdb1413/files/patch-wscript11
4 files changed, 48 insertions, 0 deletions
diff --git a/databases/tdb1413/files/patch-buildtools_wafsamba_samba__install.py b/databases/tdb1413/files/patch-buildtools_wafsamba_samba__install.py
new file mode 100644
index 000000000000..a852de2f200c
--- /dev/null
+++ b/databases/tdb1413/files/patch-buildtools_wafsamba_samba__install.py
@@ -0,0 +1,11 @@
+--- buildtools/wafsamba/samba_install.py.orig 2019-02-14 11:21:38 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -118,7 +118,7 @@ def install_library(self):
+ inst_name = bld.make_libname(t.target)
+ elif self.vnum:
+ vnum_base = self.vnum.split('.')[0]
+- install_name = bld.make_libname(target_name, version=self.vnum)
++ install_name = bld.make_libname(target_name, version=vnum_base)
+ install_link = bld.make_libname(target_name, version=vnum_base)
+ inst_name = bld.make_libname(t.target)
+ if not self.private_library:
diff --git a/databases/tdb1413/files/patch-buildtools_wafsamba_wscript b/databases/tdb1413/files/patch-buildtools_wafsamba_wscript
new file mode 100644
index 000000000000..b525397fbee9
--- /dev/null
+++ b/databases/tdb1413/files/patch-buildtools_wafsamba_wscript
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig 2019-02-26 06:44:21 UTC
++++ buildtools/wafsamba/wscript
+@@ -82,10 +82,10 @@ def options(opt):
+
+ opt.add_option('--with-libiconv',
+ help='additional directory to search for libiconv',
+- action='store', dest='iconv_open', default='/usr/local',
++ action='store', dest='iconv_open', default=None,
+ match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+ opt.add_option('--without-gettext',
+- help=("Disable use of gettext"),
++ help=("disable use of gettext"),
+ action="store_true", dest='disable_gettext', default=False)
+
+ gr = opt.option_group('developer options')
diff --git a/databases/tdb1413/files/patch-lib_replace_wscript b/databases/tdb1413/files/patch-lib_replace_wscript
new file mode 100644
index 000000000000..ba3eb912e5d7
--- /dev/null
+++ b/databases/tdb1413/files/patch-lib_replace_wscript
@@ -0,0 +1,11 @@
+--- lib/replace/wscript.orig 2019-02-26 06:44:21 UTC
++++ lib/replace/wscript
+@@ -119,7 +119,7 @@ def configure(conf):
+ conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
+ conf.CHECK_HEADERS('libgen.h')
+
+- if conf.CHECK_CFLAGS('-Wno-format-truncation'):
++ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
+ conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
+
+ if conf.CHECK_CFLAGS('-Wno-unused-function'):
diff --git a/databases/tdb1413/files/patch-wscript b/databases/tdb1413/files/patch-wscript
new file mode 100644
index 000000000000..4869b58adf01
--- /dev/null
+++ b/databases/tdb1413/files/patch-wscript
@@ -0,0 +1,11 @@
+--- wscript.orig 2019-02-26 07:02:52 UTC
++++ wscript
+@@ -121,7 +121,7 @@ def build(bld):
+ COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
+
+ if bld.env.standalone_tdb:
+- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
+ private_library = False
+ else:
+ private_library = True