[csw-devel] SF.net SVN: gar:[21235] csw/mgar/pkg/samba/branches/samba3/Makefile
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Sat Jun 1 10:47:58 CEST 2013
Revision: 21235
http://gar.svn.sourceforge.net/gar/?rev=21235&view=rev
Author: lblume
Date: 2013-06-01 08:47:58 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
samba/branches/samba3: Enable CUPS for 64 bit; force -z ignore -z lazyload
Modified Paths:
--------------
csw/mgar/pkg/samba/branches/samba3/Makefile
Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-05-31 13:43:02 UTC (rev 21234)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-01 08:47:58 UTC (rev 21235)
@@ -24,12 +24,17 @@
# This is taken from the old Samba package
DISTFILES += cswkrb5.conf
+GARCOMPILER=SOS12U3
+
#What needs to be fixed:
# Split libs and packages
BUILD_DEP_PKGS += CSWlibtalloc-dev
BUILD_DEP_PKGS += CSWopenldap-dev
BUILD_DEP_PKGS += CSWlibkrb5-dev
+BUILD_DEP_PKGS += CSWcups-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -44,13 +49,14 @@
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
RUNTIME_DEP_PKGS_CSWsamba += CSWliblber2-4-2
RUNTIME_DEP_PKGS_CSWsamba += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1
# Make one unified package for now
OBSOLETED_BY_CSWsamba += CSWsambacommon
@@ -71,25 +77,15 @@
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtalloc2
RUNTIME_DEP_PKGS_CSWsamba-client += CSWliblber2-4-2
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibwbclient0
RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtdb1
OBSOLETED_BY_CSWsamba-client += CSWsambaclient
CATALOGNAME_CSWsambaclient = samba_client_stub
-#PACKAGES += CSWsambacommon
-SPKG_DESC_CSWsambacommon = Shared support files for samba
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWsasl
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWreadline
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibpopt
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibnet
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWiconv
-RUNTIME_DEP_PKGS_CSWsambacommon += CSWggettext
-
#PACKAGES += CSWsambadoc
SPKG_DESC_CSWsambadoc = Samba documentation
ARCHALL_CSWsambadoc = 1
@@ -112,19 +108,6 @@
OBSOLETED_BY_CSWlibsmbclient0 += CSWsambalib
CATALOGNAME_CSWsambalib = samba_lib_stub
-PACKAGES += CSWlibnetapi0
-PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0)
-SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0
-
-PACKAGES += CSWlibsmbsharemodes0
-PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0)
-SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0
-
-PACKAGES += CSWlibtdb1
-PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1)
-SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1
-RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1
-
PACKAGES += CSWlibwbclient0
PKGFILES_CSWlibwbclient0 += $(call pkgfiles_lib,libwbclient.so.0)
SPKG_DESC_CSWlibwbclient0 += Samba client library, libwbclient.so.0
@@ -134,15 +117,15 @@
SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgssapi-krb5-2
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibwbclient0
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibcom-err3
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2
RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibwbclient0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1
PACKAGES += CSWlibsmbsharemodes0
PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0)
@@ -250,23 +233,23 @@
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibz1
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgssapi-krb5-2
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibcom-err3
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2
RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibnss-winbind1
+RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0
+RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1
OBSOLETED_BY_CSWsamba-winbind += CSWsambawb
CATALOGNAME_CSWsambawb = samba_wb_stub
CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1
-EXTRA_CFLAGS = -lintl
-EXTRA_LDFLAGS = -lintl
+# Needed as the configure script doesn't add it
+EXTRA_LINKER_FLAGS += -lintl -z ignore -z lazyload
BUILD64 = 1
ISAEXEC = 1
@@ -280,8 +263,6 @@
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --enable-shared=yes
CONFIGURE_ARGS += --enable-static=no
-#CONFIGURE_ARGS += --enable-socket-wrapper
-#CONFIGURE_ARGS += --enable-nss-wrapper
CONFIGURE_ARGS += --with-acl-support
CONFIGURE_ARGS += --with-aio-support
CONFIGURE_ARGS += --with-pam
@@ -293,7 +274,7 @@
CONFIGURE_ARGS += --with-ldap
CONFIGURE_ARGS += --with-automount
CONFIGURE_ARGS += --with-dnsupdate=no
-# Do not set krb5 this is handeled in gar. Otherwise 64bit will not build
+# Do not set krb5 this is handled in gar. Otherwise 64bit will not build
#CONFIGURE_ARGS += --with-krb5=$(prefix)
CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR)
CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR)
@@ -304,16 +285,12 @@
CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR)
-CONFIGURE_ARGS-64 += --disable-cups
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
-
# Can't use fdatasync atm do to linker problems
+# Symbols are not in the right libc
CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no
CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no
CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no
-
-
BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile
TEST_SCRIPTS = $(WORKSRC)/source3/Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list