Bug#756095: src:glibc: application of debian/patches/ia64/local-rtld-compile-options.diff fails
Package: src:glibc
Version: 2.19-7
Severity: normal
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Building of glibc for ia64 fails in application of patch
debian/patches/ia64/local-rtld-compile-options.diff.
I am attaching a patch that fixes the above patch. Note that my patch
will not make ia64 build, because it then fails in conifgure:
| checking for forced unwind support... no
| configure: error: forced unwind support is required
This bug is only about the patch application part though.
Helmut
diff -Nru glibc-2.19/debian/changelog glibc-2.19/debian/changelog
--- glibc-2.19/debian/changelog 2014-07-13 01:31:22.000000000 +0200
+++ glibc-2.19/debian/changelog 2014-07-26 07:41:47.000000000 +0200
@@ -1,3 +1,11 @@
+glibc (2.19-7.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix application of debian/patches/ia64/local-rtld-compile-options.diff.
+ (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 26 Jul 2014 07:41:10 +0200
+
glibc (2.19-7) unstable; urgency=high
* debian/patches/localedata/unsubmitted-tst-setlocale3-ENV.diff: Apply
diff -Nru glibc-2.19/debian/patches/ia64/local-rtld-compile-options.diff glibc-2.19/debian/patches/ia64/local-rtld-compile-options.diff
--- glibc-2.19/debian/patches/ia64/local-rtld-compile-options.diff 2013-12-08 11:40:29.000000000 +0100
+++ glibc-2.19/debian/patches/ia64/local-rtld-compile-options.diff 2014-07-26 07:41:03.000000000 +0200
@@ -6,8 +6,8 @@
-D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
CFLAGS-cache.c = $(SYSCONF-FLAGS)
--CFLAGS-rtld.c = $(SYSCONF-FLAGS)
-+CFLAGS-rtld.c = $(SYSCONF-FLAGS) -O1 -fno-tree-copy-prop -fno-tree-dominator-opts -fno-tree-ccp
+-CFLAGS-rtld.c += $(SYSCONF-FLAGS)
++CFLAGS-rtld.c += $(SYSCONF-FLAGS) -O1 -fno-tree-copy-prop -fno-tree-dominator-opts -fno-tree-ccp
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
-DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
Reply to: