r18734 - in /desktop/unstable/pango1.0/debian: changelog libpango1.0-0.install.opt rules

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Mar  5 16:52:22 2009
New Revision: 18734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18734
Log:
* Add support for an optimized pass, implemented as a flavor.
  - Define a default OPTLIBDIR and replace it in the sed foo for %.in files;
    this is like LIBDIR, but with some hwcaps extension, e.g. usr/lib/vfp.
  - Add sample vars to build an optimized vfp flavor for armel with
    additional CFLAGS.
  - Add the "opt" special flavor to flavors to run the testsuites on,
    CHECK_FLAVORS.
  - Also sed and append %.opt after %.in when generating % files from %.in;
    the %.opt file is optional and only included if the opt flavor is
    included.
  - Add a debian/libpango1.0-0.install.opt which lists files from the
    optimized flavor to install in libpango1.0-0.

Added:
    desktop/unstable/pango1.0/debian/libpango1.0-0.install.opt
Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=18734&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Thu Mar  5 16:52:22 2009
@@ -15,6 +15,18 @@
   * Move update-pangox-aliases man pages from section 1 to section 8; thanks
     jidanni at jidanni.org; closes: #512448.
   * Rewrite dh_pangomodules description; also fixes a lintian warning.
+  * Add support for an optimized pass, implemented as a flavor.
+    - Define a default OPTLIBDIR and replace it in the sed foo for %.in files;
+      this is like LIBDIR, but with some hwcaps extension, e.g. usr/lib/vfp.
+    - Add sample vars to build an optimized vfp flavor for armel with
+      additional CFLAGS.
+    - Add the "opt" special flavor to flavors to run the testsuites on,
+      CHECK_FLAVORS.
+    - Also sed and append %.opt after %.in when generating % files from %.in;
+      the %.opt file is optional and only included if the opt flavor is
+      included.
+    - Add a debian/libpango1.0-0.install.opt which lists files from the
+      optimized flavor to install in libpango1.0-0.
 
  -- Loic Minier <lool at dooz.org>  Thu, 05 Mar 2009 12:07:11 +0100
 

Added: desktop/unstable/pango1.0/debian/libpango1.0-0.install.opt
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/libpango1.0-0.install.opt?rev=18734&op=file
==============================================================================
--- desktop/unstable/pango1.0/debian/libpango1.0-0.install.opt (added)
+++ desktop/unstable/pango1.0/debian/libpango1.0-0.install.opt Thu Mar  5 16:52:22 2009
@@ -1,0 +1,2 @@
+# from the optimized flavor
+debian/install/opt/@LIBDIR@/*.so.* @OPTLIBDIR@

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=18734&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules (original)
+++ desktop/unstable/pango1.0/debian/rules Thu Mar  5 16:52:22 2009
@@ -38,6 +38,7 @@
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # relative libdir
 ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
@@ -76,8 +77,17 @@
 # args are defined below), a build pass, and an install pass (in two steps)
 FLAVORS := shared static udeb
 
+# optional optimized flavor for some arches
+OPTLIBDIR :=
+# sample code:
+#ifneq ($(filter $(DEB_HOST_ARCH), armel),)
+#FLAVORS += opt
+#OPTLIBDIR := $(LIBDIR)/vfp
+#opt_CFLAGS += $(CFLAGS) -mfpu=vfp -mfloat-abi=softfp
+#endif
+
 # list of flavors to run the test suite on
-CHECK_FLAVORS := $(filter shared, $(FLAVORS))
+CHECK_FLAVORS := $(filter opt shared, $(FLAVORS))
 
 # current flavor we're building; this is only expanded in flavor specific
 # targets
@@ -194,15 +204,19 @@
 # dpkg-source)
 debian/%: debian/%.in
 	dh_testdir
-	sed -e "s#@SONAME@#$(SONAME)#g" \
-		-e "s#@APIVER@#$(APIVER)#g" \
-		-e "s#@VERSION@#$(VERSION)#g" \
-		-e "s#@PANGO_MODVER_DEP@#$(PANGO_MODVER_DEP)#g" \
-		-e "s#@LIBDIR@#$(LIBDIR)#g" \
-		-e "s#@MODULES_PATH@#$(MODULES_PATH)#g" \
-		-e "s#@MODULE_FILES_D@#$(MODULE_FILES_D)#g" \
-		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
-		$@.in >$@
+	sed \
+		-e 's#@SONAME@#$(SONAME)#g' \
+		-e 's#@APIVER@#$(APIVER)#g' \
+		-e 's#@VERSION@#$(VERSION)#g' \
+		-e 's#@PANGO_MODVER_DEP@#$(PANGO_MODVER_DEP)#g' \
+		-e 's#@LIBDIR@#$(LIBDIR)#g' \
+		-e 's#@OPTLIBDIR@#$(OPTLIBDIR)#g' \
+		-e 's#@MODULES_PATH@#$(MODULES_PATH)#g' \
+		-e 's#@MODULE_FILES_D@#$(MODULE_FILES_D)#g' \
+		-e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
+		$@.in \
+		$(wildcard $(if $(filter opt,$(FLAVORS)),$@.opt)) \
+		>$@
 
 clean:: debian/control
 	dh_testdir