[csw-devel] SF.net SVN: gar:[13834] csw/mgar/pkg/perl/trunk

[bonivart at users.sourceforge.net]

Revision: 13834
          http://gar.svn.sourceforge.net/gar/?rev=13834&view=rev
Author:   bonivart
Date:     2011-03-16 09:04:40 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------
perl/trunk: Clean up Makefile. Remove INC-reorder patch (not needed).

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

Removed Paths:
-------------
    csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch

Modified: csw/mgar/pkg/perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/perl/trunk/Makefile	2011-03-16 08:19:51 UTC (rev 13833)
+++ csw/mgar/pkg/perl/trunk/Makefile	2011-03-16 09:04:40 UTC (rev 13834)
@@ -20,22 +20,19 @@
 PACKAGING_PLATFORMS  = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
-PACKAGES += CSWperl
-SPKG_DESC_CSWperl = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm3
+PACKAGES                 += CSWperl
+SPKG_DESC_CSWperl         = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWperl  = CSWbdb48 CSWlibgdbm3
 INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags
 
-PACKAGES += CSWperldoc
-SPKG_DESC_CSWperldoc = Perl documentation
+PACKAGES                   += CSWperldoc
+SPKG_DESC_CSWperldoc        = Perl documentation
 RUNTIME_DEP_PKGS_CSWperldoc = CSWperl
-ARCHALL_CSWperldoc = 1
+ARCHALL_CSWperldoc          = 1
 
 LICENSE = Copying
 
-# Will need to fix this patch to make it apply to 5.12.3
-#PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch
-
-CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWperl    += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl
 
@@ -90,11 +87,11 @@
 CONFIGURE_ARGS += -Dusesitecustomize
 CONFIGURE_ARGS += -Dusethreads
 
+# When built on Solaris 10, enable DTrace support
 ifeq ($(shell uname -r), 5.10)
   CONFIGURE_ARGS += -Dusedtrace
 endif
 
-#CONFIGURE_ARGS += -Dusedtrace
 CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw
 CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw
 CONFIGURE_ARGS += -Dvendorprefix=$(prefix)
@@ -122,7 +119,7 @@
 EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod
 EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod
 
-# Tests take a long time
+# Tests take a long time, run once for every release
 #TEST_SCRIPTS =
 
 # Make sure we don't include the path to the newly built perl as the
@@ -167,18 +164,6 @@
 		ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \
 		ln -s libperl.so.$(VERSION) libperl.so )
 	@$(MAKECOOKIE)
-#	echo YOUAREHERE
-#	( cd $(DESTDIR)$(libdir)/perl/$(VERSION)/${TARGET}/CORE ; \
-#	   chmod 755 libperl.so.$(VERSION) ; \
-#	   rm libperl.so.$(LIB_MINOR) libperl.so ; \
-#	   ln -s libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \
-#	   ln -s libperl.so.$(VERSION) libperl.so )
-#	( cd $(DESTDIR)$(libdir)/perl/$(VERSION)/${TARGET} ; \
-#	   rm libperl* ; \
-#	   ln -s CORE/libperl.so.$(VERSION) libperl.so.$(VERSION) ; \
-#	   ln -s CORE/libperl.so.$(VERSION) libperl.so.$(LIB_MINOR) ; \
-#	   ln -s CORE/libperl.so.$(VERSION) libperl.so )
-#	$(MAKECOOKIE)
 
 # Remove build paths from Config
 POST_TARGETS += perlconf

Deleted: csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch
===================================================================
--- csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch	2011-03-16 08:19:51 UTC (rev 13833)
+++ csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch	2011-03-16 09:04:40 UTC (rev 13834)
@@ -1,60 +0,0 @@
-From 621b2f69f661118c3f35bed411259d08cc984a20 Mon Sep 17 00:00:00 2001
-From: Peter Bonivart <bonivart at opencsw.org>
-Date: Wed, 5 Jan 2011 17:57:25 +0100
-Subject: [PATCH] change-inc-based-on-rhel5-patch
-
----
- perl.c |   23 ++++++++++++-----------
- 1 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/perl.c b/perl.c
-index 94f2b13..a29dcc3 100644
---- a/perl.c
-+++ b/perl.c
-@@ -4879,9 +4879,6 @@ S_init_perllib(pTHX)
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
- #endif
- 
--#ifdef ARCHLIB_EXP
--    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
--#endif
- #ifdef MACOS_TRADITIONAL
-     {
- 	Stat_t tmpstatbuf;
-@@ -4903,14 +4900,6 @@ S_init_perllib(pTHX)
-     if (!PL_tainting)
- 	incpush(":", FALSE, FALSE, TRUE, FALSE);
- #else
--#ifndef PRIVLIB_EXP
--#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
--#endif
--#if defined(WIN32)
--    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
--#else
--    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
--#endif
- 
- #ifdef SITEARCH_EXP
-     /* sitearch is always relative to sitelib on Windows for
-@@ -4958,6 +4947,18 @@ S_init_perllib(pTHX)
-     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
- #endif
- 
-+#ifdef ARCHLIB_EXP
-+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+#endif
-+#ifndef PRIVLIB_EXP
-+#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-+#endif
-+#if defined(WIN32)
-+    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
-+#else
-+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+#endif
-+
-     if (!PL_tainting)
- 	incpush(".", FALSE, FALSE, TRUE, FALSE);
- #endif /* MACOS_TRADITIONAL */
--- 
-1.7.3.2
-


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