--- a/components/samba/samba/Makefile Mon May 04 10:54:49 2015 -0700
+++ b/components/samba/samba/Makefile Thu Jul 31 01:53:13 2014 -0700
@@ -25,6 +25,9 @@
# parfait seems to spin when looking at the .bc files, so
# for now disable it.
+# J.S. - parfait does not spin but Samba parfait build takes 20+ hrs. even on
+# powerfull enough machines so this option is the best what can be done with
+# parfait.
PARFAIT_BUILD=no
include ../../../make-rules/shared-macros.mk
@@ -47,11 +50,6 @@
sha256:d6bdfd76f672c810299c71443e5127431ffb87d2c79d818aee72c86eaccd312c
COMPONENT_ARCHIVE_URL_1= http://sourceforge.net/projects/docbook/files/$(COMPONENT_NAME_1)/$(COMPONENT_VERSION_1)/$(COMPONENT_ARCHIVE_1)
-COMPONENT_ARCHIVE_2= libsam-LGPL.tar
-COMPONENT_ARCHIVE_HASH_2= \
- sha256:4324f2c4a9ba94f1165c5922f166636621681b09d635257d921f6df654e7191e
-COMPONENT_ARCHIVE_URL_2= http://hub.opensolaris.org/bin/download/Project+samqfs/files/libsam%2DLGPL.tar
-
# Samba does not work properly on i86 when built by studio.
# Samba on SPARC has serious performance drop when built by gcc.
ifeq ($(MACH), sparc)
@@ -115,12 +113,11 @@
( cd $(@D) ; $(CONFIG_SHELL) autogen.sh )
# Depend on $(PROTO_DIR)/.mozldap because this target creates $(PROTO_DIR).
-$(PROTO_DIR)/opt/SUNWsamfs/lib/libsam.so: Solaris/libsam.c \
- $(COMPONENT_ARCHIVE_2) $(PROTO_DIR)/.mozldap
+$(PROTO_DIR)/opt/SUNWsamfs/lib/libsam.so: Solaris/libsam.c $(PROTO_DIR)/.mozldap
$(MKDIR) $(PROTO_DIR)/opt/SUNWsamfs/lib
$(CC.studio.32) -G $(studio_PIC) -hlibsam.so Solaris/libsam.c \
+ -I$(COMPONENT_DIR)/Solaris/include \
-o $(PROTO_DIR)/opt/SUNWsamfs/lib/libsam.so
- cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_2)
CFLAGS.studio += $(studio_C99_ENABLE)
CFLAGS.gcc3 += -std=c99
@@ -179,7 +176,7 @@
CONFIGURE_OPTIONS += LD="$(LD)"
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
-CONFIGURE_OPTIONS.32 += CPPFLAGS="$(CPPFLAGS) -I$(BUILD_DIR)/libsam-LGPL/include"
+CONFIGURE_OPTIONS.32 += CPPFLAGS="$(CPPFLAGS) -I$(COMPONENT_DIR)/Solaris/include"
CONFIGURE_OPTIONS.64 += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
CONFIGURE_OPTIONS.32 += LIBS="$(LIBS) $(LIBS32)"