freeswitch-core: Makefile improvements. - Added GCC vs Clang conditionals, this should make the package build on NetBSD 7 (testing pending). - Removed CONFIGURE_ARGS for xmlrpc-c.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: freeswitch-core: Makefile improvements. - Added GCC vs Clang conditionals, this should make the package build on NetBSD 7 (testing pending). - Removed CONFIGURE_ARGS for xmlrpc-c.
From: Angel M. Adames <angelmadames%gmail.com@localhost>
Date: Thu, 04 Jan 2018 20:29:43 +0000
Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Thu Jan 4 20:29:43 2018 +0000
Changeset:	709c08182d4c0df6d324a41395f7506909c27575

Modified Files:
	freeswitch-core/Makefile
Removed Files:
	freeswitch-core/patches/patch-configure
	freeswitch-core/patches/patch-libs_libzrtp_third__party_bnlib_configure.ac
	freeswitch-core/patches/patch-libs_spandsp_configure
	freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
	freeswitch-core/patches/patch-libs_unimrcp_configure
	freeswitch-core/patches/patch-modules.conf

Log Message:
freeswitch-core: Makefile improvements.
	- Added GCC vs Clang conditionals, this should make the package build on NetBSD 7 (testing pending).
	- Removed CONFIGURE_ARGS for xmlrpc-c.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=709c08182d4c0df6d324a41395f7506909c27575

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freeswitch-core/Makefile                           | 34 +++++++++++++---------
 freeswitch-core/patches/patch-configure            | 15 ----------
 ...ch-libs_libzrtp_third__party_bnlib_configure.ac | 29 ------------------
 .../patches/patch-libs_spandsp_configure           | 24 ---------------
 .../patch-libs_spandsp_unpack__gsm0610__data.sh    | 24 ---------------
 .../patches/patch-libs_unimrcp_configure           | 15 ----------
 freeswitch-core/patches/patch-modules.conf         | 34 ----------------------
 7 files changed, 21 insertions(+), 154 deletions(-)

diffs:
diff --git a/freeswitch-core/Makefile b/freeswitch-core/Makefile
index 6f635c15d7..a6c1a00ddf 100644
--- a/freeswitch-core/Makefile
+++ b/freeswitch-core/Makefile
@@ -41,9 +41,8 @@ CONFIGURE_ARGS+=	--with-dbdir=${VARBASE}/db/freeswitch
 CONFIGURE_ARGS+=	--with-imagesdir=${PREFIX}/share/freeswitch/images
 CONFIGURE_ARGS+=	--with-recordingsdir=${PREFIX}/freeswitch/recordings
 CONFIGURE_ARGS+=	--with-modinstdir=${PREFIX}/freeswitch/modules
-CONFIGURE_ARGS+=	--enable-zrtp
 CONFIGURE_ARGS+=	--enable-core-pgsql-support
