Mercurial > hg > nginx

comparison auto/lib/pcre/make @ 5360:3d2d3e1cf427

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: MinGW GCC compatibility. Several warnings silenced, notably (ngx_socket_t) -1 is now checked on socket operations instead of -1, as ngx_socket_t is unsigned on win32 and gcc complains on comparison. With this patch, it's now possible to compile nginx using mingw gcc, with options we normally compile on win32.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 04 Sep 2013 20:48:28 +0400
parents b3f6290a9401
children 78f8ac479735
comparison
equal deleted inserted replaced
5359:2fda9065d0f4 5360:3d2d3e1cf427
21 ngx_makefile=makefile.bcc 21 ngx_makefile=makefile.bcc
22 ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" 22 ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
23 ngx_pcre=`echo \-DPCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"` 23 ngx_pcre=`echo \-DPCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
24 ;; 24 ;;
25 25
26 *)
27 ngx_makefile=
28 ;;
29
26 esac 30 esac
27 31
28 32
29 case "$NGX_PLATFORM" in 33 if [ -n "$ngx_makefile" ]; then
30 34
31 win32) 35 cat << END >> $NGX_MAKEFILE
32
33 cat << END >> $NGX_MAKEFILE
34 36
35 `echo "$PCRE/pcre.lib: $PCRE/pcre.h $NGX_MAKEFILE" \ 37 `echo "$PCRE/pcre.lib: $PCRE/pcre.h $NGX_MAKEFILE" \
36 | sed -e "s/\//$ngx_regex_dirsep/g"` 38 | sed -e "s/\//$ngx_regex_dirsep/g"`
37 \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre $ngx_opt 39 \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre $ngx_opt
38 40
39 `echo "$PCRE/pcre.h:" | sed -e "s/\//$ngx_regex_dirsep/g"` 41 `echo "$PCRE/pcre.h:" | sed -e "s/\//$ngx_regex_dirsep/g"`
40 \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre pcre.h 42 \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre pcre.h
41 43
42 END 44 END
43 45
44 ;; 46 else
45 47
46 *) 48 cat << END >> $NGX_MAKEFILE
47 cat << END >> $NGX_MAKEFILE
48 49
49 $PCRE/pcre.h: $PCRE/Makefile 50 $PCRE/pcre.h: $PCRE/Makefile
50 51
51 $PCRE/Makefile: $NGX_MAKEFILE 52 $PCRE/Makefile: $NGX_MAKEFILE
52 cd $PCRE \\ 53 cd $PCRE \\
58 cd $PCRE \\ 59 cd $PCRE \\
59 && \$(MAKE) libpcre.la 60 && \$(MAKE) libpcre.la
60 61
61 END 62 END
62 63
63 ;; 64 fi
64
65 esac