r6414 - packages/trunk/ogre/debian
Andres Mejia
ceros-guest at alioth.debian.org
Thu Apr 3 23:13:43 UTC 2008
Author: ceros-guest
Date: 2008-04-03 23:13:43 +0000 (Thu, 03 Apr 2008)
New Revision: 6414
Modified:
packages/trunk/ogre/debian/changelog
packages/trunk/ogre/debian/rules
Log:
* Setup a OGRE_CONFIG_OPTIONS for default configure options used in building
ogre.
Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog 2008-04-03 22:15:19 UTC (rev 6413)
+++ packages/trunk/ogre/debian/changelog 2008-04-03 23:13:43 UTC (rev 6414)
@@ -6,6 +6,8 @@
* Declaring *ONLY* Replaces fields for old packages that contained 1.4.6 in
their names.
* Updated compiledemos.sh.
+ * Setup a OGRE_CONFIG_OPTIONS for default configure options used in building
+ ogre.
-- Andres Mejia <mcitadel at gmail.com> Thu, 27 Mar 2008 13:42:44 -0400
Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules 2008-04-03 22:15:19 UTC (rev 6413)
+++ packages/trunk/ogre/debian/rules 2008-04-03 23:13:43 UTC (rev 6414)
@@ -4,19 +4,44 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# These are from the autotools-dev package documentation.
+# /usr/share/doc/autotools-dev/README.Debian.gz
+# from the section titled "Calling GNU configure properly"
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS += -Wall -g
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+# CFLAGS, CXXFLAGS, and LDFLAGS to use. Allowing them to be overriden.
+DEFAULT_CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ DEFAULT_CFLAGS += -O0
else
- CFLAGS += -O2
+ DEFAULT_CFLAGS += -O2
endif
+CFLAGS ?= $(DEFAULT_CFLAGS)
+# Include a OGRE_CONFIG_OPTIONS variable that has the default configure options
+# used to build this package. This variable can be overridden.
+OGRE_CONFIG_OPTIONS ?= $(confflags) \
+ --prefix=/usr \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-platform=GLX \
+ --with-gl-support=GLX \
+ --disable-cg \
+ --enable-openexr \
+ --with-gui=Xt \
+ --disable-ogre-demos \
+ CFLAGS="$(CFLAGS)"
+
patch: patch-stamp
patch-stamp:
dh_testdir
@@ -32,11 +57,7 @@
autoheader -f
automake --include-deps --add-missing -f --foreign --copy
autoconf -f
- ./configure --prefix=/usr \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --with-platform=GLX --with-gl-support=GLX \
- --disable-cg --enable-openexr --with-gui=Xt --disable-ogre-demos
+ ./configure $(OGRE_CONFIG_OPTIONS)
touch configure-stamp
build: configure build-stamp
More information about the Pkg-games-commits
mailing list