diff options
| author | George Sherwood | 2007-12-01 17:05:50 +0400 |
|---|---|---|
| committer | George Sherwood | 2007-12-01 17:05:50 +0400 |
| commit | d5c136e4177a5022ed8ff368c48dd2a07e86c869 (patch) | |
| tree | ae0f1ab32fd6df4499b798aa46750bf25e14c7c3 | |
| parent | 6897a173ec521de3746aedacfb0c40062c7acfd8 (diff) | |
nspr: Added optional patch for static_assert. Needed at least for
firefox 3.
| -rwxr-xr-x | libs/nspr/CONFIGURE | 1 | ||||
| -rw-r--r-- | libs/nspr/HISTORY | 7 | ||||
| -rwxr-xr-x | libs/nspr/PRE_BUILD | 5 | ||||
| -rw-r--r-- | libs/nspr/assert.patch | 18 |
4 files changed, 31 insertions, 0 deletions
diff --git a/libs/nspr/CONFIGURE b/libs/nspr/CONFIGURE new file mode 100755 index 0000000000..fad10432a4 --- /dev/null +++ b/libs/nspr/CONFIGURE @@ -0,0 +1 @@ +config_query $STATIC_ASSERT "Add patch for STATIC_ASSERT?" n diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY index 3c619a74cc..e25c4e18f5 100644 --- a/libs/nspr/HISTORY +++ b/libs/nspr/HISTORY @@ -1,3 +1,10 @@ +2007-12-01 George Sherwood <george@beernabeer.com> + * CONFIGURE: Added to query for optional STATIC_ASSERT + * PRE_BUILD: Added to apply STATIC_ASSERT patch + * assert.patch: Added patch from + http://paketler.pardus.org.tr/2007/source/nspr.html + Needed to use system npsr in firefox 3 + 2007-07-17 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.6.7 diff --git a/libs/nspr/PRE_BUILD b/libs/nspr/PRE_BUILD new file mode 100755 index 0000000000..cd761e49d6 --- /dev/null +++ b/libs/nspr/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +if [ "$STATIC_ASSERT" == "y" ]; then +cd $SOURCE_DIRECTORY && +patch -p0 < $SCRIPT_DIRECTORY/assert.patch +fi diff --git a/libs/nspr/assert.patch b/libs/nspr/assert.patch new file mode 100644 index 0000000000..3c7ea4006d --- /dev/null +++ b/libs/nspr/assert.patch @@ -0,0 +1,18 @@ +--- mozilla/nsprpub/pr/include/prlog.h:3.14 Sun Apr 25 15:00:47 2004 ++++ mozilla/nsprpub/pr/include/prlog.h Mon May 28 14:48:26 2007 +@@ -251,6 +251,14 @@ + + #endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */ + ++/* ++** Compile-time assert. "condition" must be a constant expression. ++** The macro can be used only in places where an "extern" declaration is ++** allowed. ++*/ ++#define PR_STATIC_ASSERT(condition) \ ++ extern void pr_static_assert(int arg[(condition) ? 1 : -1]) ++ + PR_END_EXTERN_C + + #endif /* prlog_h___ */ + |