]>
Commit | Line | Data |
---|---|---|
1 | #! /bin/sh /usr/share/dpatch/dpatch-run | |
2 | ## 006_fix-os-detection.dpatch by <divanov@creditreform.bg> | |
3 | ## | |
4 | ## All lines beginning with `## DP:' are a description of the patch. | |
5 | ## DP: Fix OS detection in configure and configure.in | |
6 | ||
7 | @DPATCH@ | |
8 | ||
9 | --- firebird2-1.5.2.orig/src/extern/editline/configure | |
10 | +++ firebird2-1.5.2/src/extern/editline/configure | |
11 | @@ -894,7 +894,7 @@ | |
12 | *-*-freebsd*) | |
13 | ABI="elf" | |
14 | ;; | |
15 | - *-*-linux*) | |
16 | + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) | |
17 | ABI="elf" | |
18 | ;; | |
19 | *-*-netbsd*) | |
20 | --- firebird2-1.5.2.orig/src/extern/editline/configure.in | |
21 | +++ firebird2-1.5.2/src/extern/editline/configure.in | |
22 | @@ -32,7 +32,7 @@ | |
23 | *-*-freebsd*) | |
24 | ABI="elf" | |
25 | ;; | |
26 | - *-*-linux*) | |
27 | + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) | |
28 | ABI="elf" | |
29 | ;; | |
30 | *-*-netbsd*) | |
31 | --- firebird2-1.5.2.orig/configure.in | |
32 | +++ firebird2-1.5.2/configure.in | |
33 | @@ -58,7 +58,7 @@ | |
34 | SHRLIB_EXT=so | |
35 | ;; | |
36 | ||
37 | - x86_64*-*-linux*) | |
38 | + x86_64*-*-linux* | x86_64*-*-gnu* | x86_64*-*-k*bsd*-gnu) | |
39 | MAKEFILE_PREFIX=linux_amd64 | |
40 | INSTALL_PREFIX=linux | |
41 | PLATFORM=LINUX | |
42 | @@ -70,7 +70,7 @@ | |
43 | CPU_TYPE=amd64 | |
44 | ;; | |
45 | ||
46 | - sparc*-*-linux*) | |
47 | + sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu) | |
48 | MAKEFILE_PREFIX=linux_sparc32 | |
49 | INSTALL_PREFIX=linux | |
50 | PLATFORM=LINUX | |
51 | @@ -80,7 +80,7 @@ | |
52 | SHRLIB_EXT=so | |
53 | ;; | |
54 | ||
55 | - *-*-linux*) | |
56 | + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) | |
57 | MAKEFILE_PREFIX=linux | |
58 | PLATFORM=LINUX | |
59 | AC_DEFINE(LINUX) |