Attachment 9194 Details for Bug 10129 – patch

[patch] patch

samba-pkgdeps.diff (text/plain), 4.45 KB, created by Jan Engelhardt on 2013-09-06 16:21:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Engelhardt

Created: 2013-09-06 16:21:19 UTC

Size: 4.45 KB

patch

obsolete

>From: Jan Engelhardt <jengelh@inai.de>
>Date: 2013-09-05 20:57:12.102286309 +0200
>
>build: correct package dependencies
>
>The wscript_build files convey what header files belong to which
>logical package. For example,
>
>	# lib/util/wscript_build:
>	bld.SAMBA_LIBRARY('samba-util',
>		public_headers='... data_blob.h ...'
>
>	# auth/credentials/wscript_build:
>	bld.SAMBA_LIBRARY('samba-credentials',                                          
>		public_headers='credentials.h',                                         
>
>Now, credentials.h #includes <util/data_blob.h> and therefore,
>samba-credentials.pc must have a Requires: samba-util.
>
>Similarly for other parts.
>
>---
> auth/credentials/samba-credentials.pc.in |    1 +
> auth/gensec/gensec.pc.in                 |    1 +
> librpc/ndr_krb5pac.pc.in                 |    2 +-
> source4/lib/registry/registry.pc.in      |    2 +-
> source4/libcli/raw/smbclient-raw.pc.in   |    1 +
> source4/librpc/dcerpc.pc.in              |    2 +-
> source4/librpc/dcerpc_samr.pc.in         |    2 +-
> 7 files changed, 7 insertions(+), 4 deletions(-)
>
>Index: samba-4.1.0rc2/auth/credentials/samba-credentials.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/auth/credentials/samba-credentials.pc.in
>+++ samba-4.1.0rc2/auth/credentials/samba-credentials.pc.in
>@@ -6,6 +6,7 @@ modulesdir=${prefix}/modules/gensec
> 
> Name: samba-credentials
> Description: Credentials management
>+Requires: samba-util ndr
> Version: @PACKAGE_VERSION@
> Libs: @LIB_RPATH@ -L${libdir} -lsamba-credentials
> Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
>Index: samba-4.1.0rc2/auth/gensec/gensec.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/auth/gensec/gensec.pc.in
>+++ samba-4.1.0rc2/auth/gensec/gensec.pc.in
>@@ -6,6 +6,7 @@ modulesdir=${prefix}/modules/gensec
> 
> Name: gensec
> Description: Generic Security Library
>+Requires: samba-util
> Version: @PACKAGE_VERSION@
> Libs: @LIB_RPATH@ -L${libdir} -lgensec
> Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
>Index: samba-4.1.0rc2/librpc/ndr_krb5pac.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/librpc/ndr_krb5pac.pc.in
>+++ samba-4.1.0rc2/librpc/ndr_krb5pac.pc.in
>@@ -5,7 +5,7 @@ includedir=@includedir@
> 
> Name: ndr-krb5pac
> Description: NDR marshallers for the KRB5 PAC formats
>-Requires: ndr
>+Requires: ndr ndr_standard
> Version: 0.0.1
> Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac
> Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
>Index: samba-4.1.0rc2/source4/lib/registry/registry.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/source4/lib/registry/registry.pc.in
>+++ samba-4.1.0rc2/source4/lib/registry/registry.pc.in
>@@ -5,7 +5,7 @@ includedir=@includedir@
> 
> Name: registry
> Description: Windows-style registry library
>-Requires: talloc
>+Requires: talloc samba-util
> Requires.private: ldb
> Version: @PACKAGE_VERSION@
> Libs: @LIB_RPATH@ -L${libdir} -lregistry
>Index: samba-4.1.0rc2/source4/libcli/raw/smbclient-raw.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/source4/libcli/raw/smbclient-raw.pc.in
>+++ samba-4.1.0rc2/source4/libcli/raw/smbclient-raw.pc.in
>@@ -5,6 +5,7 @@ includedir=@includedir@
> 
> Name: smbclient-raw
> Description: SMB client
>+Requires: ndr_nbt
> Version: @PACKAGE_VERSION@
> Libs: @LIB_RPATH@ -L${libdir} -lsmbclient-raw
> Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
>Index: samba-4.1.0rc2/source4/librpc/dcerpc.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/source4/librpc/dcerpc.pc.in
>+++ samba-4.1.0rc2/source4/librpc/dcerpc.pc.in
>@@ -5,7 +5,7 @@ includedir=@includedir@
> 
> Name: dcerpc
> Description: DCE/RPC client library
>-Requires: ndr
>+Requires: ndr samba-util
> Version: @PACKAGE_VERSION@
> Libs: @LIB_RPATH@ -L${libdir} -ldcerpc -ldcerpc-binding
> Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
>Index: samba-4.1.0rc2/source4/librpc/dcerpc_samr.pc.in
>===================================================================
>--- samba-4.1.0rc2.orig/source4/librpc/dcerpc_samr.pc.in
>+++ samba-4.1.0rc2/source4/librpc/dcerpc_samr.pc.in
>@@ -5,7 +5,7 @@ includedir=@includedir@
> 
> Name: dcerpc_samr
> Description: DCE/RPC client library - SAMR
>-Requires.private: dcerpc ndr
>+Requires: dcerpc ndr ndr_standard
> Version: @PACKAGE_VERSION@
> Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-samr
> Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

Flags:

ddiss: review+
jmcd: review+

Actions: View

Attachments on bug 10129: 9194