samba3: re-enable universal variant

[liuqi_colin@…]

Modify the AR command in Makefile.in to add -s argument. This allows the broken multi-architecture archive files to be corrected.

[liuqi_colin@…]

This should reintroduce the universal variant which was disabled in r108866 as a result of #34558. I tested on Mac OS X 10.9.5.

[ryandesign (Ryan Carsten Schmidt)]

Thanks.

The line universal_variant yes should be removed because that is the default.

[ryandesign (Ryan Carsten Schmidt)]

r130906

[cooljeanius (Eric Gallager)]

The new universal variant seems to be broken for me on 10.6.8:

DEBUG: Executing proc-post-org.macports.destroot-destroot-0
xinstall: mkdir /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_samba3/samba3/work/destroot/opt/local/etc/samba3
xinstall: /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_samba3/samba3/work/samba-3.6.24/source3/../examples/smb.conf.default -> /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_samba3/samba3/work/destroot/opt/local/etc/samba3/smb.conf.sample
error: install_name_tool: can't open file: /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_samba3/samba3/work/destroot/opt/local/lib/samba3/security/pam_smbpass.dylib (No such file or directory)
Command failed: install_name_tool  -change bin/libnetapi.dylib.0 /opt/local/lib/samba3/libnetapi.dylib  -change bin/libsmbclient.dylib.0 /opt/local/lib/samba3/libsmbclient.dylib  -change bin/libsmbsharemodes.dylib.0 /opt/local/lib/samba3/libsmbsharemodes.dylib  -change bin/libtalloc.dylib.2 /opt/local/lib/samba3/libtalloc.dylib  -change bin/libtevent.dylib.0 /opt/local/lib/samba3/libtevent.dylib  -change bin/libtdb.dylib.1 /opt/local/lib/samba3/libtdb.dylib  -change bin/script.dylib /opt/local/lib/samba3/auth/script.dylib  -change bin/CP437.dylib /opt/local/lib/samba3/charset/CP437.dylib  -change bin/CP850.dylib /opt/local/lib/samba3/charset/CP850.dylib  -change bin/macosxfs.dylib /opt/local/lib/samba3/charset/macosxfs.dylib  -change bin/autorid.dylib /opt/local/lib/samba3/idmap/autorid.dylib  -change bin/pam_smbpass.dylib /opt/local/lib/samba3/security/pam_smbpass.dylib  -change bin/acl_tdb.dylib /opt/local/lib/samba3/vfs/acl_tdb.dylib  -change bin/acl_xattr.dylib /opt/local/lib/samba3/vfs/acl_xattr.dylib  -change bin/audit.dylib /opt/local/lib/samba3/vfs/audit.dylib  -change bin/cap.dylib /opt/local/lib/samba3/vfs/cap.dylib  -change bin/catia.dylib /opt/local/lib/samba3/vfs/catia.dylib  -change bin/crossrename.dylib /opt/local/lib/samba3/vfs/crossrename.dylib  -change bin/default_quota.dylib /opt/local/lib/samba3/vfs/default_quota.dylib  -change bin/expand_msdfs.dylib /opt/local/lib/samba3/vfs/expand_msdfs.dylib  -change bin/extd_audit.dylib /opt/local/lib/samba3/vfs/extd_audit.dylib  -change bin/fake_perms.dylib /opt/local/lib/samba3/vfs/fake_perms.dylib  -change bin/full_audit.dylib /opt/local/lib/samba3/vfs/full_audit.dylib  -change bin/linux_xfs_sgid.dylib /opt/local/lib/samba3/vfs/linux_xfs_sgid.dylib  -change bin/netatalk.dylib /opt/local/lib/samba3/vfs/netatalk.dylib  -change bin/preopen.dylib /opt/local/lib/samba3/vfs/preopen.dylib  -change bin/readahead.dylib /opt/local/lib/samba3/vfs/readahead.dylib  -change bin/readonly.dylib /opt/local/lib/samba3/vfs/readonly.dylib  -change bin/recycle.dylib /opt/local/lib/samba3/vfs/recycle.dylib  -change bin/scannedonly.dylib /opt/local/lib/samba3/vfs/scannedonly.dylib  -change bin/shadow_copy.dylib /opt/local/lib/samba3/vfs/shadow_copy.dylib  -change bin/shadow_copy2.dylib /opt/local/lib/samba3/vfs/shadow_copy2.dylib  -change bin/smb_traffic_analyzer.dylib /opt/local/lib/samba3/vfs/smb_traffic_analyzer.dylib  -change bin/streams_depot.dylib /opt/local/lib/samba3/vfs/streams_depot.dylib  -change bin/streams_xattr.dylib /opt/local/lib/samba3/vfs/streams_xattr.dylib  -change bin/time_audit.dylib /opt/local/lib/samba3/vfs/time_audit.dylib  -change bin/xattr_tdb.dylib /opt/local/lib/samba3/vfs/xattr_tdb.dylib -id /opt/local/lib/samba3/security/pam_smbpass.dylib /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_net_samba3/samba3/work/destroot/opt/local/lib/samba3/security/pam_smbpass.dylib
Exit code: 1

I'm guessing I should probably open a new ticket with the full log...

[cooljeanius (Eric Gallager)]

Cc Me!