aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'tools/depends/target/samba-gplv3/03-builtin-heimdal.patch')
-rw-r--r--tools/depends/target/samba-gplv3/03-builtin-heimdal.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch b/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
index 9767ca948b..84dccf9acb 100644
--- a/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
+++ b/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
@@ -13,16 +13,16 @@
deps='cmocka ldb ldb_tdb_err_map',
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
-@@ -4,6 +4,7 @@
- from waflib import Context
+@@ -5,6 +5,7 @@
from samba_utils import SET_TARGET_TYPE
from samba_autoconf import CURRENT_CFLAGS
+ from samba_utils import LOAD_ENVIRONMENT, TO_LIST
+from samba_bundled import BUILTIN_LIBRARY
- from samba_utils import LOAD_ENVIRONMENT
- def to_list(str):
-@@ -223,7 +224,10 @@
- def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
+ def heimdal_path(p, absolute=False):
+ hpath = os.path.join("../heimdal", p)
+@@ -215,7 +216,10 @@
+ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cflags=[]):
'''define a Heimdal library'''
- obj_target = libname + '.objlist'
@@ -33,8 +33,8 @@
# first create a target for building the object files for this library
# by separating in this way, we avoid recompiling the C files
-@@ -234,6 +238,9 @@
- includes = includes,
+@@ -227,6 +231,9 @@
+ cflags = cflags,
group = 'main')
+ if BUILTIN_LIBRARY(bld, libname):