~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to crypto/bn/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-01 23:51:53 UTC
  • mfrom: (11.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110501235153-bjcxitndquaezb68
Tags: 1.0.0d-2ubuntu1
* Resynchronise with Debian (LP: #675566).  Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification bubble on libssl1.0.0
      upgrade.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/aesni.patch: Backport Intel AES-NI support, now from
    http://rt.openssl.org/Ticket/Display.html?id=2065 rather than the
    0.9.8 variant.
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i486, i586 (on
      i386), v8 (on sparc).
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
* Update architectures affected by Bsymbolic-functions.patch.
* Drop debian/patches/no-sslv2.patch; Debian now adds the 'no-ssl2'
  configure option, which compiles out SSLv2 support entirely, so this is
  no longer needed.
* Drop openssl-doc in favour of the libssl-doc package introduced by
  Debian.  Add Conflicts/Replaces until the next LTS release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
AR=             ar r
13
13
 
14
14
BN_ASM=         bn_asm.o
15
 
# or use
16
 
#BN_ASM=        bn86-elf.o
17
15
 
18
16
CFLAGS= $(INCLUDES) $(CFLAG)
19
17
ASFLAGS= $(INCLUDES) $(ASFLAG)
28
26
        bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
29
27
        bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
30
28
        bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \
31
 
        bn_depr.c bn_x931p.c bn_const.c bn_opt.c
 
29
        bn_depr.c bn_const.c
32
30
 
33
31
LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \
34
32
        bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \
35
33
        bn_kron.o bn_sqrt.o bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) \
36
34
        bn_recp.o bn_mont.o bn_mpi.o bn_exp2.o bn_gf2m.o bn_nist.o \
37
 
        bn_depr.o bn_x931p.o bn_const.o bn_opt.o
 
35
        bn_depr.o bn_const.o
38
36
 
39
37
SRC= $(LIBSRC)
40
38
 
58
56
        cc -g -I../../include bnbug.c -o bnbug ../../libcrypto.a
59
57
 
60
58
lib:    $(LIBOBJ)
61
 
        $(ARX) $(LIB) $(LIBOBJ)
 
59
        $(AR) $(LIB) $(LIBOBJ)
62
60
        $(RANLIB) $(LIB) || echo Never mind.
63
61
        @touch lib
64
62
 
65
 
# ELF
66
 
bn86-elf.s:     asm/bn-586.pl ../perlasm/x86asm.pl
67
 
        (cd asm; $(PERL) bn-586.pl elf $(CFLAGS) > ../$@)
68
 
co86-elf.s:     asm/co-586.pl ../perlasm/x86asm.pl
69
 
        (cd asm; $(PERL) co-586.pl elf $(CFLAGS) > ../$@)
70
 
mo86-elf.s:     asm/mo-586.pl ../perlasm/x86asm.pl
71
 
        (cd asm; $(PERL) mo-586.pl elf $(CFLAGS) > ../$@)
72
 
# COFF
73
 
bn86-cof.s: asm/bn-586.pl ../perlasm/x86asm.pl
74
 
        (cd asm; $(PERL) bn-586.pl coff $(CFLAGS) > ../$@)
75
 
co86-cof.s: asm/co-586.pl ../perlasm/x86asm.pl
76
 
        (cd asm; $(PERL) co-586.pl coff $(CFLAGS) > ../$@)
77
 
mo86-cof.s: asm/mo-586.pl ../perlasm/x86asm.pl
78
 
        (cd asm; $(PERL) mo-586.pl coff $(CFLAGS) > ../$@)
79
 
# a.out
80
 
bn86-out.s: asm/bn-586.pl ../perlasm/x86asm.pl
81
 
        (cd asm; $(PERL) bn-586.pl a.out $(CFLAGS) > ../$@)
82
 
co86-out.s: asm/co-586.pl ../perlasm/x86asm.pl
83
 
        (cd asm; $(PERL) co-586.pl a.out $(CFLAGS) > ../$@)
84
 
mo86-out.s: asm/mo-586.pl ../perlasm/x86asm.pl
85
 
        (cd asm; $(PERL) mo-586.pl a.out $(CFLAGS) > ../$@)
 
63
bn-586.s:       asm/bn-586.pl ../perlasm/x86asm.pl
 
64
        $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
65
co-586.s:       asm/co-586.pl ../perlasm/x86asm.pl
 
66
        $(PERL) asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
67
x86-mont.s:     asm/x86-mont.pl ../perlasm/x86asm.pl
 
68
        $(PERL) asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
86
69
 
87
70
sparcv8.o:      asm/sparcv8.S
88
71
        $(CC) $(CFLAGS) -c asm/sparcv8.S
89
 
sparcv8plus.o:  asm/sparcv8plus.S
90
 
        $(CC) $(CFLAGS) -c asm/sparcv8plus.S
 
72
bn-sparcv9.o:   asm/sparcv8plus.S
 
73
        $(CC) $(CFLAGS) -c -o $@ asm/sparcv8plus.S
 
74
sparcv9a-mont.s:        asm/sparcv9a-mont.pl
 
75
        $(PERL) asm/sparcv9a-mont.pl $(CFLAGS) > $@
 
76
sparcv9-mont.s:         asm/sparcv9-mont.pl
 
77
        $(PERL) asm/sparcv9-mont.pl $(CFLAGS) > $@
91
78
 
92
79
bn-mips3.o:     asm/mips3.s
93
80
        @if [ "$(CC)" = "gcc" ]; then \
95
82
                as -$$ABI -O -o $@ asm/mips3.s; \
96
83
        else    $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
97
84
 
 
85
bn-s390x.o:     asm/s390x.S
 
86
        $(CC) $(CFLAGS) -c -o $@ asm/s390x.S
 
87
 
98
88
x86_64-gcc.o:   asm/x86_64-gcc.c
99
89
        $(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c
100
90
x86_64-mont.s:  asm/x86_64-mont.pl
101
 
        $(PERL) asm/x86_64-mont.pl $@
 
91
        $(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@
102
92
 
103
93
bn-ia64.s:      asm/ia64.S
104
94
        $(CC) $(CFLAGS) -E asm/ia64.S > $@
111
101
        /usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s
112
102
 
113
103
# ppc - AIX, Linux, MacOS X...
114
 
linux_ppc32.s: asm/ppc.pl;      $(PERL) $< $@
115
 
linux_ppc64.s: asm/ppc.pl;      $(PERL) $< $@
116
 
aix_ppc32.s: asm/ppc.pl;        $(PERL) asm/ppc.pl $@
117
 
aix_ppc64.s: asm/ppc.pl;        $(PERL) asm/ppc.pl $@
118
 
osx_ppc32.s: asm/ppc.pl;        $(PERL) $< $@
119
 
osx_ppc64.s: asm/ppc.pl;        $(PERL) $< $@
 
104
bn-ppc.s:       asm/ppc.pl;     $(PERL) asm/ppc.pl $(PERLASM_SCHEME) $@
 
105
ppc-mont.s:     asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
 
106
 
 
107
alpha-mont.s:   asm/alpha-mont.pl
 
108
        $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
109
 
 
110
# GNU make "catch all"
 
111
%-mont.s:       asm/%-mont.pl;  $(PERL) $< $(CFLAGS) > $@
120
112
 
121
113
files:
122
114
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
184
176
bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
185
177
bn_blind.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
186
178
bn_blind.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_blind.c bn_lcl.h
187
 
bn_const.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
188
 
bn_const.o: ../../include/openssl/ossl_typ.h bn.h bn_const.c
 
179
bn_const.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 
180
bn_const.o: ../../include/openssl/opensslconf.h
 
181
bn_const.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 
182
bn_const.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 
183
bn_const.o: ../../include/openssl/symhacks.h bn.h bn_const.c
189
184
bn_ctx.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
190
185
bn_ctx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
191
186
bn_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
292
287
bn_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
293
288
bn_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
294
289
bn_nist.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_nist.c
295
 
bn_opt.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
296
 
bn_opt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
297
 
bn_opt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
298
 
bn_opt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
299
 
bn_opt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
300
 
bn_opt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
301
 
bn_opt.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_opt.c
302
290
bn_prime.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
303
291
bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
304
292
bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
357
345
bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
358
346
bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
359
347
bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c
360
 
bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h
361
 
bn_x931p.o: ../../include/openssl/opensslconf.h
362
 
bn_x931p.o: ../../include/openssl/ossl_typ.h bn_x931p.c