[csw-devel] SF.net SVN: gar:[16064] csw/mgar/pkg/samba/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 16064
          http://gar.svn.sourceforge.net/gar/?rev=16064&view=rev
Author:   dmichelsen
Date:     2011-11-03 16:27:10 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
samba: Fix build, first update of deps

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2011-11-03 16:02:08 UTC (rev 16063)
+++ csw/mgar/pkg/samba/trunk/Makefile	2011-11-03 16:27:10 UTC (rev 16064)
@@ -11,7 +11,6 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 #What needs to be fixed:
-# old installed libsmbclient.h is included first at Compiling libsmb/libsmb_cache.c
 # Split libs and packages
 
 BUILD_DEP_PKGS += CSWlibtalloc-dev
@@ -19,7 +18,19 @@
 
 PACKAGES += CSWsamba
 SPKG_DESC_CSWsamba = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWsamba = CSWsasl CSWsambacommon CSWoldaprt CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext CSWfam
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibpopt0
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibz1
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWsamba += CSWgamin
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibk5crypto3
 
 #PACKAGES += CSWsambaclient
 SPKG_DESC_CSWsambaclient = Client binaries for samba
@@ -49,18 +60,32 @@
 SPKG_DESC_CSWsambawb = not sure what this is
 RUNTIME_DEP_PKGS_CSWsambawb = CSWsamba
 
-CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
-CONFIGURE_ARGS = $(DIRPATHS) --enable-socket-wrapper
 EXTRA_CFLAGS = -lintl
 EXTRA_LDFLAGS = -lintl
 
-#Tests need root
-SKIPTEST = 1
+CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --enable-socket-wrapper
+
+BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile
+
+TEST_SCRIPTS = $(WORKSRC)/source3/Makefile
 TEST_TARGET = test
-TEST_SCRIPTS = $(WORKSRC)/source3/Makefile
 
-BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile
+# Tests need root
+SKIPTEST ?= 1
+
 INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile
 
+include gar/category.mk
 
-include gar/category.mk
+post-extract-modulated:
+	# Make sure to EXCLUDE the include path from 'krb5-config --cflags' as it is prepended to CFLAGS
+	# leading to the inclusion of /opt/csw/include header files before the newly build ones.
+	# The line looks like this:
+	#   KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
+	# and after the transformation it looks like this:
+	#   KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s,-I/opt/csw/include,,`"
+	-perl -pi -e 's!/\@INCLUDE_des\@//!,-I$(includedir),,!' \
+		$(WORKSRC)/source3/configure
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.