← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/lightning-extension/oneiric-security

« back to all changes in this revision

Viewing changes to mozilla/build/unix/build-toolchain/binutils-deterministic.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-04-20 13:46:11 UTC
  • mfrom: (1.2.1)
  • mto: (1.3.1)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: package-import@ubuntu.com-20120420134611-i0dkosnbmihrd0lr
Tags: upstream-1.4+build1
Import upstream version 1.4+build1

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/build/unix/build-toolchain/binutils-deterministic.patch
 
1
diff -ru a/binutils/ar.c b/binutils/ar.c
 
2
--- a/binutils/ar.c     2011-03-16 04:35:58.000000000 -0400
 
3
+++ b/binutils/ar.c     2012-01-19 15:44:46.211226017 -0500
 
4
@@ -98,7 +98,7 @@
 
5
 /* Operate in deterministic mode: write zero for timestamps, uids,
 
6
    and gids for archive members and the archive symbol table, and write
 
7
    consistent file modes.  */
 
8
-int deterministic = 0;
 
9
+int deterministic = TRUE;
 
10
 
 
11
 /* Nonzero means it's the name of an existing member; position new or moved
 
12
    files with respect to this one.  */
 
13
@@ -634,9 +634,6 @@
 
14
       if (newer_only && operation != replace)
 
15
        fatal (_("`u' is only meaningful with the `r' option."));
 
16
 
 
17
-      if (newer_only && deterministic)
 
18
-       fatal (_("`u' is not meaningful with the `D' option."));
 
19
-
 
20
       if (postype != pos_default)
 
21
        posname = argv[arg_index++];
 
22