]>
Commit | Line | Data |
---|---|---|
7eae5355 JR |
1 | --- asterisk-13.2.0/Makefile~ 2014-10-31 16:50:53.000000000 +0000 |
2 | +++ asterisk-13.2.0/Makefile 2015-04-05 09:40:53.896839072 +0000 | |
3 | @@ -174,6 +174,11 @@ | |
4 | LDCONFIG_FLAGS=-n | |
5 | endif | |
6 | ||
7 | +ifeq ($(OSARCH),linux-gnux32) | |
8 | + # flag to tell 'ldconfig' to only process specified directories | |
9 | + LDCONFIG_FLAGS=-n | |
10 | +endif | |
11 | + | |
12 | ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),) | |
13 | ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),) | |
14 | _ASTCFLAGS+=-pipe | |
15 | @@ -790,7 +795,7 @@ | |
16 | rm -f contrib/scripts/asterisk.logrotate.tmp | |
17 | ||
18 | config: | |
19 | - @if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \ | |
20 | + @if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "linux-gnux32" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \ | |
21 | if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \ | |
22 | ./build_tools/install_subst contrib/init.d/rc.redhat.asterisk "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \ | |
23 | if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \ | |
24 | --- asterisk-13.2.0/main/Makefile~ 2014-07-04 15:26:58.000000000 +0000 | |
25 | +++ asterisk-13.2.0/main/Makefile 2015-04-05 09:41:32.963507792 +0000 | |
26 | @@ -41,7 +41,7 @@ | |
27 | AST_LIBS+=$(UUID_LIB) | |
28 | AST_LIBS+=$(CRYPT_LIB) | |
29 | ||
30 | -ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),) | |
31 | +ifneq ($(findstring $(OSARCH), linux-gnu linux-gnux32 uclinux linux-uclibc kfreebsd-gnu),) | |
32 | ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),) | |
33 | AST_LIBS+=-ldl | |
34 | endif |