From 77390dfeafcfae001682a95e66ef5be237d1a80a Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Tue, 8 Nov 2005 03:31:45 +0000
Subject: [PATCH] issue #5572
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
ChangeLog | 2 ++
Makefile | 13 +++++++------
codecs/gsm/Makefile | 1 -
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 487f5a7d1c..a7bced1e7d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-11-07 Kevin P. Fleming <kpfleming@digium.com>
+ * Makefile: correct cross-compilation issue introduced in Cygwin patches (issue #5572)
+
* apps/app_voicemail.c: upgrade to new arg/option API and implement priority jumping control (issue #5649)
* asterisk.c (main): setpriority() failure is not a reason to stop the process (issue #5581)
diff --git a/Makefile b/Makefile
index 1f5a0bd633..766fc83e11 100755
--- a/Makefile
+++ b/Makefile
@@ -285,12 +285,13 @@ ifeq ($(OSARCH),SunOS)
endif
ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-CYGLOADER=cygwin_a
-OSARCH=CYGWIN
-ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
-ASTLINK=
-LIBS+=-lpthread -lncurses -lm -lresolv
-ASTSBINDIR=$(MODULES_DIR)
+ CYGLOADER=cygwin_a
+ OSARCH=CYGWIN
+ ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
+ ASTLINK=
+ LIBS+=-lpthread -lncurses -lm -lresolv
+ ASTSBINDIR=$(MODULES_DIR)
+ PROC=$(shell uname -m)
endif
ifndef WITHOUT_ZAPTEL
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index a2b5dcf1e6..d6eb94bb8b 100755
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -36,7 +36,6 @@ WAV49 = -DWAV49
######### which support MMX instructions. This should be newer pentiums,
######### ppro's, etc, as well as the AMD K6 and K7. The compile will
######### probably require gcc.
-PROC=$(shell uname -m)
ifneq (${OSARCH},Darwin)
ifneq (${OSARCH},SunOS)
--
GitLab