[Glibc-bsd-commits] r3345 - in trunk: freebsd-libs/debian freebsd-quota/debian zfsutils/debian

[Guillem Jover]

Author: guillem
Date: 2011-05-29 19:18:10 +0000 (Sun, 29 May 2011)
New Revision: 3345

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-quota/debian/changelog
   trunk/freebsd-quota/debian/rules
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/rules
Log:
Line-wrap CFLAGS and PMAKE variables in debian/rules


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-05-29 18:48:48 UTC (rev 3344)
+++ trunk/freebsd-libs/debian/changelog	2011-05-29 19:18:10 UTC (rev 3345)
@@ -15,6 +15,7 @@
     - Refresh all patches.
   * Add myself to Uploaders.
   * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
+  * Line-wrap CFLAGS and PMAKE variables in debian/rules.
 
  -- Robert Millan <rmh at debian.org>  Mon, 10 Jan 2011 16:01:31 +0100
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2011-05-29 18:48:48 UTC (rev 3344)
+++ trunk/freebsd-libs/debian/rules	2011-05-29 19:18:10 UTC (rev 3345)
@@ -10,7 +10,8 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
+         -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -27,7 +28,8 @@
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
+        NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 export SHLIB_MAJOR = 0
 kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 

Modified: trunk/freebsd-quota/debian/changelog
===================================================================
--- trunk/freebsd-quota/debian/changelog	2011-05-29 18:48:48 UTC (rev 3344)
+++ trunk/freebsd-quota/debian/changelog	2011-05-29 19:18:10 UTC (rev 3345)
@@ -6,5 +6,6 @@
   [ Guillem Jover ]
   * Now using Standards-Version 3.9.2 (no changes needed).
   * Refactor source name into SOURCE in debian/rules.
+  * Line-wrap CFLAGS and PMAKE variables in debian/rules.
 
  -- Mats Erik Andersson <mats.andersson at gisladisker.se>  Mon, 28 Feb 2011 18:29:17 +0100

Modified: trunk/freebsd-quota/debian/rules
===================================================================
--- trunk/freebsd-quota/debian/rules	2011-05-29 18:48:48 UTC (rev 3344)
+++ trunk/freebsd-quota/debian/rules	2011-05-29 19:18:10 UTC (rev 3345)
@@ -10,8 +10,10 @@
 ORIGDIR = $(SOURCE)-$(VERSION)
 TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D'__RCSID(string)='
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' \
+         -D'__RCSID(string)='
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
+        NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 
 get-orig-source:
 	rm -rf $(ORIGDIR)

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-05-29 18:48:48 UTC (rev 3344)
+++ trunk/zfsutils/debian/changelog	2011-05-29 19:18:10 UTC (rev 3345)
@@ -18,6 +18,7 @@
     - Remove patch target in debian/rules.
     - Remove now unneeded README.source.
   * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
+  * Line-wrap CFLAGS and PMAKE variables in debian/rules.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 22 Apr 2011 17:29:09 +0200
 

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2011-05-29 18:48:48 UTC (rev 3344)
+++ trunk/zfsutils/debian/rules	2011-05-29 19:18:10 UTC (rev 3345)
@@ -9,7 +9,9 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. \
+         -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN -D'__FBSDID(string)=' \
+         -D__va_list=__builtin_va_list
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -25,7 +27,8 @@
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
+        NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 export SHLIB_MAJOR = 0
 export SHLIBDIR = ./