[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.0.1/experimental r1399: support noopt



------------------------------------------------------------
revno: 1399
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-12 23:59:36 +0100
message:
  support noopt
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-02-12 17:09:53 +0000
+++ b/changelog	2009-02-12 22:59:36 +0000
@@ -3,19 +3,20 @@
   [ Rene Engelhard ]
   * upload to unstable
   * ooo-build:
-    - update (r15298) 
+    - update (r15324) 
   * debian/openoffice.org-common.links: add symlinks to the mimetype icons so
     that they adhere to the Icon Naming Specification, thanks Guido Günther
     (closes: #512792) 
   * debian/rules:
     - add Recommends openoffice.org-math to openoffice.org-writer
+    - specify ARCH_FLAGS as -O0 when DEB_BULD_OPTIONS contains noopt
+      (closes: #514166)
 
   [ Chris Halls ]
   * ooo-build/patches/dev300/sfx2-recent-files.diff:
     Update recent files list after save as and open (closes: #505879)
 
-
- -- Chris Halls <halls@debian.org>  Thu, 12 Feb 2009 16:38:50 +0000
+ -- Rene Engelhard <rene@debian.org>  Thu, 12 Feb 2009 23:34:10 +0100
 
 openoffice.org (1:3.0.1-1) experimental; urgency=low
  

=== modified file 'rules'
--- a/rules	2009-01-26 22:39:42 +0000
+++ b/rules	2009-02-12 22:59:36 +0000
@@ -449,6 +449,10 @@
 	CONFIGURE_FLAGS += --enable-symbols=SMALL
 endif
 
+ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	ARCH_FLAGS += -O0
+endif
+
 ifeq "$(BUILD_PYUNO)" "y"
   ifeq "$(USE_PYCENTRAL)" "y"
 	BUILD_DEPS += , python-central (>= 0.5)
@@ -1533,7 +1537,7 @@
 	fi
 endif
 
-	cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true $(MAKE)
+	cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) $(MAKE)
 
 	if [ -d ooo-build/build/current -a ! -d $(SOURCE_TREE) ]; then \
 		ln -sf current $(SOURCE_TREE); \


Reply to: