diff options
author | 2008-02-18 09:47:03 +0000 | |
---|---|---|
committer | 2008-02-18 09:47:03 +0000 | |
commit | 61dd1facd1b2d8e6aac811b47ab64670c1862aee (patch) | |
tree | fdffb3fcaf993997b597c103d4c445b11bb44578 /net-misc/asterisk | |
parent | Add openzap local useflag for freeswitch-svn and fix copyright header. (diff) | |
download | voip-61dd1facd1b2d8e6aac811b47ab64670c1862aee.tar.gz voip-61dd1facd1b2d8e6aac811b47ab64670c1862aee.tar.bz2 voip-61dd1facd1b2d8e6aac811b47ab64670c1862aee.zip |
Version bump
svn path=/trunk/; revision=650
Diffstat (limited to 'net-misc/asterisk')
-rw-r--r-- | net-misc/asterisk/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/asterisk/Manifest | 6 | ||||
-rw-r--r-- | net-misc/asterisk/asterisk-1.4.18.ebuild | 455 | ||||
-rw-r--r-- | net-misc/asterisk/files/1.4/asterisk-1.4.18-configure-gentoo.diff | 18 | ||||
-rw-r--r-- | net-misc/asterisk/files/1.4/asterisk-1.4.18-gsm-pic.patch | 54 |
5 files changed, 538 insertions, 2 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index f26ab8f..4ffbbab 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for net-misc/asterisk -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2006/02/22 02:08:04 hd_brummy Exp $ + 18 Feb 2008; Stefan Knoblich <s.knoblich@axsentis.de> + +files/1.4/asterisk-1.4.18-configure-gentoo.patch, + files/1.4/asterisk-1.4.18-gsm-pic.patch, asterisk-1.4.18.ebuild: + Version bump. + 10 Oct 2007; Frank-Ralph Reiser <frank.ralph.reiser@gmail.com> +asterisk-1.4.12.1.ebuild: version bump diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 8430dfc..5a88364 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -2,12 +2,16 @@ AUX 1.4/asterisk-1.4.0-configure-gentoo.diff 1027 RMD160 aa0222f97349ca2d709f2ee AUX 1.4/asterisk-1.4.0-uclibc.patch 343 RMD160 4019c00d9bb5882a7f48c0b39368a819aa28b1e5 SHA1 ff6d9e8ca112438416d3344356926f8c9c20685d SHA256 72077008343b453107e4a1a361944d2ccd64443006d6d9015dc0d9714baaa4d5 AUX 1.4/asterisk-1.4.0-var_rundir.patch 441 RMD160 55869a82a01be38e80da9a31faac6d2d03f0fc58 SHA1 5bf2a8ed9778623f611330fcc4ea75c50f642680 SHA256 f75156feb6a6e421fc83e2d518b4b9204e4ae11e802440576a54de226ffd8064 AUX 1.4/asterisk-1.4.1-gsm-pic.patch 1881 RMD160 1d72cc69250916dd02e1b16ed46f5c1148bf1dd0 SHA1 bb0f7342fbc92d431e879f5f8a51134cece8a64a SHA256 140a37be6d84738e0cb4898cbe9e8302d939430628be3bc72af91744f45c9745 +AUX 1.4/asterisk-1.4.18-configure-gentoo.diff 844 RMD160 06cc5058f9b63d91b020ef400087ac38291a5458 SHA1 a3a3c76651893ab5ffb34cf7d3fbedf54aa7a51c SHA256 3d255b9471b52ae052e86fc27f3531abab14b9bd6f1ee5c6a7965963b3c1f7ca +AUX 1.4/asterisk-1.4.18-gsm-pic.patch 2059 RMD160 8993bdb2558adbe31496a11c5b8be1a7440cad3c SHA1 b5e4040881e5e962283972aec35ba043fcbc8bdc SHA256 ff34b404554aebf198e53b0de98ed33066d8e7a1a9f27b5559f2f05eb3e64eb0 AUX 1.4/asterisk.confd 2200 RMD160 f26ac9b18e8c1db86c54839d9b4a816cfe45c61f SHA1 2baee139893fd9c413d140db843831da1917f05f SHA256 b94a59f36a46362622acd2ccc811e1e9dd0abf928104285c7098d7c17a324379 AUX 1.4/asterisk.rc6 5891 RMD160 d14da5d703cdd9bedf9986e0e49a93d8031876ee SHA1 3e28003ecd2d0659266644bffe463fd25efddbcc SHA256 d2bbd0e335f7f2f399780778501df3fd2026ba27dfe48db3ab282430fb215531 AUX 1.4/func_devstate-r6.c 6064 RMD160 79f4beda573a91cab1507ac7e05052f648555c5d SHA1 3451f83c4377a077cdbb56945e9eae0b75a084a9 SHA256 750a51813c51f526a355ab8a4e6511c77ed54a19dff74d836e2a1b8fc4e42d31 DIST asterisk-1.4.11.tar.gz 11218944 RMD160 300282f506cb22f9127e858c7d78d8cee8a622a7 SHA1 2a27155dd716bf8bd3f92fe9eee7fe82e311170c SHA256 99928f8aab62e532e71fdecbd18d5af2d211f1bbce27cf9cf2efc34e57a20101 DIST asterisk-1.4.12.1.tar.gz 11256475 RMD160 6da1c50c24c057dab03c654c75300ef16b12e7e7 SHA1 a9fa3ea91d12a4ec0be96765fc8232c437d0f38b SHA256 fe15343fc72e27a104823d7e117b21254835b459931357aa3cd8bf8d54ebaef3 +DIST asterisk-1.4.18.tar.gz 11496828 RMD160 651cf232835628b184f479db4c0e800b4bedc80f SHA1 3a027488395510b6ebe4a0a0c372db33b2044b0a SHA256 4209e3cda5be25b5a9834599090c4a2ba478acb6670a11581766b480d856108f EBUILD asterisk-1.4.11.ebuild 11354 RMD160 4305071773c3afe00d3330f52113e8e4790d075d SHA1 b27078d593b6f400fec1dc13787cd5546989944b SHA256 51ad4df1199b9e778be0aeda721899510e65234533f50074a8c527fe672c2d34 EBUILD asterisk-1.4.12.1.ebuild 11354 RMD160 4305071773c3afe00d3330f52113e8e4790d075d SHA1 b27078d593b6f400fec1dc13787cd5546989944b SHA256 51ad4df1199b9e778be0aeda721899510e65234533f50074a8c527fe672c2d34 -MISC ChangeLog 2179 RMD160 82160883080fb510866ef695a9011487aca1fac0 SHA1 d6107aecf59a71cccae996d56dc155e444869f4b SHA256 41fac035237ad40e0deea1e13e994f0e31bac7072f3b85c843c312bcf8c553e2 +EBUILD asterisk-1.4.18.ebuild 11358 RMD160 becfb1f51806128d8a7260716dad36a632854089 SHA1 efb6246ef9ecb19168462f3197c163e951a2463d SHA256 6b3576f0a05e060851eff2cfe2f756d144e2a9feb3394c04ac2d5fb070d166db +MISC ChangeLog 2373 RMD160 febed377da79df723e82885c466a55bcd59bfc26 SHA1 a4069a12dd4bc7af2e8ebeeb431766615bb531ed SHA256 125269599698d4e9359a8dde40292d3b0f68a7fe265559e96679e20f574375e7 MISC metadata.xml 139 RMD160 c84b2b78f85074cc5c7d26cb757d91c8384fa16a SHA1 00e3ae2ead875413d94aeafa5279646740c2c21d SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed diff --git a/net-misc/asterisk/asterisk-1.4.18.ebuild b/net-misc/asterisk/asterisk-1.4.18.ebuild new file mode 100644 index 0000000..e9edbf9 --- /dev/null +++ b/net-misc/asterisk/asterisk-1.4.18.ebuild @@ -0,0 +1,455 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils qt3 + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="http://www.asterisk.org/" +SRC_URI="http://ftp.digium.com/pub/asterisk/old-releases/${MY_P}.tar.gz + http://downloads.digium.com/pub/asterisk/old-releases/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="alsa curl debug freetds h323 imap jabber kde keepsrc misdn mmx mysql newt nosamples odbc oss pic postgres qt3 radius snmp speex ssl sqlite static vorbis zaptel" + +RDEPEND="virtual/libc + sys-libs/ncurses + dev-libs/popt + sys-libs/zlib + qt3? ( $(qt_min_version 3.0) ) + ssl? ( dev-libs/openssl ) + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + newt? ( dev-libs/newt ) + h323? ( dev-libs/pwlib + net-libs/openh323 ) + imap? ( virtual/imap-c-client ) + odbc? ( dev-db/unixODBC ) + snmp? ( net-analyzer/net-snmp ) + misdn? ( net-dialup/misdnuser ) + mysql? ( dev-db/mysql ) + speex? ( media-libs/speex ) + jabber? ( dev-libs/iksemel ) + radius? ( net-dialup/radiusclient-ng ) + sqlite? ( dev-db/sqlite ) + vorbis? ( media-libs/libvorbis ) + zaptel? ( >=net-libs/libpri-1.4.0 + >=net-misc/zaptel-1.4.1 ) + freetds? ( dev-db/freetds ) + postgres? ( dev-db/libpq )" + +DEPEND="${RDEPEND}" +# sys-devel/flex +# sys-devel/bison" + +S="${WORKDIR}/${MY_P}" + +# +# shortcuts +# + +# update from asterisk-1.0.x +is_ast10update() { + return $(has_version "=net-misc/asterisk-1.0*") +} + +# update from asterisk-1.2.x +is_ast12update() { + return $(has_version "=net-misc/asterisk-1.2*") +} + +# update in the asterisk-1.4.x line +is_astupdate() { + if ! is_ast10update && ! is_ast12update; then + return $(has_version "<net-misc/asterisk-${PV}") + fi + return 0 +} + +get_available_modules() { + local modules mod x + + # build list of available modules... + for x in app cdr codec format func pbx res; do + + for mod in $(find "${S}" -type f -name "${x}_*.c*" -print) + do + modules="${modules} $(basename ${mod/%.c*})" + done + done + + echo "${modules}" +} + +# +# Display a nice countdown... +# +countdown() { + local n + + ebeep + + n=${1:-10} + while [[ $n -gt 0 ]]; do + echo -en " Waiting $n second(s)...\r" + sleep 1 + (( n-- )) + done +} + +pkg_setup() { + local checkfailed=0 waitaftermsg=0 + + if is_ast10update || is_ast12update; then + ewarn " Asterisk UPGRADE Warning" + ewarn "" + ewarn "- Please read ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.gz after the installation!" + ewarn "" + ewarn " Asterisk UPGRADE Warning" + echo + waitaftermsg=1 + fi + + if [[ $waitaftermsg -eq 1 ]]; then + einfo "Press Ctrl+C to abort" + echo + countdown + fi + + # + # Regular checks + # + einfo "Running some pre-flight checks..." + echo + + # imap requires ssl if imap-c-client was built with ssl, + # conversely if ssl and imap are both on then imap-c-client needs ssl + if use imap; then + if use ssl && ! built_with_use virtual/imap-c-client ssl; then + eerror + eerror "IMAP with SSL requested, but your IMAP C-Client libraries" + eerror "are built without SSL!" + eerror + die "Please recompile the IMAP C-Client libraries with SSL support enabled" + elif ! use ssl && built_with_use virtual/imap-c-client ssl; then + eerror + eerror "IMAP without SSL requested, but your IMAP C-Client" + eerror "libraries are built with SSL!" + eerror + die "Please recompile the IMAP C-Client libraries without SSL support enabled" + fi + fi + + # + # In a perfect world, $user should know what he's doing when specifying + # a custom list of modules + # + if [[ -n "${ASTERISK_MODULES}" ]] ; then + ewarn "_insert random warning message here_" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # + # comment about h323 issues + # + if use h323 ; then + ewarn "h323 useflag: It is known that the h323 module doesn't compile + the \"normal\" way: For a workaround, asterisk will be built two times + without cleaning the build dir." + fi + + # + # put pid file(s) into /var/run/asterisk + # + epatch "${FILESDIR}"/1.4/${PN}-1.4.0-var_rundir.patch + + # + # fix gsm codec cflags (e.g. i586 core epias) and disable + # assembler optimizations (on non-mmx / non-x86 or x86 PIC systems) + # + epatch "${FILESDIR}"/1.4/${PN}-1.4.18-gsm-pic.patch + + + # + # add missing LIBS for uclibc + # + epatch "${FILESDIR}"/1.4/${PN}-1.4.0-uclibc.patch + + if use x86 && use mmx ; then + if use pic ; then + ewarn "pic useflag: Not enabling mmx optimizations" + else + einfo "mmx useflag: Enabling mmx optimizations" + sed -i -e "s:^#K6OPT.*:K6OPT = -DK6OPT:" \ + codecs/gsm/Makefile || die "sed gsm makefile failed" + fi + fi + + # + # fix imap & qt include check in configure + # (TODO: patch configure.ac & run eautoreconf ?) + # + epatch "${FILESDIR}"/1.4/${PN}-1.4.18-configure-gentoo.diff + + # add custom device state function (func_devstate) + # http://asterisk.org/node/48360 + # http://svncommunity.digium.com/svn/russell/func_devstate-1.4/README.txt + cp "${FILESDIR}"/1.4/func_devstate-r6.c "${S}"/funcs/func_devstate.c + + # parse modules list + if [[ -n "${ASTERISK_MODULES}" ]]; then + local x modules="$(get_available_modules)" + + einfo "Custom list of modules specified, checking..." + + use debug && { + einfo "Available modules: ${modules}" + einfo " Selected modules: ${ASTERISK_MODULES}" + } + + for x in ${ASTERISK_MODULES}; do + if [[ "${x}" = "-*" ]]; then + MODULES_LIST="" + else + if has ${x} ${modules} + then + MODULES_LIST="${MODULES_LIST} ${x}" + else + eerror "Unknown module: ${x}" + fi + fi + done + + export MODULES_LIST + fi +} + +src_compile() { + # + # start with configure + # + econf \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + $(use_with qt3 qt "${QTDIR}") \ + $(use_with oss) \ + $(use_with ssl) \ + $(use_with alsa asound) \ + $(use_with curl) \ + $(use_with h323 h323 "/usr/share/openh323") \ + $(use_with imap) \ + $(use_with newt) \ + $(use_with odbc) \ + $(use_with snmp) \ + $(use_with misdn) \ + $(use_with misdn isdnnet) \ + $(use_with mysql) \ + $(use_with h323 pwlib "/usr/share/pwlib") \ + $(use_with speex) \ + $(use_with jabber iksemel) \ + $(use_with radius) \ + $(use_with sqlite) \ + $(use_with vorbis) \ + $(use_with vorbis ogg) \ + $(use_with zaptel) \ + $(use_with zaptel pri) \ + $(use_with zaptel tonezone) \ + $(use_with freetds tds) \ + $(use_with postgres) || die "econf failed" + + # + # custom module filter + # run menuselect to evaluate the list of modules + # and rewrite the list afterwards + # + if [[ -n "${MODULES_LIST}" ]] + then + local mod category tmp_list failed_list + + ### + # run menuselect + + emake menuselect.makeopts || die "emake menuselect.makeopts failed" + + ### + # get list of modules with failed dependencies + + failed_list="$(awk -F= '/^MENUSELECT_DEPSFAILED=/{ print $3 }' menuselect.makeopts)" + + ### + # traverse our list of modules + + for category in app cdr codec format func pbx res; do + tmp_list="" + + # search list of modules for matching ones first... + for mod in ${MODULES_LIST}; do + # module is from current category? + if [[ "${mod/%_*}" = "${category}" ]] + then + # check menuselect thinks the dependencies are met + if has ${mod} ${failed_list} + then + eerror "${mod}: dependencies required to build this module are not met, NOT BUILDING!" + else + tmp_list="${tmp_list} ${mod}" + fi + fi + done + + use debug && echo "${category} tmp: ${tmp_list}" + + # replace the module list for $category with our custom one + if [[ -n "${tmp_list}" ]] + then + category="$(echo ${category} | tr '[:lower:]' '[:upper:]')" + sed -i -e "s:^\(MENUSELECT_${category}S?\):\1=${tmp_list}:" \ + menuselect.makeopts || die "failed to set list of ${category} applications" + fi + done + fi + + # + # fasten your seatbelts (and start praying) + # + if use h323 ; then + # emake one time to get h323 to make.... yea not "clean" but works + emake + fi + + emake || die "emake failed" +} + +src_install() { + emake -j1 DESTDIR="${D}" install || die "emake install failed" + emake -j1 DESTDIR="${D}" samples || die "emake samples failed" + + # remove installed sample files if nosamples flag is set + if use nosamples; then + einfo "Skipping installation of sample files..." + rm -f "${D}"var/lib/asterisk/mohmp3/* + rm -f "${D}"var/lib/asterisk/sounds/demo-* + rm -f "${D}"var/lib/asterisk/agi-bin/* + else + einfo "Sample files have been installed" + fi + rm -rf "${D}"var/spool/asterisk/voicemail/default + + # move sample configuration files to doc directory + if is_ast10update || is_ast12update; then + einfo "Updating from old (pre-1.4) asterisk version, new configuration files have been installed" + einfo "into ${ROOT}etc/asterisk, use etc-update or dispatch-conf to update them" + fi + + einfo "Configuration samples have been moved to: $ROOT/usr/share/doc/${PF}/conf" + insinto /usr/share/doc/${PF}/conf + doins "${D}"etc/asterisk/*.conf* + + # keep directories + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail} + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/1.4/asterisk.rc6 asterisk + newconfd "${FILESDIR}"/1.4/asterisk.confd asterisk + + # some people like to keep the sources around for custom patching + # copy the whole source tree to /usr/src/asterisk-${PVF} and run make clean there + if use keepsrc + then + einfo "keepsrc useflag enabled, copying source..." + dodir /usr/src + + cp -dPR "${S}" "${D}"/usr/src/${PF} || die "copying source tree failed" + + ebegin "running make clean..." + make -C "${D}"/usr/src/${PF} clean >/dev/null || die "make clean failed" + eend $? + + einfo "Source files have been saved to ${ROOT}usr/src/${PF}" + fi +} + +pkg_preinst() { + enewgroup asterisk + enewuser asterisk -1 -1 /var/lib/asterisk asterisk +} + +pkg_postinst() { + einfo "Fixing permissions" + for x in spool run lib log; do + chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk + chmod -R u=rwX,g=rX,o= "${ROOT}"var/${x}/asterisk + done + + chown -R root:asterisk "${ROOT}"etc/asterisk + chmod -R u=rwX,g=rX,o= "${ROOT}"etc/asterisk + echo + + # + # Announcements, warnings, reminders... + # + einfo "Asterisk has been installed" + einfo "" + einfo "If you want to know more about asterisk, visit these sites:" + einfo "http://www.asteriskdocs.org/" + einfo "http://www.voip-info.org/wiki-Asterisk" + elog + einfo "http://www.automated.it/guidetoasterisk.htm" + elog + einfo "Gentoo VoIP IRC Channel:" + einfo "#gentoo-voip @ irc.freenode.net" + echo + echo + + # + # Warning about 1.x -> 1.4 changes... + # + if is_ast10update || is_ast12update; then + ewarn "" + ewarn "- Please read ${ROOT}usr/share/doc/${PF}/UPGRADE.txt.gz before continuing" + ewarn "" + fi + + ewarn "************************ Work-In-Progress ebuild **********************" + ewarn "" + ewarn "Comments, bugs, feature requests go here:" + ewarn "" + ewarn "http://bugs.gentoo.org/show_bug.cgi?id=159013" + ewarn "" +} + +pkg_config() { + einfo "Do you want to reset file permissions and ownerships (y/N)?" + + read tmp + tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')" + + if [[ "$tmp" = "y" ]] ||\ + [[ "$tmp" = "yes" ]] + then + einfo "Resetting permissions to defaults..." + + for x in spool run lib log; do + chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk + chmod -R u=rwX,g=rX,o= "${ROOT}"var/${x}/asterisk + done + + chown -R root:asterisk "${ROOT}"etc/asterisk + chmod -R u=rwX,g=rX,o= "${ROOT}"etc/asterisk + + einfo "done" + else + einfo "skipping" + fi +} diff --git a/net-misc/asterisk/files/1.4/asterisk-1.4.18-configure-gentoo.diff b/net-misc/asterisk/files/1.4/asterisk-1.4.18-configure-gentoo.diff new file mode 100644 index 0000000..6647cad --- /dev/null +++ b/net-misc/asterisk/files/1.4/asterisk-1.4.18-configure-gentoo.diff @@ -0,0 +1,18 @@ +--- asterisk-1.4.18/configure.orig 2008-01-16 02:13:27.000000000 +0100 ++++ asterisk-1.4.18/configure 2008-02-18 10:41:03.000000000 +0100 +@@ -19220,8 +19220,13 @@ + if test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then + imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` + fi +- CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client" +- LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}` ++# CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client" ++# LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}` ++ CPPFLAGS="${CPPFLAGS} -I/usr/include/imap" ++ LIBS="${LIBS} /usr/lib/c-client.a -lssl -lpam" ++ if test -f /usr/bin/krb5-config; then ++ LIBS="${LIBS} "`/usr/bin/krb5-config --libs krb5 gssapi kadm-client kadm-server` ++ fi + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/net-misc/asterisk/files/1.4/asterisk-1.4.18-gsm-pic.patch b/net-misc/asterisk/files/1.4/asterisk-1.4.18-gsm-pic.patch new file mode 100644 index 0000000..81b4a80 --- /dev/null +++ b/net-misc/asterisk/files/1.4/asterisk-1.4.18-gsm-pic.patch @@ -0,0 +1,54 @@ +--- codecs/gsm/Makefile.orig 2008-01-11 19:25:44.000000000 +0100 ++++ codecs/gsm/Makefile 2008-02-18 10:36:39.000000000 +0100 +@@ -37,23 +37,6 @@ WAV49 = -DWAV49 + ######### ppro's, etc, as well as the AMD K6 and K7. The compile will + ######### probably require gcc. + +-ifeq (, $(findstring $(OSARCH) , Darwin SunOS )) +-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel )) +-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 )) +-OPTIMIZE+=-march=$(PROC) +-endif +-endif +-endif +- +-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. +-#This works for even old (2.96) versions of gcc and provides a small boost either way. +-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. +-#So we go lowest common available by gcc and go a step down, still a step up from +-#the default as we now have a better instruction set to work with. - Belgarath +-ifeq ($(PROC),ultrasparc) +-OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 +-endif +- + PG = + #PG = -g -pg + ######### Profiling flags. If you don't know what that means, leave it blank. +@@ -208,12 +191,10 @@ GSM_SOURCES = $(SRC)/add.c \ + # XXX Keep a space after each findstring argument + # XXX should merge with GSM_OBJECTS + ifeq ($(OSARCH),linux-gnu) +-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) +-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel )) ++ifneq ($(K6OPT),) + GSM_SOURCES+= $(SRC)/k6opt.s + endif + endif +-endif + + TOAST_SOURCES = $(SRC)/toast.c \ + $(SRC)/toast_lin.c \ +@@ -260,12 +241,10 @@ GSM_OBJECTS = $(SRC)/add.o \ + $(SRC)/table.o + + ifeq ($(OSARCH),linux-gnu) +-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) +-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel )) ++ifneq ($(K6OPT),) + GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif +-endif + + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ |