The branch, master has been updated via 2466dc7... s3:build: remove CFLAGS from LDSHFLAGS, SHLD has them already via 5f0a2a1... s3:Makefile: position independency is also needed for shared libs via 857ca41... s3:build: don't use pieflags twice - ldflags already have them from d12768c... s3: Fix a typo found by ITPFS oota <t-o...@dh.jp.nec.com>
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2466dc7eaf52165a87a1e0311490034c70536a6e Author: Björn Jacke <b...@sernet.de> Date: Wed May 12 19:05:37 2010 +0200 s3:build: remove CFLAGS from LDSHFLAGS, SHLD has them already commit 5f0a2a15d89089f78875676099cd8a23a18ace9e Author: Björn Jacke <b...@sernet.de> Date: Mon May 24 12:21:40 2010 +0200 s3:Makefile: position independency is also needed for shared libs commit 857ca4176a3f5096629d1aa8a7cd12dd9e224ac1 Author: Björn Jacke <b...@sernet.de> Date: Sat May 22 16:48:16 2010 +0200 s3:build: don't use pieflags twice - ldflags already have them ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 8 ++++---- source3/configure.in | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 4ebb15c..bd48d10 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -46,8 +46,8 @@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@ exee...@exeext@ a...@ar@ -ldshfla...@ldshflags@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@ -ldshflags_modul...@ldshflags@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@ +ldshfla...@pie_ldflags@ @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@ +ldshflags_modul...@pie_ldflags@ @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@ ldfla...@pie_ldflags@ @RELRO_LDFLAGS@ @LDFLAGS@ winbind_nss_ldshfla...@winbind_nss_ldshflags@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@ @@ -1671,12 +1671,12 @@ bin/talloct...@exeext@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTA bin/replacet...@exeext@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) @echo Linking $@ - @$(CC) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \ + @$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \ $(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) bin/smbconft...@exeext@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) @echo Linking $@ - @$(CC) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \ + @$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \ $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) diff --git a/source3/configure.in b/source3/configure.in index 8edb86a..1928490 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1577,13 +1577,10 @@ DSO_EXPORTS="" if test "${ac_cv_prog_gnu_ld}" = "yes"; then DYNEXP="-Wl,-E" fi - # TODO: need to add $CFLAGS here for explicit 64-bit builds? LDSHFLAGS="-shared" else PICFLAG="-KPIC" - ## ${CFLAGS} added for building 64-bit shared - ## libs using Sun's Compiler - LDSHFLAGS="-G \${CFLAGS}" + LDSHFLAGS="-G" fi if test "$ac_cv_prog_gnu_ld" = "yes"; then SONAMEFLAG="-Wl,-soname=" -- Samba Shared Repository