[csw-devel] SF.net SVN: gar:[19888] csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b

claudio_sf at users.sourceforge.net claudio_sf at users.sourceforge.net
Fri Dec 14 14:18:47 CET 2012


Revision: 19888
          http://gar.svn.sourceforge.net/gar/?rev=19888&view=rev
Author:   claudio_sf
Date:     2012-12-14 13:18:46 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
/home/claudio/opencsw/perl/trunk: Fist 64-bit pass w/o 5.10 interference

Modified Paths:
--------------
    csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b

Modified: csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b
===================================================================
--- csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b	2012-12-13 14:36:11 UTC (rev 19887)
+++ csw/mgar/pkg/perl/trunk/Makefile_5.16.1_64b	2012-12-14 13:18:46 UTC (rev 19888)
@@ -21,24 +21,23 @@
 # Make extra Solaris 10 package with DTrace support
 #PACKAGING_PLATFORMS  = solaris9-sparc solaris9-i386
 #PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-PACKAGING_PLATFORMS += solaris10-sparc
-BUILD64_ONLY = 1
+PACKAGING_PLATFORMS 	 += solaris10-sparc
+BUILD64_ONLY 		  = 1
 PACKAGES                 += CSWperl
 SPKG_DESC_CSWperl         = $(DESCRIPTION)
 #RUNTIME_DEP_PKGS_CSWperl  = CSWbdb48 CSWlibgdbm4
-RUNTIME_DEP_PKGS_CSWperl  = 
 INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags
 
-PACKAGES                   += CSWperldoc
-SPKG_DESC_CSWperldoc        = Perl documentation
-RUNTIME_DEP_PKGS_CSWperldoc = CSWperl
-ARCHALL_CSWperldoc          = 1
+#PACKAGES                   += CSWperldoc
+#SPKG_DESC_CSWperldoc        = Perl documentation
+#RUNTIME_DEP_PKGS_CSWperldoc = CSWperl
+#ARCHALL_CSWperldoc          = 1
 
 LICENSE = Copying
 
-CHECKPKG_OVERRIDES_CSWperl    += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl
+#CHECKPKG_OVERRIDES_CSWperl    += file-with-bad-content
+#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content
+#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl
 
 # Core module updates
 # Not used at the moment, leave one as example
@@ -46,7 +45,7 @@
 #CORE_UPDATES  += PathTools-3.30
 #CORE_OBSOLETE += Cwd.pm File/Spec* auto/Cwd
 
-DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz)
+#DISTFILES += $(foreach N,$(CORE_UPDATES),$(N).tar.gz)
 
 # GCC build (Sunstudio is problematic) # claudio
 GARCOMPILER = GCC4
@@ -62,66 +61,73 @@
 # TBD: Reinsert libperl.so, see below.
 #PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc
 #PERL_LIBS-32 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -ldb-4.8 -lcrypt
-PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt
+#PERL_LIBS-64 += -lsocket -lnsl -ldl -lm -lpthread -lc -lpthread -lgdbm -lcrypt
 #PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) 
+#PERL_LIBS = -lsocket -lgdbm -ldl -lm -lpthread -lc -lcrypt
 
 #BUILD64 = 1
 
 # Configuration flags
-CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION)
+#CONFIGURE_ARGS += -Darchlib=$(libdir)/perl/$(VERSION)
 CONFIGURE_ARGS += -Dcc=$(CC)
-CONFIGURE_ARGS += -Dccflags="$(CFLAGS)"
-CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)"
+#CONFIGURE_ARGS += -Dccflags="$(CFLAGS)"
+#CONFIGURE_ARGS += -Dccversion="$(CC_VERSION)"
 CONFIGURE_ARGS += -Dcf_email=$(SPKG_EMAIL)
-CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)"
-CONFIGURE_ARGS += -Dld=$(CC)
-CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)"
-CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION)
-CONFIGURE_ARGS += -Dlocincpth=$(includedir)
-CONFIGURE_ARGS += -Dloclibpth=$(libdir)
+#CONFIGURE_ARGS += -Dinc_version_list="$(INC_COMPAT)"
+#CONFIGURE_ARGS += -Dld=$(CC)
+#CONFIGURE_ARGS += -Dldflags="$(LDFLAGS)"
+#CONFIGURE_ARGS += -Dlibperl=libperl.so.$(VERSION)
+#CONFIGURE_ARGS += -Dlocincpth=$(includedir)
+#CONFIGURE_ARGS += -Dloclibpth=$(libdir)
 CONFIGURE_ARGS += -Dman1dir=$(mandir)/man1
 CONFIGURE_ARGS += -Dman1ext=1
 CONFIGURE_ARGS += -Dman3dir=$(mandir)/man3
 CONFIGURE_ARGS += -Dman3ext=3perl
-CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)"
+#CONFIGURE_ARGS += -Doptimize="$(OPTFLAGS)"
 CONFIGURE_ARGS += -Dperladmin="root at localhost"
 CONFIGURE_ARGS += -Dprefix=$(prefix)
 CONFIGURE_ARGS += -Dbin=$(bindir)
 CONFIGURE_ARGS += -Dscriptdir=$(bindir)
-CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION)
-CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl
-CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl
-CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1
-CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3
-CONFIGURE_ARGS += -Dsiteprefix=/usr
+#CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION)
+#CONFIGURE_ARGS += -Dsitearch=$(libdir)/perl/site_perl
+#CONFIGURE_ARGS += -Dsitelib=$(datadir)/perl/site_perl
+#CONFIGURE_ARGS += -Dsiteman1dir=$(mandir)/man1
+#CONFIGURE_ARGS += -Dsiteman3dir=$(mandir)/man3
+#CONFIGURE_ARGS += -Dsiteprefix=/usr
 CONFIGURE_ARGS += -Duseshrplib
-CONFIGURE_ARGS += -Dusesitecustomize
+#CONFIGURE_ARGS += -Dusesitecustomize
 CONFIGURE_ARGS += -Dusethreads
+CONFIGURE_ARGS += -Dusedtrace
+CONFIGURE_ARGS += -Duse64bitall
+CONFIGURE_ARGS += -Duse64bitint
+CONFIGURE_ARGS += -Dinc_version_list=none
 
 # When built on Solaris 10, enable DTrace support
-CONFIGURE_ARGS-5.10 = -Dusedtrace
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL))
+#CONFIGURE_ARGS-5.10 = -Dusedtrace
+#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL))
 
 # Largefiles is on by default for 64 bit
 #CONFIGURE_ARGS-32 += -Duselargefiles 
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) 
-
+#CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) 
 #CONFIGURE_ARGS += -Dvendorarch=$(libdir)/perl/csw
-CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw
-CONFIGURE_ARGS += -Dvendorprefix=$(prefix)
-CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)"
-CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)"
-CONFIGURE_ARGS += -Dsed=$(bindir)/gsed
+#CONFIGURE_ARGS += -Dvendorlib=$(datadir)/perl/csw
+#CONFIGURE_ARGS += -Dvendorprefix=$(prefix)
+#CONFIGURE_ARGS += -Dlibs="$(PERL_LIBS)"
+#CONFIGURE_ARGS += -Dlibsdirs=" $(abspath /usr/lib/$(MEMORYMODEL)) $(libdir)"
+#CONFIGURE_ARGS += -Dlibsdirs=/usr/lib/64
+CONFIGURE_ARGS += -Dsed=/opt/csw/bin/gsed
 
-EXTRA_LIB += $(prefix)/bdb48/lib
-EXTRA_INC += $(prefix)/bdb48/include
+#EXTRA_LIB += $(prefix)/bdb48/lib
+#EXTRA_INC += $(prefix)/bdb48/include
+#LD_LIBRARY_PATH for testing
+#LD_LIBRARY_PATH += $(prefix)/bdb48/lib/$(MEMORYMODEL)
 
 # Somehow the CPPFLAGS do not make it into the compile environment.
 # Add them explicitly here, otherwise specifically the bdb48/include will
 # not make it resulting in db.h not to be found and DB_File.pm not to be built
 # as reported here:
 #   https://www.opencsw.org/mantis/view.php?id=4544
