[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r3913 - in glibc-package/trunk/debian: . rules.d



Author: aurel32
Date: 2009-10-30 08:03:02 +0000 (Fri, 30 Oct 2009)
New Revision: 3913

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules
   glibc-package/trunk/debian/rules.d/build.mk
Log:
  * Don't include debian/ and stamp-dir/ in eglibc source tarball.  Closes:
    #553053.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2009-10-30 07:51:16 UTC (rev 3912)
+++ glibc-package/trunk/debian/changelog	2009-10-30 08:03:02 UTC (rev 3913)
@@ -13,8 +13,10 @@
   * Disable PIE on MIPS/MIPSEL. 
   * Replace patches/s390/submitted-getutmpx.diff by upstream version
     (patches/any/cvs-getutmpx-compat.diff).
+  * Don't include debian/ and stamp-dir/ in eglibc source tarball.  Closes:
+    #553053.
 
- -- Aurelien Jarno <aurel32@debian.org>  Fri, 30 Oct 2009 08:50:28 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 30 Oct 2009 09:02:31 +0100
 
 eglibc (2.10.1-3) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules	2009-10-30 07:51:16 UTC (rev 3912)
+++ glibc-package/trunk/debian/rules	2009-10-30 08:03:02 UTC (rev 3913)
@@ -64,7 +64,7 @@
 DEB_BUILDDIR ?= $(build-tree)/$(DEB_HOST_ARCH)-$(curpass)
 
 EGLIBC_SOURCES = $(addprefix $(shell basename $(CURDIR))/, \
-		 $(filter-out $(stamp) CVS $(build-tree), $(wildcard *)))
+		 $(filter-out debian $(shell basename $(stamp)) $(build-tree), $(wildcard *)))
 		 
 # The kernel uses different CPU appreviations (uname output) than the GNU
 # tools do (config.sub).  Map them.
@@ -91,7 +91,6 @@
 sbindir=$(prefix)/sbin
 slibdir=/lib
 libdir=/usr/lib
-fpie=yes
 
 BUILD_CC = gcc
 BUILD_CXX = g++

Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk	2009-10-30 07:51:16 UTC (rev 3912)
+++ glibc-package/trunk/debian/rules.d/build.mk	2009-10-30 08:03:02 UTC (rev 3913)
@@ -160,6 +160,7 @@
 	touch $@
 
 $(stamp)source: $(stamp)patch
+	mkdir -p $(build-tree)
 	tar -c --lzma -C .. \
 		-f $(build-tree)/eglibc-$(EGLIBC_VERSION).tar.lzma \
 		$(EGLIBC_SOURCES)


Reply to: