[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1912: make sure new CFLAGS setting from package doesn't kill stub_libs setting (for bug 2977)

[Mats Wichmann]

------------------------------------------------------------
revno: 1912
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2012-02-21 10:19:10 -0700
message:
  make sure new CFLAGS setting from package doesn't kill stub_libs setting (for bug 2977)
modified:
  lsbdev-cc/makefile
  package/Makefile
  stub_libs/Makefile.all-arch
-------------- next part --------------
=== modified file 'lsbdev-cc/makefile'
--- a/lsbdev-cc/makefile	2012-02-18 13:49:20 +0000
+++ b/lsbdev-cc/makefile	2012-02-21 17:19:10 +0000
@@ -6,8 +6,7 @@
 EXTRA_OBJS = besteffort.o
 INSTALL_ROOT ?= /usr/local
 BASE_PATH ?=\"$(INSTALL_ROOT)\"
-CFLAGS ?= -g -Wall 
-CFLAGS += -DBASE_PATH=$(BASE_PATH)
+override CFLAGS += -g -Wall -DBASE_PATH=$(BASE_PATH)
 CXXFLAGS = $(CFLAGS)
 EXTRA_CFLAGS = -fPIC
 DBOPTS = -h $$LSBDBHOST -u $$LSBUSER --password=$$LSBDBPASSWD

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-02-18 13:49:20 +0000
+++ b/package/Makefile	2012-02-21 17:19:10 +0000
@@ -13,7 +13,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=1
+RPM_PACKAGE_RELEASE=2
 
 # Derive date string for daily snapshots
 ISO_DATE:=$(shell date +"%Y%m%d")

=== modified file 'stub_libs/Makefile.all-arch'
--- a/stub_libs/Makefile.all-arch	2011-01-10 21:33:53 +0000
+++ b/stub_libs/Makefile.all-arch	2012-02-21 17:19:10 +0000
@@ -17,7 +17,7 @@
 DESKTOP_OFILES := $(addsuffix .o,$(DESKTOP_STUBLIBS))
 DESKTOP_SOFILES := $(addsuffix .so,$(DESKTOP_STUBLIBS))
 
-CFLAGS=-g -Wall  -fno-builtin -fPIC
+override CFLAGS += -g -Wall -fno-builtin -fPIC
 INSTALL_ROOT ?= /usr/local
 INSTALL_DIR=$(INSTALL_ROOT)$(LIBDIR)-$(LSB_VERSION)/$(SUBDIR)
 SYMLINK_DIR=$(INSTALL_ROOT)$(LIBDIR)