mingw64-i686-botan1.10 1.10.16
[git/cygwin-packages/mingw64-i686-botan1.10.git] / 1.10.5-cross-compile.patch
CommitLineData
41d590e1
YS
1--- origsrc/Botan-1.10.5/configure.py 2013-03-02 15:19:36.000000000 -0600
2+++ src/Botan-1.10.5/configure.py 2014-02-02 16:05:37.897195900 -0600
3@@ -922,7 +922,7 @@ class OsInfo(object):
4 self.build_shared = (True if self.build_shared == 'yes' else False)
5
6 def ranlib_command(self):
7- return ('ranlib' if self.ar_needs_ranlib else 'true')
8+ return ('$(CROSS)ranlib' if self.ar_needs_ranlib else 'true')
9
10 def defines(self):
11 return ['TARGET_OS_IS_%s' % (self.basename.upper())] + \
12--- origsrc/Botan-1.10.5/src/build-data/cc/gcc.txt 2013-03-02 15:19:37.000000000 -0600
13+++ src/Botan-1.10.5/src/build-data/cc/gcc.txt 2014-02-02 16:11:36.240691900 -0600
14@@ -1,6 +1,6 @@
15 macro_name GCC
16
17-binary_name g++
18+binary_name "$(CROSS)g++"
19
20 has_tr1 yes
21
22@@ -17,7 +17,7 @@ maintainer_warning_flags "-Werror -Wall
23
24 lib_opt_flags "-O3"
25 check_opt_flags "-O2"
26-shared_flags "-fPIC"
27+shared_flags "-DPIC"
28 debug_flags -g
29 no_debug_flags "-finline-functions"
30
31@@ -39,6 +39,7 @@ openbsd -> "$(CXX) -shared -fPIC"
32 darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
33 hpux -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
34 solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
35+mingw -> "$(CXX) -shared -Wl,--out-implib,$(SYMLINK)"
36 </so_link_flags>
37
38 <mach_opt>
39--- origsrc/Botan-1.10.5/src/build-data/makefile/unix_shr.in 2013-03-02 15:19:37.000000000 -0600
40+++ src/Botan-1.10.5/src/build-data/makefile/unix_shr.in 2014-02-02 16:27:27.363093000 -0600
41@@ -57,10 +57,10 @@ LIBRARIES = $(STATIC_LIB) $(SHARED_L
42 LIBNAME = %{lib_prefix}libbotan
43 STATIC_LIB = $(LIBNAME)-$(SERIES).a
44
45-SONAME = $(LIBNAME)-$(SERIES).%{so_suffix}.%{so_abi_rev}
46-SHARED_LIB = $(SONAME).%{version_patch}
47+SONAME = $(LIBNAME)-$(SERIES)-%{so_abi_rev}.%{so_suffix}
48+SHARED_LIB = $(SONAME)
49
50-SYMLINK = $(LIBNAME)-$(SERIES).%{so_suffix}
51+SYMLINK = $(LIBNAME)-$(SERIES).dll.a
52
53 all: $(LIBRARIES)
54
55@@ -80,8 +80,6 @@ $(STATIC_LIB): $(LIBOBJS)
56
57 $(SHARED_LIB): $(LIBOBJS)
58 $(SO_LINK_CMD) $(LDFLAGS) $(LIBOBJS) -o $(SHARED_LIB) $(LINK_TO)
59- $(LN) $(SHARED_LIB) $(SONAME)
60- $(LN) $(SHARED_LIB) $(SYMLINK)
61
62 # Fake Targets
63 .PHONY = docs clean distclean install static shared
64@@ -113,12 +111,10 @@ install: $(LIBRARIES) docs
65 done
66
67 $(MKDIR_INSTALL) $(LIBDIR)
68- $(INSTALL_CMD_DATA) $(STATIC_LIB) $(LIBDIR)
69- $(INSTALL_CMD_EXEC) $(SHARED_LIB) $(LIBDIR)
70- $(CD) $(LIBDIR); $(LN) $(SHARED_LIB) $(SYMLINK)
71- $(CD) $(LIBDIR); $(LN) $(SHARED_LIB) $(SONAME)
72-
73 $(MKDIR_INSTALL) $(BINDIR)
74+ $(INSTALL_CMD_DATA) $(STATIC_LIB) $(LIBDIR)
75+ $(INSTALL_CMD_EXEC) $(SHARED_LIB) $(BINDIR)
76+ $(INSTALL_CMD_DATA) $(SYMLINK) $(LIBDIR)
77 $(INSTALL_CMD_EXEC) $(CONFIG_SCRIPT) $(BINDIR)
78
79 $(MKDIR_INSTALL) $(PKGCONF_DIR)
80--- origsrc/Botan-1.10.5/src/build-data/os/mingw.txt 2013-03-02 15:19:37.000000000 -0600
81+++ src/Botan-1.10.5/src/build-data/os/mingw.txt 2014-02-02 16:17:20.923406700 -0600
82@@ -4,9 +4,7 @@ obj_suffix o
83 so_suffix dll
84 static_suffix a
85
86-build_shared no
87-
88-ar_command "ar crs"
89+ar_command "$(CROSS)ar crs"
90 ar_needs_ranlib yes
91
92 install_root /mingw
This page took 0.025623 seconds and 5 git commands to generate.