rpms/nspr/devel nspr-bug-487844.patch,NONE,1.1 nspr.spec,1.41,1.42

[Kai Engert]

Author: kengert

Update of /cvs/extras/rpms/nspr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9006

Modified Files:
	nspr.spec 
Added Files:
	nspr-bug-487844.patch 
Log Message:
* Wed Mar 04 2009 Kai Engert <kaie at redhat.com> - 4.7.3-5
- add a workaround for bug 487844


nspr-bug-487844.patch:

--- NEW FILE nspr-bug-487844.patch ---
Index: mozilla/nsprpub/pr/src/misc/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v
retrieving revision 1.20
diff -u -u -8 -r1.20 Makefile.in
--- mozilla/nsprpub/pr/src/misc/Makefile.in	7 Feb 2009 03:37:28 -0000	1.20
+++ mozilla/nsprpub/pr/src/misc/Makefile.in	4 Mar 2009 00:50:16 -0000
@@ -95,16 +95,31 @@
 	@$(MAKE_OBJDIR)
 ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER)))
 	$(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<)
 else
 	$(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<)
 endif
 endif
 
+# Need -fno-strict-aliasing because prdtoa.c violates strict aliasing rules
+# (bug 439144).
+#
+# The dtoa.c test program won't pass without -ffloat-store in optimized
+# builds, but I don't know why (may be related to bug 270502).
+ifeq ($(OS_TARGET),Linux)
+$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c
+	@$(MAKE_OBJDIR)
+ifdef NEED_ABSOLUTE_PATH
+	$(CC) -o $@ -c $(CFLAGS) -ffloat-store -fno-strict-aliasing $(call abspath,$<)
+else
+	$(CC) -o $@ -c $(CFLAGS) -ffloat-store -fno-strict-aliasing $<
+endif
+endif
+
 #
 # Generate prerr.h, prerr.c, and prerr.properties from prerr.et.
 #
 build_prerr:
 	cd $(srcdir); $(PERL) compile-et.pl prerr.et
 
 export:: $(TARGETS)
 


Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- nspr.spec	26 Feb 2009 06:09:07 -0000	1.41
+++ nspr.spec	4 Mar 2009 03:49:47 -0000	1.42
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.7.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@
 Source2:        nspr-config-vars.in
 
 Patch1:         nspr-config-pc.patch
+Patch2:         nspr-bug-487844.patch
 
 %description
 NSPR provides platform independence for non-GUI operating system 
@@ -44,6 +45,7 @@
 
 cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in
 %patch1 -p0
+%patch2 -p0
 
 cp %{SOURCE2} ./mozilla/nsprpub/config/
 
@@ -131,6 +133,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Wed Mar 04 2009 Kai Engert <kaie at redhat.com> - 4.7.3-5
+- add a workaround for bug 487844
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild