rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

- Build info files in the source dir, then move to objdir

Browse Source 
to avoid multilib conflicts (#825061)
This commit is contained in:
Jeff Law 2012-05-29 23:19:23 -06:00
parent 6610971096
commit bb3a5a5ad9
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glibc-rh825061.patch Normal file
View File

@ -0,0 +1,13 @@
diff -rup a/manual/Makefile b/manual/Makefile
--- a/manual/Makefile 2012-05-20 19:47:38.000000000 -0600
+++ b/manual/Makefile 2012-05-29 22:23:33.920428631 -0600
@@ -129,7 +129,8 @@ $(objpfx)%.c.texi: examples/%.c
mv -f $@.new $@
$(objpfx)%.info: %.texinfo
- LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=$@ $<
+ LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=`basename $@` $<
+ mv `basename $@`* $(objpfx)
$(objpfx)%.dvi: %.texinfo
cd $(objpfx);$(TEXI2DVI) -I $(shell cd $(<D) && pwd) --output=$@ \

11
glibc.spec
View File

@ -28,7 +28,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 3%{?dist} Release: 4%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs # Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -94,6 +94,10 @@ Patch0021: %{name}-rh564528.patch
# stap and thus will never be accepted upstream # stap and thus will never be accepted upstream
Patch0029: %{name}-stap-libm.patch Patch0029: %{name}-stap-libm.patch
# Build info files in the source tree, then move to the build
# tree so that they're identical for multilib builds
Patch0035: %{name}-rh825061.patch
# #
# Patches from upstream # Patches from upstream
# #
@ -414,6 +418,7 @@ rm -rf %{glibcportsdir}
%patch2032 -p1 %patch2032 -p1
%patch2033 -p1 %patch2033 -p1
%patch2034 -p1 %patch2034 -p1
%patch0035 -p1
# A lot of programs still misuse memcpy when they have to use # A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at # memmove. The memcpy implementation below is not tolerant at
@ -1290,6 +1295,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue May 29 2012 Jeff Law <law@redhat.com> - 2.15.90-4
- Build info files in the source dir, then move to objdir
to avoid multilib conflicts (#825061)
* Fri May 25 2012 Jeff Law <law@redhat.com> - 2.15.90-3 * Fri May 25 2012 Jeff Law <law@redhat.com> - 2.15.90-3
- Work around RPM dropping the contents of /etc/localtime - Work around RPM dropping the contents of /etc/localtime
when it turns into a symlink with %post common script (#825159). when it turns into a symlink with %post common script (#825159).