Преглед на файлове

* Support DEB_BUILD_OPTIONS=noopt in debian/rules
Author: mdz
Date: 2004-04-30 03:56:33 GMT
* Support DEB_BUILD_OPTIONS=noopt in debian/rules
(Closes: #244293)

Arch Librarian преди 22 години
родител
ревизия
bab7c2cbba
променени са 2 файла, в които са добавени 11 реда и са изтрити 3 реда
  1. 3 1
      debian/changelog
  2. 8 2
      debian/rules

+ 3 - 1
debian/changelog

@@ -26,8 +26,10 @@ apt (0.5.25) unstable; urgency=low
     (Closes: #245923)
     (Closes: #245923)
   * Fix typo in configure-index (RecruseDepends -> RecurseDepends)
   * Fix typo in configure-index (RecruseDepends -> RecurseDepends)
     (Closes: #246550)
     (Closes: #246550)
+  * Support DEB_BUILD_OPTIONS=noopt in debian/rules
+    (Closes: #244293)
 
 
- --
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 29 Apr 2004 20:46:35 -0700
 
 
 apt (0.5.24) unstable; urgency=low
 apt (0.5.24) unstable; urgency=low
 
 

+ 8 - 2
debian/rules

@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.63 2004/02/27 00:51:25 mdz Exp $
+# $Id: rules,v 1.64 2004/04/30 03:56:33 mdz Exp $
 
 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -27,6 +27,12 @@ endif
 # See below
 # See below
 -include build/environment.mak
 -include build/environment.mak
 
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  export CXXFLAGS = -O0 -g
+else
+  export CXXFLAGS = -O2 -g
+endif
+
 # Default rule
 # Default rule
 build:
 build:
 
 
@@ -99,7 +105,7 @@ build/configure-stamp: configure
 	dh_testdir
 	dh_testdir
 	-mkdir build
 	-mkdir build
 	cp COPYING debian/copyright
 	cp COPYING debian/copyright
-	cd build && ../configure $(confflags)
+	cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
 	touch $@
 	touch $@
 
 
 build/build-stamp: build/configure-stamp
 build/build-stamp: build/configure-stamp