-EXTRA_CFLAGS = $(CPPFLAGS)
+#EXTRA_CFLAGS = $(CPPFLAGS)
 
 # Adding -lperl requires that libperl.so is available during compilation, which is not 
 # the case on bootstrapping. However, we require explicit libperl linkage or programs 
@@ -130,32 +136,32 @@
 #EXTRA_LDFLAGS-32 = -L$(libdir) -lperl 
 #EXTRA_LDFLAGS-32 = -L$(libdir) -L/usr/lib
 #EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib -R/opt/csw/bdb48/lib -R/opt/csw/lib
-EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib
+#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) -R /usr/lib/64 -R/opt/csw/bdb48/lib/64 -R/opt/csw/lib/64
+#EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL))
+EXTRA_LDFLAGS = -lperl
 
 # We want 64 bit binaries
 #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir)
 
-EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod
-PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.*
+#EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod
+#PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.*
 
 # The diagnostics.pm module needs the podfile to output its messages.
 # That means it must be included in the main package, not the docs.
-EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod
-EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod
+#EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod
+#EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod
 
 # Tests take a long time, run once for every release
-TEST_SCRIPTS =
-
 BUILD_SCRIPTS = perl
 
 TEST_SCRIPTS = perl
 
 # Make sure we don't include the path to the newly built perl as the
 # library is not in place yet.
-IGNORE_DESTDIR = 1
+#IGNORE_DESTDIR = 1
 
 # Do not exclude static libs as at least DynaLoader.a is needed for XS compilation
-MERGE_EXCLUDE_STATICLIBS =
+#MERGE_EXCLUDE_STATICLIBS =
 
 # This is for the communication with checkpkg. These pathes are searched for modules
 # when resolving dependencies.
@@ -171,19 +177,19 @@
 # This is probably due to -lperl, but during Configure the one in /opt/csw/lib is picked up and 
 # the one in $WORKSRC has not been built yet 
 # TBD: Investigate
-post-extract-modulated:
-	mkdir -p $(WORKSRC)
-	#gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so
-	@$(MAKECOOKIE)
+#post-extract-modulated:
+#	mkdir -p $(WORKSRC)
+#	#gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so
+#	@$(MAKECOOKIE)
 
-ifneq ($(CORE_UPDATES),)
-POST_TARGETS = install-core-updates
-include files/updatecore.mk
-endif
+#ifneq ($(CORE_UPDATES),)
+#POST_TARGETS = install-core-updates
+#include files/updatecore.mk
+#endif
 
 # How to configure Perl
 #configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS
-configure-perl: ARGS-64 = -dusedtrace
+#configure-perl: ARGS-64 = -dusedtrace -Duse64bitall
 configure-perl:
 	(cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -ders)
 	#cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be
@@ -194,13 +200,14 @@
 build-perl:
 	@echo " ==> Running make in $*"
 	@#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS)
-	cd $(WORKSRC) && $(BUILD_ENV) gmake
+	cd $(WORKSRC) && $(BUILD_ENV) dmake
 	@$(MAKECOOKIE)
 
 test-perl:
 	@echo " ==> Running make $(TEST_TARGET) in $*"
 	@#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET)
-	cd $(WORKSRC) && gmake check
+	#cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && LD_LIBRARY_PATH_64=`pwd`:$(prefix)/bdb48/lib/$(MEMORYMODEL) gmake test && mv .mgar-git .git
+	cd $(WORKSRC) && if [ -d .git ] ; then mv .git .mgar-git ; fi && gmake test && mv .mgar-git .git
 	@$(MAKECOOKIE)
 
 # Make links to libperl

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