-CONFIGURE_ARGS+=	--enable-xmlrpc-c
+CONFIGURE_ARGS+=	--disable-libvpx
 CONFIGURE_ARGS+=	--enable-64
 
 REPLACE_PERL+=		scripts/rss/*.pl
@@ -144,6 +143,13 @@ DEPENDS+=        	libyaml-[0-9]*:../../textproc/libyaml
 
 .include "../../mk/bsd.prefs.mk"
 
+.if (${PKGSRC_COMPILER} && ${CC} == "clang" && ${CXX} == "clang++")
+CONFIGURE_ARGS+=	--enable-zrtp
+BUILDLINK_TRANSFORM+=	rm:-Werror
+CFLAGS+=        	-Wno-c11-extensions -Wno-deprecated-declarations \
+			-Wno-zero-length-array -Wno-incompatible-pointer-types
+.endif
+
 FS_USER?=		freeswitch
 FS_GROUP?=		freeswitch
 PKG_USERS_VARS=		FS_USER
@@ -154,14 +160,15 @@ PKG_USERS=		${FS_USER}:${FS_GROUP}
 PKG_GECOS.${FS_USER}=	FreeSWITCH
 PKG_SHELL.${FS_USER}=	${NOLOGIN}
 
-MAKE_DIRS+=		${VARBASE}/log/freeswitch
-MAKE_DIRS+=		${VARBASE}/db/freeswitch
-MAKE_DIRS_PERMS+=	${VARBASE}/log/freeswitch ${FS_USER} ${FS_GROUP} 0644
-MAKE_DIRS_PERMS+=	${VARBASE}/db/freeswitch ${FS_USER} ${FS_GROUP} 0755
-OWN_DIRS=		${PREFIX}/freeswitch
-OWN_DIRS+=		${PREFIX}/share/freeswitch
-OWN_DIRS_PERMS+=	${PREFIX}/freeswitch ${FS_USER} ${FS_GROUP} 0755
-OWN_DIRS_PERMS+=	${PREFIX}/share/freeswitch ${FS_USER} ${FS_GROUP} 0755
+MAKE_DIRS+=		${VARBASE}/freeswitch
+MAKE_DIRS+=		${VARBASE}/share/freeswitch
+MAKE_DIRS_PERMS+=	${VARBASE}/freeswitch ${FS_USER} ${FS_GROUP} 0755
+MAKE_DIRS_PERMS+=	${VARBASE}/share/freeswitch ${FS_USER} ${FS_GROUP} 0755
+
+OWN_DIRS=		${PREFIX}/log/freeswitch
+OWN_DIRS+=		${PREFIX}/db/freeswitch
+OWN_DIRS_PERMS+=	${PREFIX}/log/freeswitch ${FS_USER} ${FS_GROUP} 0644
+OWN_DIRS_PERMS+=	${PREFIX}/db/freeswitch ${FS_USER} ${FS_GROUP} 0755
 
 PKG_SYSCONFSUBDIR=	freeswitch
 PKG_SYSCONFDIR_PERMS=	${FS_USER} ${FS_GROUP} 0755
@@ -191,9 +198,10 @@ PKG_SYSCONFDIR_PERMS=	${FS_USER} ${FS_GROUP} 0755
 
 #############################################################
 
-BUILDLINK_TRANSFORM+=	rm:-Werror
-CFLAGS+=        	-Wno-c11-extensions -Wno-deprecated-declarations \
-			-Wno-zero-length-array -Wno-incompatible-pointer-types
+.if (${PKGSRC_COMPILER} == "gcc")
+pre-configure:
+	cd ${WRKSRC} && ${SH} rebootstrap.sh -j
+.endif
 
 post-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/srtp/libsrtp.la ${DESTDIR}${PREFIX}/lib
diff --git a/freeswitch-core/patches/patch-configure b/freeswitch-core/patches/patch-configure
deleted file mode 100644
index 28d82df856..0000000000
--- a/freeswitch-core/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- configure.orig	2017-04-30 00:54:20.670300000 +0000
-+++ configure
-@@ -36856,7 +36856,7 @@ if test "$with_ldap" = "yes"; then
-    OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
- fi
- 
-- if test "x$with_ldap" == "xyes"; then
-+ if test "x$with_ldap" = "xyes"; then
-   HAVE_LDAP_TRUE=
-   HAVE_LDAP_FALSE='#'
- else
diff --git a/freeswitch-core/patches/patch-libs_libzrtp_third__party_bnlib_configure.ac b/freeswitch-core/patches/patch-libs_libzrtp_third__party_bnlib_configure.ac
deleted file mode 100644
index 268564ad9c..0000000000
--- a/freeswitch-core/patches/patch-libs_libzrtp_third__party_bnlib_configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Remove old hack to deal with -lgcc.  This seems unnnecessary in the
-modern era, and breaks the build on NetBSD.  To be re-evaulated before
-promotion to pkgsrc proper.
-
---- libs/libzrtp/third_party/bnlib/configure.ac.orig	2017-07-13 12:07:30.000000000 +0000
-+++ libs/libzrtp/third_party/bnlib/configure.ac
-@@ -87,18 +87,9 @@ fi
- rm -f conftest*
- ])
-   fi
--
--  # If we're using GCC, perform some Deep Magic to enable the result to
--  # link cleanly with code compiled with a compiler that doesn't understand
--  # GCC's support library (-lgcc).  Do a link, to relocatable object form,
--  # with just -lgcc.  If it's not GCC, do the normal -c thing.
--  # These substitutions are used in the Makefile to force that behaviour.
--  GCCMAGIC1='-Wl,-r -nostdlib'
--  GCCMAGIC2=-lgcc
--else
--  GCCMAGIC1=-c
--  GCCMAGIC2=
- fi
-+GCCMAGIC1=-c
-+GCCMAGIC2=
- AC_SUBST(GCCMAGIC1)
- AC_SUBST(GCCMAGIC2)
- 
diff --git a/freeswitch-core/patches/patch-libs_spandsp_configure b/freeswitch-core/patches/patch-libs_spandsp_configure
deleted file mode 100644
index bd29e883e9..0000000000
--- a/freeswitch-core/patches/patch-libs_spandsp_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- libs/spandsp/configure.orig	2017-04-19 13:12:06.824318000 +0000
-+++ libs/spandsp/configure
-@@ -24108,7 +24108,7 @@ done
-     ;;
- esac
- 
--if test "${build}" == "${host}"
-+if test "${build}" = "${host}"
- then
- 
- for ac_header in X11/X.h
-@@ -25692,7 +25692,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--if test "${build}" == "${host}"
-+if test "${build}" = "${host}"
- then
-     case "${host}" in
-     x86_64-*)
diff --git a/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh b/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
deleted file mode 100644
index 4d9527dc95..0000000000
--- a/freeswitch-core/patches/patch-libs_spandsp_unpack__gsm0610__data.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- libs/spandsp/unpack_gsm0610_data.sh.orig	2017-04-19 13:14:01.304432000 +0000
-+++ libs/spandsp/unpack_gsm0610_data.sh
-@@ -53,7 +53,7 @@ else
-     cd gsm0610
- fi
- 
--if [ $1x == --no-exe-runx ]
-+if [ $1x = --no-exe-runx ]
- then
-     # Run the .exe files, which should be here
-     ./FR_A.EXE
-@@ -77,7 +77,7 @@ rm -rf READ_FRA.TXT
- rm -rf ACTION
- rm -rf unpacked
- 
--if [ $1x == --no-exex ]
-+if [ $1x = --no-exex ]
- then
-     # We need to prepare the .exe files to be run separately
-     rm -rf *.INP
diff --git a/freeswitch-core/patches/patch-libs_unimrcp_configure b/freeswitch-core/patches/patch-libs_unimrcp_configure
deleted file mode 100644
index 03efc0d169..0000000000
--- a/freeswitch-core/patches/patch-libs_unimrcp_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- libs/unimrcp/configure.orig	2017-04-19 13:12:50.546788000 +0000
-+++ libs/unimrcp/configure
-@@ -18033,7 +18033,7 @@ fi
- 
- { $as_echo "$as_me:$LINENO: enable inter-library dependencies: $enable_interlib_deps" >&5
- $as_echo "$as_me: enable inter-library dependencies: $enable_interlib_deps" >&6;}
--if test "${enable_interlib_deps}" == "yes"; then
-+if test "${enable_interlib_deps}" = "yes"; then
-     link_all_deplibs=yes
-     link_all_deplibs_CXX=yes
- else
diff --git a/freeswitch-core/patches/patch-modules.conf b/freeswitch-core/patches/patch-modules.conf
deleted file mode 100644
index 3a17a0f041..0000000000
--- a/freeswitch-core/patches/patch-modules.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Fix portability issues.
-
---- modules.conf.orig	2017-05-05 17:08:45.600465000 +0000
-+++ modules.conf
-@@ -1,14 +1,14 @@
- #applications/mod_abstraction
- #applications/mod_av
--#applications/mod_avmd
-+applications/mod_avmd
- #applications/mod_bert
- #applications/mod_blacklist
--#applications/mod_callcenter
--#applications/mod_cidlookup
-+applications/mod_callcenter
-+applications/mod_cidlookup
- #applications/mod_cluechoo
- applications/mod_commands
- applications/mod_conference
--#applications/mod_curl
-+applications/mod_curl
- #applications/mod_cv
- applications/mod_db
- #applications/mod_directory
-@@ -28,7 +28,7 @@ applications/mod_httapi
- #applications/mod_http_cache
- #applications/mod_ladspa
- #applications/mod_lcr
--#applications/mod_memcache
-+applications/mod_memcache
- #applications/mod_mongo
- #applications/mod_mp4
- #applications/mod_mp4v2
Prev by Date: chezscheme: Update wip/chezscheme to 9.5
Next by Date: neatvi: Import neatvi-06 as wip/neatvi
Previous by Thread: chezscheme: Update wip/chezscheme to 9.5
Next by Thread: neatvi: Import neatvi-06 as wip/neatvi
Indexes:
Home | Main Index | Thread Index | Old Index