svn commit: samba r25880 - in branches/SAMBA_4_0: . source/lib/ldb source/lib/replace

jelmer at samba.org jelmer at samba.org
Tue Nov 6 18:25:35 GMT 2007


Author: jelmer
Date: 2007-11-06 18:25:34 +0000 (Tue, 06 Nov 2007)
New Revision: 25880

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

Log:
Try to get some more flags right.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-06 16:42:11 UTC (rev 25879)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-06 18:25:34 UTC (rev 25880)
@@ -97,7 +97,7 @@
 STATICLIB = lib/libldb.a
 
 $(SOLIB): $(OBJS)
-	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^ @LDFLAGS@ @LIBS@ $(TALLOC_LIBS) $(TDB_LIBS)
+	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^ $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS)
 
 all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
 
@@ -124,7 +124,7 @@
 	@-ranlib $@
 
 lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(LIBS) bin/libldb.a
-	$(CC) $(SHLD_FLAGS) -Wl,-soname,libnss_ldb.$(SHLIBEXT).2 -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
+	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)libnss_ldb.$(SHLIBEXT).2 -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
 
 sample_module.$(SHLIBEXT): tests/sample_module.o 
 	$(CC) $(SHLD_FLAGS) $(LIBS) $(LDFLAGS) -o $@ tests/sample_module.o 

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4	2007-11-06 16:42:11 UTC (rev 25879)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4	2007-11-06 18:25:34 UTC (rev 25880)
@@ -8,7 +8,7 @@
 		hpux* )
 		  LD_EXPORT_DYNAMIC="-Wl,-E"
 		  ;;
-		* )
+		*)
 		  LD_EXPORT_DYNAMIC=""
 		  ;;
 	  esac
@@ -101,7 +101,7 @@
 			SHLD_FLAGS="-b -Wl,-B,symbolic,-b,-z"
 			;;
 		*darwin*)
-			SHLD_FLAGS="-bundle -flat_namespace -undefined suppress"
+			SHLD_FLAGS="-dynamiclib"
 			;;
 	esac
 
@@ -150,7 +150,7 @@
 			SONAMEFLAG="-Wl,-soname,"
 			;;
 		*irix*)
-			SONAMEFLAG="-soname "
+			SONAMEFLAG="-Wl,-soname,"
 			;;
 		*hpux*)
 			SONAMEFLAG="-Wl,+h "
@@ -162,7 +162,7 @@
 			SONAMEFLAG="-Wl,-soname,"
 			;;
 		*darwin*)
-			SONAMEFLAG="-Wl,-soname,"
+			SONAMEFLAG="-install_name "
 			;;
 		esac
 ])



More information about the samba-cvs mailing list