rev 9262 - in branches/kde4: cdbs packages/blitz/debian packages/rsibreak/debian

[Fathi Boudra]

Author: fabo
Date: 2008-02-04 08:57:22 +0000 (Mon, 04 Feb 2008)
New Revision: 9262

Added:
   branches/kde4/packages/rsibreak/debian/cpu-optimize.mk
Removed:
   branches/kde4/cdbs/cpu-optimize.mk
Modified:
   branches/kde4/packages/blitz/debian/rules
   branches/kde4/packages/rsibreak/debian/rules
Log:
* Move cpu-optimize.mk outside of shared cdbs directory.
* Update blitz and rsibreak rules according to cpu-optimize location.


Deleted: branches/kde4/cdbs/cpu-optimize.mk

Modified: branches/kde4/packages/blitz/debian/rules
===================================================================
--- branches/kde4/packages/blitz/debian/rules	2008-02-03 20:37:09 UTC (rev 9261)
+++ branches/kde4/packages/blitz/debian/rules	2008-02-04 08:57:22 UTC (rev 9262)
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
+
 THIS_SHOULD_GO_TO_UNSTABLE=1
+
 include debian/cdbs/kde.mk
-include debian/cdbs/cpu-optimize.mk
+include debian/cpu-optimize.mk
 
 DEB_CMAKE_EXTRA_FLAGS += \
 			$(shell echo $(foreach cpuopt,$(DEB_BUILD_ARCH_CPU_OPT),-DHAVE_$(cpuopt):BOOL=ON) | tr '[:lower:]' '[:upper:]')

Copied: branches/kde4/packages/rsibreak/debian/cpu-optimize.mk (from rev 9261, branches/kde4/cdbs/cpu-optimize.mk)
===================================================================
--- branches/kde4/packages/rsibreak/debian/cpu-optimize.mk	                        (rev 0)
+++ branches/kde4/packages/rsibreak/debian/cpu-optimize.mk	2008-02-04 08:57:22 UTC (rev 9262)
@@ -0,0 +1,48 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2008 Matthew Rosewarne <mrosewarne at inoutbox.com>
+# Description: Determines possible CPU optimisations.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_rules_cpu_optimize
+_cdbs_rules_cpu_optimize := 1
+endif
+
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+
+_cdbs_cpu_opt_i386 := 3dnow mmx sse sse2 sse3
+_cdbs_cpu_opt_amd64 := 3dnow mmx sse sse2 sse3
+_cdbs_cpu_opt_powerpc := altivec
+
+
+ifdef _cdbs_cpu_opt_$(DEB_BUILD_ARCH_CPU)
+	DEB_BUILD_ARCH_CPU_OPT = $(_cdbs_cpu_opt_$(DEB_BUILD_ARCH_CPU))
+else
+	DEB_BUILD_ARCH_CPU_OPT =
+endif
+
+ifdef _cdbs_cpu_opt_$(DEB_HOST_ARCH_CPU)
+	DEB_HOST_ARCH_CPU_OPT = $(_cdbs_cpu_opt_$(DEB_HOST_ARCH_CPU))
+else
+	DEB_HOST_ARCH_CPU_OPT =
+endif

Modified: branches/kde4/packages/rsibreak/debian/rules
===================================================================
--- branches/kde4/packages/rsibreak/debian/rules	2008-02-03 20:37:09 UTC (rev 9261)
+++ branches/kde4/packages/rsibreak/debian/rules	2008-02-04 08:57:22 UTC (rev 9262)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include debian/cdbs/kde.mk
-include debian/cdbs/cpu-optimize.mk
+include debian/cpu-optimize.mk
 
 ifneq (,$(filter $(DEB_BUILD_ARCH_CPU_OPT),mmx))
 	DEB_CMAKE_EXTRA_FLAGS += -DHAVE_MMX:BOOL=ON