SF.net SVN: gar:[25393] csw/mgar/pkg/389-adminutil/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25393
          http://sourceforge.net/p/gar/code/25393
Author:   cgrzemba
Date:     2015-11-20 07:10:03 +0000 (Fri, 20 Nov 2015)
Log Message:
-----------
389-adminutil/trunk: add patch for removal of SPARc special linking

Modified Paths:
--------------
    csw/mgar/pkg/389-adminutil/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2015-11-19 20:10:19 UTC (rev 25392)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2015-11-20 07:10:03 UTC (rev 25393)
@@ -17,7 +17,7 @@
 DISTNAME  = adminutil-$(NAME)-$(VERSION)
 DISTFILES  = $(DISTNAME).tar.gz
 
-BUILD64 = 1
+BUILD64_ONLY = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 GARCOMPILER = SOS12U4
@@ -28,6 +28,8 @@
 # LDAPAPI=mozldap
 LDAPAPI=openldap
 
+PATCHFILES += 0001-remove-sparc-cxx-link-options
+
 PACKAGES += CSWlibadminutil0
 CATALOGNAME_CSWlibadminutil0 = libadminutil0
 SPKG_DESC_CSWlibadminutil0 += $(DESCRIPTION), libadminutil
@@ -37,8 +39,11 @@
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc55
+RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicudata55
+RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicui18n55
 RUNTIME_DEP_PKGS_CSWlibadminutil0_openldap += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(LDAPAPI))
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(GARCH))
 
 PACKAGES += CSWlibadmsslutil0
 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0
@@ -49,8 +54,12 @@
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicudata55
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicui18n55
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicuuc55
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0_openldap += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(LDAPAPI))
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(GARCH))
 
 PACKAGES += CSW389-adminutil-dev
 CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev
@@ -62,7 +71,9 @@
 
 
 TEST_SCRIPTS = 
-EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+# EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+EXTRA_CFLAGS = -xnorunpath
+# EXTRA_CXXFLAGS = -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_mozldap += --with-ldapsdk-inc=$(includedir)/dirsrv 
@@ -82,10 +93,9 @@
 
 include gar/category.mk
 
-# pre-configure-modulated:
-# 	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
-# 	cd $(WORKSRC) && aclocal
-# 	cd $(WORKSRC) && autoconf --force
-# 	cd $(WORKSRC) && automake -a -c -f
-# 	@$(MAKECOOKIE)
-
+pre-configure:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && aclocal
+	cd $(WORKSRC) && autoconf --force
+	cd $(WORKSRC) && automake -a -c -f
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options	                        (rev 0)
+++ csw/mgar/pkg/389-adminutil/trunk/files/0001-remove-sparc-cxx-link-options	2015-11-20 07:10:03 UTC (rev 25393)
@@ -0,0 +1,29 @@
+# revert changes for bug 245208, obsolete
+# https://fedorahosted.org/389/ticket/48352
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,12 +63,6 @@ case $host in
+   sparc-sun-solaris*)
+     platform_defs="-DXP_UNIX"
+     platform="solaris"
+-dnl Cstd and Crun are required to link any C++ related code (ICU)
+-    LIBCSTD=-lCstd
+-    AC_SUBST([LIBCSTD], [$LIBCSTD])
+-    LIBCRUN=-lCrun
+-    AC_SUBST([LIBCRUN], [$LIBCRUN])
+-    CXXLINK_REQUIRED=1
+     ;;
+   *)
+     platform_defs=""
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,9 +1,6 @@
+ # look for included m4 files in the ./m4/ directory
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-LIBCSTD=@LIBCSTD@
+-LIBCRUN=@LIBCRUN@
+-
+ #------------------------
+ # Compiler Flags
+ #------------------------

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