[Glibc-bsd-commits] r6049 - trunk/freebsd-libs/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-05-07 16:42:47 +0000 (Sat, 07 May 2016)
New Revision: 6049

Modified:
   trunk/freebsd-libs/debian/rules
Log:
Refactor; reduce the diff against freebsd-utils


Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2016-05-07 16:22:56 UTC (rev 6048)
+++ trunk/freebsd-libs/debian/rules	2016-05-07 16:42:47 UTC (rev 6049)
@@ -31,11 +31,16 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-CFLAGS += \
-	-Wall -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
+EXTRA_CFLAGS = \
 	-D__FreeBSD_version=__FreeBSD_kernel_version \
-	-I/usr/include/freebsd \
-	-Werror=implicit-function-declaration
+	-D_GNU_SOURCE -pipe -Wall \
+	-Werror=implicit-function-declaration \
+	-I. -I$(CURDIR)/sys \
+	-isystem /usr/include/freebsd \
+	-fPIC \
+	$(CPPFLAGS) \
+	$(NULL)
+CFLAGS   += $(EXTRA_CFLAGS)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -73,7 +78,7 @@
 	CFLAGS="$(CFLAGS) -D__FREEBSD_GLUE_USE_EMBEDDED_HEADERS" \
 	$(PMAKE_COMMON)
 
-kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+kernel = $(DEB_HOST_ARCH_OS)
 
 get-orig-source:
 	rm -rf $(ORIGDIR)