[Pkg-lyx-devel] svn commit: r202 - in /lyx/trunk/debian: changelog rules

[hoaxter-guest at users.alioth.debian.org]

Author: hoaxter-guest
Date: Thu Oct 19 13:28:04 2006
New Revision: 202

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=202
Log:
Removed CFLAGS related stuf from rules because LyX is C++ only.
Added a CXXFLAGS as a workaroud to build on hppa
http://lists.alioth.debian.org/pipermail/pkg-boost-devel/2005-December/000287.html

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=202&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Thu Oct 19 13:28:04 2006
@@ -1,3 +1,11 @@
+lyx (1.4.3-2) UNRELEASED; urgency=low
+
+  * Removed CFLAGS related stuff from rules because it's useless since
+    LyX is C++ code only.
+  * Adding -ffunctions-sections as a workaround for builds on hppa.
+
+ --
+
 lyx (1.4.3-1) unstable; urgency=low
 
   [ Sven Hoexter ]

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=202&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Thu Oct 19 13:28:04 2006
@@ -9,13 +9,10 @@
 
 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)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+ifeq ($(DEB_HOST_ARCH),hppa)
+	CXXFLAGS += -ffunction-sections
 endif
 
 CONFIGURE_OPTIONS = \
@@ -66,7 +63,7 @@
 		|| ln -s /usr/share/misc/config.guess config/config.guess
 
 	test -d build-tree || mkdir build-tree
-	cd build-tree && CFLAGS="$(CFLAGS)" ../configure $(CONFIGURE_OPTIONS)
+	cd build-tree && CXXFLAGS="$(CXXFLAGS)" ../configure $(CONFIGURE_OPTIONS)
 	cd build-tree && $(MAKE)
 	touch build-stamp