[csw-devel] SF.net SVN: gar:[15318] csw/mgar/pkg/gcc4/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Aug 12 11:44:41 CEST 2011


Revision: 15318
          http://gar.svn.sourceforge.net/gar/?rev=15318&view=rev
Author:   dmichelsen
Date:     2011-08-12 09:44:41 +0000 (Fri, 12 Aug 2011)

Log Message:
-----------
gcc4: Rip out unnecessary definitions

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/Makefile
    csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
    csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2011-08-11 20:48:35 UTC (rev 15317)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2011-08-12 09:44:41 UTC (rev 15318)
@@ -18,6 +18,9 @@
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
+# GIT init takes a long time, disable for now, reenable if build works
+NOGITPATCH ?= 1
+
 ## build options
 CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4

Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2011-08-11 20:48:35 UTC (rev 15317)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2011-08-12 09:44:41 UTC (rev 15318)
@@ -1,43 +1,47 @@
 
-COOKIEDIR     = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH)
-WORKDIR       = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
-PATCHDIR      = $(WORKDIR)/$(NAME)-$(VERSION)
-INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH)
-PKGROOT       = $(abspath $(WORKROOTDIR)/pkgroot-$(GAROSREL)-$(GARCH))
-OBJECT_DIR    = $(WORKDIR)/objdir
-WORKSRC       = $(OBJECT_DIR)
+#COOKIEDIR     = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH)
+#WORKDIR       = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
+#PATCHDIR      = $(WORKDIR)/$(NAME)-$(VERSION)
+#INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH)
+#PKGROOT       = $(abspath $(WORKROOTDIR)/pkgroot-$(GAROSREL)-$(GARCH))
+#OBJECT_DIR    = $(WORKDIR)/objdir
+#WORKSRC       = $(OBJECT_DIR)
 DIRPATHS      = 
 OPTFLAGS      =
 CONFIG_SHELL  = /opt/csw/bin/bash
 GARCOMPILER   = GCC3
-GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe
-CFLAGS        = -I/opt/csw/include
-CPPFLAGS      = -I/opt/csw/include
-CXXFLAGS      = -I/opt/csw/include
-LDFLAGS       = -L/opt/csw/lib -R/opt/csw/lib
-BOOT_CFLAGS   = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe
-BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
+#GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe
+#CFLAGS        = -I/opt/csw/include
+#CPPFLAGS      = -I/opt/csw/include
+#CXXFLAGS      = -I/opt/csw/include
+#LDFLAGS       = -L/opt/csw/lib -R/opt/csw/lib
+#BOOT_CFLAGS   = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe
+#BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
 
-ifeq ($(shell uname -p),i386)
-ifeq ($(shell uname -r),5.10)
-    GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -pipe
-    BOOT_CFLAGS   = -I/opt/csw/include -g -O2 -pipe
-    BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
-else
-    GCC3_CC       = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe
-    BOOT_CFLAGS   = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
-    BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
-endif
-endif
+#ifeq ($(shell uname -p),i386)
+#ifeq ($(shell uname -r),5.10)
+#    GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -pipe
+#    BOOT_CFLAGS   = -I/opt/csw/include -g -O2 -pipe
+#    BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
+#else
+#    GCC3_CC       = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe
+#    BOOT_CFLAGS   = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
+#    BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
+#endif
+#endif
 
-export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS
-export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS
+export CONFIG_SHELL
+#export CFLAGS CPPFLAGS CXXFLAGS
+#export LDFLAGS
+#export BOOT_CFLAGS BOOT_LDFLAGS
 
-FIXCONFIG_DIRS         += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
-STRIP_DIRS             += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin
-CONFIGURE_SCRIPTS       = objdir
-TEST_SCRIPTS            = skip
-post-configure-modulated: fix-bootflags
+# FIXCONFIG_DIRS         += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
+#STRIP_DIRS             += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin
+# CONFIGURE_SCRIPTS       = objdir
+
+SKIPTEST ?= 1
+
+# post-configure-modulated: fix-bootflags
 MERGE_SCRIPTS_isa-i386  = amd
 
 # <maciej> This should not be necessary any more thanks to checkpkg overrides.

Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2011-08-11 20:48:35 UTC (rev 15317)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2011-08-12 09:44:41 UTC (rev 15318)
@@ -6,26 +6,26 @@
 
 
 ## Create $(OBJECT_DIR) to build in
-post-extract-$(addprefix post-extract-,$(MODULATIONS)):
-	$(_DBG)(echo "==> Creating Object Dir for Building")
-	$(_DBG)(mkdir $(OBJECT_DIR))
-	$(_DBG)$(MAKECOOKIE)
+#post-extract-$(addprefix post-extract-,$(MODULATIONS)):
+#	$(_DBG)(echo "==> Creating Object Dir for Building")
+#	$(_DBG)(mkdir $(OBJECT_DIR))
+#	$(_DBG)$(MAKECOOKIE)
 
 ## instead of changing to $(WORKSRC) and running configure
 ## Run it from the $(OBJECT_DIR)
-configure-objdir:
-	$(_DBG)(echo "==> Running Configure from $(OBJECT_DIR)")
-	$(_DBG)(cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \
-		../$(DISTNAME)/configure $(CONFIGURE_ARGS))
-	$(_DBG)$(MAKECOOKIE)
+#configure-objdir:
+#	$(_DBG)(echo "==> Running Configure from $(OBJECT_DIR)")
+#	$(_DBG)(cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \
+#		../$(DISTNAME)/configure $(CONFIGURE_ARGS))
+#	$(_DBG)$(MAKECOOKIE)
 
 ## Set the CFLAGS so the correct architecture is used
-fix-bootflags:
-	$(_DBG)(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \
-		$(WORKSRC)/Makefile)
-	$(_DBG)(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \
-		$(WORKSRC)/Makefile)
-	$(_DBG)$(MAKECOOKIE)
+#fix-bootflags:
+#	$(_DBG)(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \
+#		$(WORKSRC)/Makefile)
+#	$(_DBG)(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \
+#		$(WORKSRC)/Makefile)
+#	$(_DBG)$(MAKECOOKIE)
 
 post-merge-modulated:
 	$(_DBG)( gmv $(PKGROOT)$(libdir)/gcc/*/*/adalib/*.so* \
@@ -39,6 +39,3 @@
 			fi )
 	$(_DBG)$(MAKECOOKIE)
 
-test-skip:
-	$(_DBG)$(MAKECOOKIE)
-


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