[csw-devel] SF.net SVN: gar:[19151] csw/mgar/pkg/tcl85/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 19151
          http://gar.svn.sourceforge.net/gar/?rev=19151&view=rev
Author:   dmichelsen
Date:     2012-09-05 13:45:46 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
tcl85/trunk: Fix shared library naming, try DTrace again on Solaris 10

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

Modified: csw/mgar/pkg/tcl85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcl85/trunk/Makefile	2012-09-05 10:41:43 UTC (rev 19150)
+++ csw/mgar/pkg/tcl85/trunk/Makefile	2012-09-05 13:45:46 UTC (rev 19151)
@@ -42,6 +42,10 @@
 RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath
 RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH))
 
+# This is to find zoneinfo
+CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n
+CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n
+
 PACKAGES += CSWlibtcl8-5-0
 SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries
 PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0)
@@ -50,17 +54,16 @@
 RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath
 RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH))
 
+# This is to find zoneinfo
+CHECKPKG_OVERRIDES_CSWlibtcl8-5-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl
+CHECKPKG_OVERRIDES_CSWlibtcl8-5-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl
+
 PACKAGES += CSWtcl-dev
 SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files
 PKGFILES_CSWtcl-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh)
 RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0
 
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl
-CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl
-
 BUILD64 = 1
 
 INCLUDE_FLAGS =
@@ -75,10 +78,12 @@
 #      against symbol                  offset      in file
 #  st                                  0x634       tclDTrace.o
 #  ld: fatal: relocations remain against allocatable but non-writable sections
-#CONFIGURE_ARGS += --enable-dtrace
+CONFIGURE_ARGS-5.10 += --enable-dtrace
 
-INSTALL_ARGS = install install-private-headers install-tzdata install-msgs
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL))
 
+INSTALL_ARGS = install install-libraries install-private-headers install-tzdata install-msgs
+
 # tk need the static tclstub library for some reason
 MERGE_EXCLUDE_STATICLIBS =
 
@@ -86,13 +91,11 @@
 
 include gar/category.mk
 
-
-# CFLAGS := $(filter-out -I%,$(CFLAGS))
 DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
 
 pre-configure-modulated:
 	@echo " ==> Regenerating build tools..."
-	(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if )
+	#(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if )
 	@$(MAKECOOKIE)
 
 pre-test-modulated:
@@ -106,8 +109,9 @@
 post-install-modulated:
 	@# Need to manually create symlink to latest version - it will be handled by alternatives
 	@echo Creating tclsh link
-	ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh
-	perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh
-	perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1
+	ln -s $(REN_TCLSH) $(DESTDIR)$(bindir)/tclsh
+	cd $(DESTDIR)$(libdir) && mv $(REN_LIBTCL) $(REN_LIBTCL).0 && ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL)
+	perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(libdir)/tclConfig.sh
+	perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(mandir)/man1/tclsh.1
 	@$(MAKECOOKIE)
 

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