svn commit: samba r20529 - in branches/SAMBA_4_0/source/dsdb: . samdb/ldb_modules

metze at samba.org metze at samba.org
Thu Jan 4 20:36:13 GMT 2007


Author: metze
Date: 2007-01-04 20:36:12 +0000 (Thu, 04 Jan 2007)
New Revision: 20529

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20529

Log:
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
Modified:
   branches/SAMBA_4_0/source/dsdb/config.mk
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/dsdb/config.mk	2007-01-04 20:29:23 UTC (rev 20528)
+++ branches/SAMBA_4_0/source/dsdb/config.mk	2007-01-04 20:36:12 UTC (rev 20529)
@@ -7,7 +7,9 @@
 [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 \

Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk	2007-01-04 20:29:23 UTC (rev 20528)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk	2007-01-04 20:36:12 UTC (rev 20529)
@@ -15,13 +15,11 @@
 # 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
 ################################################
 
 ################################################



More information about the samba-cvs mailing list