diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-04 20:36:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:36:49 -0500 |
| commit | fcd2f2e8f564a2aa5d6f94a2fd810b0800a335ed (patch) | |
| tree | 9012c881e305dad6f6c49cc41c102a6605f5701f | |
| parent | 7a734d3b30540d12b5f58aa4b5e51edd39e2be53 (diff) | |
| download | samba-fcd2f2e8f564a2aa5d6f94a2fd810b0800a335ed.tar.gz samba-fcd2f2e8f564a2aa5d6f94a2fd810b0800a335ed.tar.bz2 samba-fcd2f2e8f564a2aa5d6f94a2fd810b0800a335ed.zip | |
r20529: very, very ugly...
But this is currently needed to make regpatch linking in
the dsdb/schema/schema_*.o object files.
the problem is that the linker doesn't find any references to public symbols
in this files and removes them from the link list.
gnu ld has a --whole-archive option, but it seems to be not portable...
I think the solution with prelinking using 'ld -r' to create one object file
for a subsystem instead of using 'ar -rcs' to create an archive for a subsystem...
jelmer: any ideas about this problem?
metze
(This used to be commit 46df7ff6e5e74eddcb81b5a195e82688d83afaf4)
| -rw-r--r-- | source4/dsdb/config.mk | 4 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/config.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index dc7254b1e9..206f65d67d 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -7,7 +7,9 @@ include samdb/ldb_modules/config.mk [SUBSYSTEM::SAMDB] PUBLIC_PROTO_HEADER = samdb/samdb_proto.h PUBLIC_HEADERS = samdb/samdb.h -PUBLIC_DEPENDENCIES = ldb LIBCLI_LDAP HEIMDAL_KRB5 +PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 +PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI +LDFLAGS = $(LIBRARY_ldb_OUTPUT) OBJ_FILES = \ samdb/samdb.o \ samdb/samdb_privilege.o \ diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 95059c800e..f2706c0995 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -15,13 +15,11 @@ PUBLIC_DEPENDENCIES = \ # Start MODULE ldb_repl_mata_data [MODULE::ldb_repl_meta_data] SUBSYSTEM = ldb -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI INIT_FUNCTION = repl_meta_data_module_init OBJ_FILES = \ repl_meta_data.o -PUBLIC_DEPENDENCIES = \ - LIBNDR NDR_MISC -# End MODULE ldb_objectguid +# End MODULE ldb_repl_meta_data ################################################ ################################################ |