Revision: 16745
http://gar.svn.sourceforge.net/gar/?rev=16745&view=rev
Author: cgrzemba
Date: 2012-01-12 12:37:29 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add patch for i386
Modified Paths:
--------------
csw/mgar/pkg/389-ds-base/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
Removed Paths:
-------------
csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-01-12 10:39:23 UTC (rev
16744)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-01-12 12:37:29 UTC (rev
16745)
@@ -17,13 +17,15 @@
PACKAGING_PLATFORMS += solaris10-sparc
PACKAGING_PLATFORMS += solaris10-i386
-LICENSE = LICENSE LICENSE.GPLv2
+LICENSE = LICENSE
PATCHFILES += 0005-add-standard-path.patch
PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
-PATCHFILES += 0004-move-include-path.patch
+# until Red Hat Bugzilla Bug 773617 is open do it yourself
+PATCHFILES += 0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
+INITSMF = /etc/opt/csw/init.d/dirsrv
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWperl
@@ -32,28 +34,31 @@
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldif60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsvrcore0
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnspr4
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicu46
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWnetsnmp
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWkrb5lib
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre0
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3
RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWbdb48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
+CHECKPKG_OVERRIDES_CSW389-ds-base += pkginfo-opencsw-repository-uncommitted
+
CHECKPKG_OVERRIDES_CSW389-ds-base +=
file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
CHECKPKG_OVERRIDES_CSW389-ds-base +=
file-with-bad-content|/usr/share|root/opt/csw/share/dirsrv/updates/exampleupdate.ldif
CHECKPKG_OVERRIDES_CSW389-ds-base +=
file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbgen.pl.1
-CHECKPKG_OVERRIDES_CSW389-ds-base +=
license-missing|/opt/csw/share/doc/389_ds_base/license
-CHECKPKG_OVERRIDES_CSW389-ds-base +=
init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv|class=none
CHECKPKG_OVERRIDES_CSW389-ds-base +=
init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none
-CHECKPKG_OVERRIDES_CSW389-ds-base +=
soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libback-ldbm.so
-CHECKPKG_OVERRIDES_CSW389-ds-base +=
soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/bin/dbscan-bin
-CHECKPKG_OVERRIDES_CSW389-ds-base +=
soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libreplication-plugin.so
-# GARCOMPILER = SOS12U2
+GARCOMPILER = SOS12U2
EXTRA_LIB = /opt/csw/bdb48/lib
# remove -I/opt/csw/include
CPPFLAGS =
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv
@@ -81,4 +86,5 @@
cd $(WORKSRC) && aclocal
cd $(WORKSRC) && autoconf --force
cd $(WORKSRC) && automake -a -c -f
+ cd $(WORKSRC) && autoheader
@$(MAKECOOKIE)
Added:
csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
===================================================================
---
csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
(rev 0)
+++
csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
2012-01-12 12:37:29 UTC (rev 16745)
@@ -0,0 +1,90 @@
+From f4315b6b8516a8bfd9b09d2723b78c90e4581652 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrze...@opencsw.org>
+Date: Thu, 12 Jan 2012 12:09:34 +0100
+Subject: [PATCH] add i386 platform to Makefile.am and configure.ac
+
+---
+ Makefile.am | 4 ++--
+ configure.ac | 18 ++++++++++++++----
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4bf1966..6b01783 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -682,7 +682,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
+ $(libavl_a_SOURCES)
+
+ libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@
@kerberos_inc@ @pcre_inc@
+-if SOLARIS
++if SPARC
+ libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
+ endif
+
+@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES =
ldap/servers/plugins/collation/collate.c \
+ ldap/servers/plugins/collation/config.c \
+ ldap/servers/plugins/collation/orfilter.c
+
+-libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
++libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
+ libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
$(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+ libcollation_plugin_la_LDFLAGS = -avoid-version
+ libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
+diff --git a/configure.ac b/configure.ac
+index 6d8e277..ad94787 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,20 +460,18 @@ case $host in
+ # HPUX doesn't use /etc for this
+ initdir=/init.d
+ ;;
+- sparc-sun-solaris*)
++ *-*-solaris*)
+ AC_DEFINE([XP_UNIX], [1], [UNIX])
+ AC_DEFINE([SVR4], [1], [SVR4])
+ AC_DEFINE([__svr4], [1], [SVR4])
+ AC_DEFINE([__svr4__], [1], [SVR4])
+ AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
+ AC_DEFINE([SOLARIS], [1], [SOLARIS])
+- AC_DEFINE([CPU_sparc], [], [cpu type sparc])
+ AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
+ AC_DEFINE([sunos5], [1], [SunOS5])
+ AC_DEFINE([OSVERSION], [509], [OS version])
+ AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
+ AC_DEFINE([NO_DOMAINNAME], [1], [no getdomainname])
+- AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
+ dnl socket nsl and dl are required to link several programs and libdb
+ LIBSOCKET=-lsocket
+ AC_SUBST([LIBSOCKET], [$LIBSOCKET])
+@@ -488,8 +486,19 @@ dnl Cstd and Crun are required to link any C++ related
code
+ AC_SUBST([LIBCRUN], [$LIBCRUN])
+ platform="solaris"
+ # assume 64 bit
+- perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
+ initdir='$(sysconfdir)/init.d'
++ case $host in
++ i?86-*-solaris2.1[[0-9]]*)
++dnl I dont know why i386 need this explicit
++ AC_DEFINE([HAVE_GETPEERUCRED], [1], [have getpeerucred])
++ ;;
++ sparc-*-solaris*)
++dnl includes some assembler stuff in counter.o
++ AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
++ AC_DEFINE([CPU_sparc], [], [cpu type sparc])
++ TARGET='SPARC'
++ ;;
++ esac
+ ;;
+ *)
+ platform=""
+@@ -519,6 +528,7 @@ AC_SUBST(initconfigdir)
+
+ AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
+ AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
++AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+
+ # Check for library dependencies
+ m4_include(m4/nspr.m4)
+--
+1.7.8.2
+
Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
2012-01-12 10:39:23 UTC (rev 16744)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
2012-01-12 12:37:29 UTC (rev 16745)
@@ -1,25 +0,0 @@
-From 4087ee0524bc902f9bb3442c7ce8a35c112f1bbe Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrze...@opencsw.org>
-Date: Wed, 11 Jan 2012 10:15:19 +0100
-Subject: [PATCH] move include path
-
----
- Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4bf1966..a4a9fa0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES =
ldap/servers/plugins/collation/collate.c \
- ldap/servers/plugins/collation/config.c \
- ldap/servers/plugins/collation/orfilter.c
-
--libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-+libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
- libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK)
$(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
- libcollation_plugin_la_LDFLAGS = -avoid-version
- libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
---
-1.7.8.2
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
