• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/samba4/samba4-0005-builtin-heimdal-external-tools.patch
Gustavo ZacariasGustavo Zacarias committed dee1cf0cdf902 Mar 2014
Raw file
Source viewDiff to previous
 
1
Force external asn1_compile and compile_et binaries.
2
At the moment the samba bundled heimdal fails to build the tools for the host
3
when cross-compiling, and it can't link to an external heimdal either.
4
​
5
Status: working with samba upstream on a proper way to cross-compile
6
the bundled heimdal.
7
​
8
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
9
​
10
diff -Nura samba-4.1.3.orig/source4/heimdal_build/wscript_build samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_build
11
--- samba-4.1.3.orig/source4/heimdal_build/wscript_build    2013-12-12 16:45:46.951965484 -0300
12
+++ samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_build   2013-12-18 22:01:24.323429945 -0300
13
@@ -925,6 +925,8 @@
14
         install=False
15
     )
16
     bld.env['ASN1_COMPILE'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'asn1_compile')
17
+else:
18
+    bld.env['ASN1_COMPILE'] = 'asn1_compile'
19
 
20
 
21
 if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
22
@@ -939,6 +941,8 @@
23
         install=False
24
         )
25
     bld.env['COMPILE_ET'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'compile_et')
26
+else:
27
+    bld.env['COMPILE_ET'] = 'compile_et'
28
 
29
 HEIMDAL_BINARY('samba4kinit',
30
     'kuser/kinit.c',
31
diff -Nura samba-4.1.3.orig/source4/heimdal_build/wscript_configure samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_configure
32
--- samba-4.1.3.orig/source4/heimdal_build/wscript_configure    2013-12-12 16:45:46.951965484 -0300
33
+++ samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_configure   2013-12-18 21:55:08.813653187 -0300
34
@@ -162,6 +162,8 @@
35
 conf.define('HAVE_KRB5_PRINCIPAL_GET_NUM_COMP', 1)
36
 conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1)
37
 conf.define('HAVE_FLAGS_IN_KRB5_CREDS', 1)
38
+conf.define('USING_SYSTEM_ASN1_COMPILE', 1)
39
+conf.define('USING_SYSTEM_COMPILE_ET', 1)
40
 
41
 heimdal_includedirs = []
42
 heimdal_libdirs = []
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.