[nss-softokn/f16] - Ensure it builds even if the buildroot that hasn't yet been boostrapped with updated headers - The

[Elio Maldonado]

commit 50733a0b73bb5357303d1f2f17c2b5a3fdb0fb0a
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Dec 13 22:24:11 2011 -0800

    - Ensure it builds even if the buildroot that hasn't yet been boostrapped with updated headers
    - The build tree freebl headers are selected in preference to the system ones

 iquote.patch     |   25 +++++++++++++++++++++++++
 nss-softokn.spec |   17 ++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/iquote.patch b/iquote.patch
new file mode 100644
index 0000000..30a0ef6
--- /dev/null
+++ b/iquote.patch
@@ -0,0 +1,25 @@
+diff -up ./mozilla/security/coreconf/location.mk.iquote ./mozilla/security/coreconf/location.mk
+--- ./mozilla/security/coreconf/location.mk.iquote	2010-06-11 17:58:32.000000000 -0700
++++ ./mozilla/security/coreconf/location.mk	2011-12-13 21:36:05.966187158 -0800
+@@ -85,6 +85,10 @@ endif
+ 
+ ifdef NSSUTIL_INCLUDE_DIR
+     INCLUDES += -I$(NSSUTIL_INCLUDE_DIR)
++    ifdef IN_TREE_FREEBL_HEADERS_FIRST
++        INCLUDES += -iquote $(DIST)/../public/nss
++        INCLUDES += -iquote $(DIST)/../private/nss
++    endif
+ endif
+ 
+ ifndef NSSUTIL_LIB_DIR
+diff -up ./mozilla/security/nss/cmd/bltest/Makefile.iquote ./mozilla/security/nss/cmd/bltest/Makefile
+--- ./mozilla/security/nss/cmd/bltest/Makefile.iquote	2004-04-25 08:02:39.000000000 -0700
++++ ./mozilla/security/nss/cmd/bltest/Makefile	2011-12-13 21:39:40.891182125 -0800
+@@ -77,6 +77,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (6) Execute "component" rules. (OPTIONAL)                           #
+ #######################################################################
+ 
++INCLUDES += -iquote $(DIST)/../private/nss
+ 
+ 
+ #######################################################################
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 9190ba5..96851d7 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -56,6 +56,14 @@ Patch2:           nss-softokn-3.12.4-prelink.patch
 Patch5:           drbg.patch
 # TODO: Open upstream bug and submmit a patch for this
 Patch8:           softoken-minimal-test-dependencies.patch
+# This patch uses the gcc-iquote dir option  documented at
+# http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
+# to place the in-tree directories at the head of the list on list of directories
+# to be searched for for header files. This is ensures a build even when system freebl 
+# headers are older. Such is the case when we are starting a major update.
+# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers. 
+# Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
+Patch9:           iquote.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -109,6 +117,7 @@ Header and Library files for doing development with Network Security Services.
 %patch2 -p0 -b .prelink
 %patch5 -p0 -b .drbg
 %patch8 -p0 -b .crypto
+%patch9 -p0 -b .iquote
 
 %build
 
@@ -153,6 +162,8 @@ USE_64=1
 export USE_64
 %endif
 
+export IN_TREE_FREEBL_HEADERS_FIRST=1
+
 # Compile softokn plus needed support
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
@@ -373,7 +384,11 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
-* Tue Dec 13 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-14
+* Wed Dec 14 2011 Elio Maldonado <emaldona at redhat.com> - 3.13.1-14
+- Ensure it builds even if the buildroot that hasn't yet been boostrapped with updated headers
+- The build tree freebl headers are selected in preference to the system ones
+
+* Tue Dec 13 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-13.1
 - Restore the update to 3.13.1
 - Update the patch for freebl to deal with prelinked shared libraries
 - Add additional dbrg power-up self-tests as required by fips