Author: adconrad
Date: 2012-10-27 23:10:29 +0000 (Sat, 27 Oct 2012)
New Revision: 5364
Added:
glibc-package/branches/eglibc-2.16/debian/patches/any/local-revert-bz13979.diff
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/patches/series
glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
Log:
* Add patches/any/local-revert-bz13979.diff: revert a commit that made
attempts to build with FORTIFIED_SOURCE issue warnings if GCC didn't
have optimisations turned on. This breaks some unclever AC macros.
* Fix building x32 multilib libraries, by correctly passing -mx32.
* Don't run the x32 testsuite on i386/amd64, buildds may lack support.
* Fix some ln calls in sysdeps/{amd64,i386} for binary-arch idempotence.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 17:26:44 UTC
(rev 5363)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-27 23:10:29 UTC
(rev 5364)
@@ -366,6 +366,14 @@
* Merge regression/progression test suite improvements from Ubuntu.
* Provide backward compatibility for DEB_STAGE->DEB_BUILD_PROFILE.
+ [ Matthias Klose ]
+ * Add patches/any/local-revert-bz13979.diff: revert a commit that made
+ attempts to build with FORTIFIED_SOURCE issue warnings if GCC didn't
+ have optimisations turned on. This breaks some unclever AC macros.
+ * Fix building x32 multilib libraries, by correctly passing -mx32.
+ * Don't run the x32 testsuite on i386/amd64, buildds may lack support.
+ * Fix some ln calls in sysdeps/{amd64,i386} for binary-arch idempotence.
+
-- Aurelien Jarno <aure...@debian.org> Wed, 25 Jul 2012 23:45:58 +0200
eglibc (2.13-36) unstable; urgency=low
Added:
glibc-package/branches/eglibc-2.16/debian/patches/any/local-revert-bz13979.diff
===================================================================
---
glibc-package/branches/eglibc-2.16/debian/patches/any/local-revert-bz13979.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.16/debian/patches/any/local-revert-bz13979.diff
2012-10-27 23:10:29 UTC (rev 5364)
@@ -0,0 +1,47 @@
+Revert:
+
+From: Roland Mc Grath <rol...@hack.frob.com>
+Date: Tue, 8 May 2012 17:44:57 +0000 (+0200)
+Subject: Warn if user requests __FORTIFY_SOURCE but it is disabled
+X-Git-Tag: glibc-2.16-tps~448
+X-Git-Url:
http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=05c2c9618f583ea4acd69b3fe5ae2a2922dd2ddc
+
+Warn if user requests __FORTIFY_SOURCE but it is disabled
+
+[BZ #13979]
+ * include/features.h: Warn if user requests __FORTIFY_SOURCE
+ checking but the checks are disabled for any reason.
+---
+
+2012-05-08 Roland Mc Grath <rol...@hack.frob.com>
+
+ [BZ #13979]
+ * include/features.h: Warn if user requests __FORTIFY_SOURCE
+ checking but the checks are disabled for any reason.
+
+
+--- a/include/features.h
++++ b/include/features.h
+@@ -325,18 +325,14 @@
+ # define __USE_REENTRANT 1
+ #endif
+
+-#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0
+-# if !defined __OPTIMIZE__ || __OPTIMIZE__ <= 0
+-# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
+-# elif !__GNUC_PREREQ (4, 1)
+-# warning _FORTIFY_SOURCE requires GCC 4.1 or later
+-# elif _FORTIFY_SOURCE > 1
++#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
++ && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
++# if _FORTIFY_SOURCE > 1
+ # define __USE_FORTIFY_LEVEL 2
+ # else
+ # define __USE_FORTIFY_LEVEL 1
+ # endif
+-#endif
+-#ifndef __USE_FORTIFY_LEVEL
++#else
+ # define __USE_FORTIFY_LEVEL 0
+ #endif
+
Modified: glibc-package/branches/eglibc-2.16/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/series 2012-10-26
17:26:44 UTC (rev 5363)
+++ glibc-package/branches/eglibc-2.16/debian/patches/series 2012-10-27
23:10:29 UTC (rev 5364)
@@ -230,3 +230,4 @@
any/local-revert-fclose-posix2008.diff
any/local-disable-libnss-db.diff
any/local-sunrpc-dos.diff
+any/local-revert-bz13979.diff
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-10-26
17:26:44 UTC (rev 5363)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-10-27
23:10:29 UTC (rev 5364)
@@ -17,9 +17,9 @@
define libc6-dev-i386_extra_pkg_install
mkdir -p debian/libc6-dev-i386/usr/include
-ln -s x86_64-linux-gnu/bits debian/libc6-dev-i386/usr/include/
-ln -s x86_64-linux-gnu/gnu debian/libc6-dev-i386/usr/include/
-ln -s x86_64-linux-gnu/fpu_control.h debian/libc6-dev-i386/usr/include/
+ln -sf x86_64-linux-gnu/bits debian/libc6-dev-i386/usr/include/
+ln -sf x86_64-linux-gnu/gnu debian/libc6-dev-i386/usr/include/
+ln -sf x86_64-linux-gnu/fpu_control.h debian/libc6-dev-i386/usr/include/
mkdir -p debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu
cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \
@@ -27,7 +27,7 @@
mkdir -p debian/libc6-dev-i386/usr/include/sys
for i in `ls debian/tmp-libc/usr/include/x86_64-linux-gnu/sys` ; do \
- ln -s ../x86_64-linux-gnu/sys/$$i
debian/libc6-dev-i386/usr/include/sys/$$i ; \
+ ln -sf ../x86_64-linux-gnu/sys/$$i
debian/libc6-dev-i386/usr/include/sys/$$i ; \
done
endef
@@ -43,17 +43,18 @@
#libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
#x32_add-ons = nptl $(add-ons)
#x32_configure_target = x86_64-linux-gnux32
-#x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7
-#x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7
+#x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
+#x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
#x32_extra_config_options = $(extra_config_options) --disable-profile
#x32_slibdir = /libx32
#x32_libdir = /usr/libx32
+#x32_RUN_TESTSUITE = no
#
#define libc6-dev-x32_extra_pkg_install
#
#mkdir -p debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
#cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
-# debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
+# debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu/
#
#endef
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-10-26
17:26:44 UTC (rev 5363)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-10-27
23:10:29 UTC (rev 5364)
@@ -60,9 +60,9 @@
define libc6-dev-amd64_extra_pkg_install
mkdir -p debian/libc6-dev-amd64/usr/include
-ln -s i386-linux-gnu/bits debian/libc6-dev-amd64/usr/include/
-ln -s i386-linux-gnu/gnu debian/libc6-dev-amd64/usr/include/
-ln -s i386-linux-gnu/fpu_control.h debian/libc6-dev-amd64/usr/include/
+ln -sf i386-linux-gnu/bits debian/libc6-dev-amd64/usr/include/
+ln -sf i386-linux-gnu/gnu debian/libc6-dev-amd64/usr/include/
+ln -sf i386-linux-gnu/fpu_control.h debian/libc6-dev-amd64/usr/include/
mkdir -p debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
cp -a debian/tmp-amd64/usr/include/gnu/stubs-64.h \
@@ -70,7 +70,7 @@
mkdir -p debian/libc6-dev-amd64/usr/include/sys
for i in `ls debian/tmp-libc/usr/include/i386-linux-gnu/sys` ; do \
- ln -s ../i386-linux-gnu/sys/$$i
debian/libc6-dev-amd64/usr/include/sys/$$i ; \
+ ln -sf ../i386-linux-gnu/sys/$$i
debian/libc6-dev-amd64/usr/include/sys/$$i ; \
done
endef
@@ -81,11 +81,12 @@
#libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
#x32_add-ons = nptl $(add-ons)
#x32_configure_target = x86_64-linux-gnux32
-#x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7
-#x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7
+#x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
+#x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
#x32_extra_config_options = $(extra_config_options) --disable-profile
#x32_slibdir = /libx32
#x32_libdir = /usr/libx32
+#x32_RUN_TESTSUITE = no
#
#define libc6-dev-x32_extra_pkg_install
#
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tsfwq-0000wj...@vasks.debian.org
