The branch, v3-5-test has been updated via fe9dde3... s3:configure: use cc for linking on IRIX and fix shlib usage via 4a7f1c9... s3:vfs_scannedonly: fix a build issue on IRIX and HP-UX from f2330cc... check if LD_AS_NEEDED breaks linking with libreadline fixes #7209
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit fe9dde3a629db9ae98ff6d94be145aa7e7c2d9ce Author: Björn Jacke <b...@sernet.de> Date: Wed Jun 16 23:36:38 2010 +0200 s3:configure: use cc for linking on IRIX and fix shlib usage The last two patches address bug #7504 (numerous build glitches to be fixed). commit 4a7f1c92f7a1471f5edf06736835a5dc979af3f7 Author: Björn Jacke <b...@sernet.de> Date: Wed Feb 3 23:28:38 2010 +0100 s3:vfs_scannedonly: fix a build issue on IRIX and HP-UX this is a cherry-pick of ae95e8028c294ee1e2dc66a7a62d006572142629 ----------------------------------------------------------------------- Summary of changes: source3/configure.in | 5 ++--- source3/modules/vfs_scannedonly.c | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 4e9ee1b..4360ca6 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1571,9 +1571,8 @@ DSO_EXPORTS="" ;; esac BLDSHARED="true" - LDSHFLAGS="-set_version sgi1.0 -shared" - SONAMEFLAG="-soname " - SHLD="\${LD}" + LDSHFLAGS="-Wl,-set_version,sgi1.0 -shared" + SONAMEFLAG="-Wl,-soname," if test "${GCC}" = "yes"; then PICFLAG="-fPIC" else diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c index 0e32a6f..12077f3 100644 --- a/source3/modules/vfs_scannedonly.c +++ b/source3/modules/vfs_scannedonly.c @@ -53,6 +53,12 @@ #define SENDBUFFERSIZE 1450 +#ifndef SUN_LEN +#define SUN_LEN(sunp) ((size_t)((struct sockaddr_un *)0)->sun_path \ + + strlen((sunp)->sun_path)) +#endif + + struct Tscannedonly { int socket; int domain_socket; -- Samba Shared Repository