- fix building on x32

- rel 2

diff --git a/asterisk.spec b/asterisk.spec
index 8f34d572f0aa4375c1380930349ee9aaa462a04f..7481c0a5c5ef37eb0fa72ef7a5e59d4a80eeee65 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -24,7 +24,7 @@ Summary:      Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk
 Version:       13.2.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
@@ -43,6 +43,7 @@ Patch2:               FHS-paths.patch
 Patch3:                pld-banner.patch
 Patch4:                lpc10-system.patch
 Patch5:                %{name}-histedit.patch
+Patch6:                x32.patch
 URL:           http://www.asterisk.org/
 BuildRequires: OSPToolkit-devel >= 4.0.0
 %{?with_oss:BuildRequires:     SDL_image-devel}
@@ -533,6 +534,7 @@ API documentation for Asterisk.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..a109113
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,34 @@
+--- asterisk-13.2.0/Makefile~  2014-10-31 16:50:53.000000000 +0000
++++ asterisk-13.2.0/Makefile   2015-04-05 09:40:53.896839072 +0000
+@@ -174,6 +174,11 @@
+   LDCONFIG_FLAGS=-n
+ endif
+ 
++ifeq ($(OSARCH),linux-gnux32)
++  # flag to tell 'ldconfig' to only process specified directories
++  LDCONFIG_FLAGS=-n
++endif
++
+ ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+   ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+     _ASTCFLAGS+=-pipe
+@@ -790,7 +795,7 @@
+       rm -f contrib/scripts/asterisk.logrotate.tmp
+ 
+ config:
+-      @if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \
++      @if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "linux-gnux32" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \
+               if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
+                       ./build_tools/install_subst contrib/init.d/rc.redhat.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
+                       if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \
+--- asterisk-13.2.0/main/Makefile~     2014-07-04 15:26:58.000000000 +0000
++++ asterisk-13.2.0/main/Makefile      2015-04-05 09:41:32.963507792 +0000
+@@ -41,7 +41,7 @@
+ AST_LIBS+=$(UUID_LIB)
+ AST_LIBS+=$(CRYPT_LIB)
+ 
+-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
++ifneq ($(findstring $(OSARCH), linux-gnu linux-gnux32 uclinux linux-uclibc kfreebsd-gnu),)
+   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
+   AST_LIBS+=-ldl
+   endif