[csw-devel] SF.net SVN: gar:[2497] csw/branches/dam/automatic-multiarch-compile/lib/qt4
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Dec 9 17:21:34 CET 2008
Revision: 2497
http://gar.svn.sourceforge.net/gar/?rev=2497&view=rev
Author: dmichelsen
Date: 2008-12-09 16:21:33 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
multiISA qt4: Move to mGAR v2
Modified Paths:
--------------
csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile
csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums
Modified: csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile 2008-12-09 16:20:48 UTC (rev 2496)
+++ csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile 2008-12-09 16:21:33 UTC (rev 2497)
@@ -1,5 +1,5 @@
GARNAME = qt4
-GARVERSION = 4.3.3
+GARVERSION = 4.4.0
CATEGORIES = lib
DESCRIPTION = TrollTech C++ application framework
@@ -9,58 +9,22 @@
http://doc.trolltech.com/4.3/qt4-intro.html for details.
endef
-sparc_ARCH = sparc
-i386_ARCH = i386
-sparc_ARCH64 = sparcv9
-i386_ARCH64 = amd64
-
-ARCH=$($(GARCH)_ARCH)
-ARCH64=$($(GARCH)_ARCH64)
-
ifndef DO64
PLATFORM=solaris-cc
else
PLATFORM=solaris-cc-64
endif
-ifdef ISA
-ISALIST = $(ISA)
-else
-ifndef DO64
-ISA = $(ARCH)
-else
-ISA = $(ARCH64)
-endif
-endif
-
MASTER_SITES = ftp://ftp.trolltech.com/qt/source/
DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz
DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386)
DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386)
DISTFILES += $(call admfiles,CSWqt4-docs,prototype)
-WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM)
-COOKIEROOTDIR = cookies.$(PLATFORM)
-
WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION)
PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev
-# Usually the pathes from already installed stuff at $DESTDIR is
-# used before regular installed stuff. This leads to include errors
-# if we already have a qt4 installed at $DESTDIR.
-IGNORE_DESTDIR = 1
-
-ifdef DO64
- bindir = $(exec_prefix)/bin/sparcv9
- libdir = $(exec_prefix)/lib/sparcv9
- docdir = $(prefix)/ignore/doc
- includedir = $(prefix)/ignore/include
- datadir = $(prefix)/ignore/data
- sharedstatedir = $(prefix)/ignore/share
- etcdir = $(prefix)/ignore/etc
-endif
-
CONFIGURE_ARGS = -prefix $(prefix) \
-bindir $(bindir) \
-libdir $(libdir) \
@@ -78,82 +42,38 @@
-confirm-license \
-verbose
+BUILD64 = 1
+
SKIPTEST = 1
INSTALL_ENV += INSTALL_ROOT=$(DESTDIR)
SRC_CLEAN_TARGET = confclean
-ifndef DO64
-CLEAN_SCRIPTS = all custom
-endif
-
include ../category.mk
-OPTARCH_sparc = v8
-OPTARCH_sparcv9 = v9
-OPTARCH_i386 = 386
-OPTARCH_amd64 = amd64
-OPTARCH = $(OPTARCH_$(ISA))
-
-ifdef DO64
- # Do not use -xO3 as -xO2 is already set in the Makefile
- SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff
- SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff
-
- # Do not include -I/-L here. These flags must be defined after
- # local QT4 includes and need to be defined during configure.
- CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR))
- CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS)
- # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version
- # (see getpwuid_r(3c) for details)
- CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS
- LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR))
-else
- # Do not use -xO3 as -xO2 is already set in the Makefile
- SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff
- SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff
-
- # Do not include -I/-L here. These flags must be defined after
- # local QT4 includes and need to be defined during configure.
- CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR))
- CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS)
- CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR))
- LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR))
-endif
-
-pre-build:
- @echo "ISA: $(ISA)"
- @echo "XC: $(GARCOMPILER)_CC_$(GARFLAVOR)"
- @echo "XC: $($(GARCOMPILER)_CC_$(GARFLAVOR))"
- @echo "CFLAGS: $(CFLAGS)"
-
-build64:
- @echo " ==> Building 64 bit version"
- gmake DO64=1 build
-
-install64: build64
- @echo " ==> Installing 64 bit version"
- gmake DO64=1 install
-
-pre-package: install64
-
-pre-install:
- @echo " ==> Install environment:"
- @echo " bindir: $(bindir)"
- @echo " libdir: $(libdir)"
- @/usr/bin/env
-
-clean64:
- gmake DO64=1 clean
-
-clean-custom: clean64
-
-env:
- @echo " GARCH = $(GARCH)"
- @echo " GARVERSION = $(GARVERSION)"
- @echo " ISA = $(ISA)"
- @echo " CFLAGS = $(CFLAGS)"
- @echo " OPTARCH = $(OPTARCH)"
- @echo " OPTARCH_ISA = $(OPTARCH_$(ISA))"
- @echo "CLEAN TARGETS = $(CLEAN_TARGETS)"
+#ifdef DO64
+# # Do not use -xO3 as -xO2 is already set in the Makefile
+# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff
+# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff
+#
+# # Do not include -I/-L here. These flags must be defined after
+# # local QT4 includes and need to be defined during configure.
+# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR))
+# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS)
+# # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version
+# # (see getpwuid_r(3c) for details)
+# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS
+# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR))
+#else
+# # Do not use -xO3 as -xO2 is already set in the Makefile
+# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff
+# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff
+#
+# # Do not include -I/-L here. These flags must be defined after
+# # local QT4 includes and need to be defined during configure.
+# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR))
+# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS)
+# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR))
+# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR))
+#endif
Modified: csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums
===================================================================
--- csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums 2008-12-09 16:20:48 UTC (rev 2496)
+++ csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums 2008-12-09 16:21:33 UTC (rev 2497)
@@ -1,4 +1,4 @@
-19678fe35170559cd6a6fa531c57799c download/qt-x11-opensource-src-4.3.3.tar.gz
+f13ad0aa75efad314715930e663bad55 download/qt-x11-opensource-src-4.4.0.tar.gz
1971c2c7513b65cd7a8d33b9a637a908 download/CSWqt4.gspec
abca6ced15fc6cc1f47ca35ebe1af99b download/CSWqt4.depend
46107c5b0ec8d00a3a19008f251e98f3 download/CSWqt4.prototype-sparc
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