[Glibc-bsd-commits] r5219 - in trunk/freebsd-glue: debian src

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-04 14:40:06 +0000 (Wed, 04 Dec 2013)
New Revision: 5219

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/rules
   trunk/freebsd-glue/src/Makefile.inc
Log:
Use -O2 for normal build and -Os for udeb build.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-03 22:19:32 UTC (rev 5218)
+++ trunk/freebsd-glue/debian/changelog	2013-12-04 14:40:06 UTC (rev 5219)
@@ -1,3 +1,9 @@
+freebsd-glue (0.2.6) UNRELEASED; urgency=low
+
+  * Use -O2 for normal build and -Os for udeb build.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 04 Dec 2013 12:46:55 +0100
+
 freebsd-glue (0.2.5) unstable; urgency=low
 
   * Include libbsdxml.so in freebsd-glue.

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2013-12-03 22:19:32 UTC (rev 5218)
+++ trunk/freebsd-glue/debian/rules	2013-12-04 14:40:06 UTC (rev 5219)
@@ -7,8 +7,6 @@
 PATH := /usr/lib/freebsd:$(PATH)
 PMAKE := DESTDIR="$(DESTDIR)" make
 
-CFLAGS = -Wall -Werror
-
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
@@ -29,11 +27,13 @@
 build-std: include/machine/__get_elf_arch.h
 	mkdir -p obj
 	MAKEOBJDIR=$(CURDIR)/obj \
+		CFLAGS="$(CFLAGS) -O2" \
 		$(PMAKE)
 
 build-udeb: include/machine/__get_elf_arch.h
 	mkdir -p obj-udeb
 	MAKEOBJDIR=$(CURDIR)/obj-udeb \
+		CFLAGS="$(CFLAGS) -Os" \
 		$(PMAKE) RESCUE=yes
 
 build-indep:

Modified: trunk/freebsd-glue/src/Makefile.inc
===================================================================
--- trunk/freebsd-glue/src/Makefile.inc	2013-12-03 22:19:32 UTC (rev 5218)
+++ trunk/freebsd-glue/src/Makefile.inc	2013-12-04 14:40:06 UTC (rev 5219)
@@ -1,8 +1,8 @@
 SHLIB_MAJOR ?= 0
 SHLIBDIR ?= /lib
 
-CFLAGS = -Wall -g -pipe -fPIC -D_GNU_SOURCE \
-	-Werror \
+CFLAGS += -g -fPIC -D_GNU_SOURCE \
+	-Wall -Werror -Wno-error=maybe-uninitialized \
 	-isystem ${.CURDIR}/../../include \
 	-D__FREEBSD_LIBC \
 	${NULL}