[Pkg-voip-commits] [pjproject] 04/05: More patch adaptation / removal for r4723

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository pjproject.

commit a33d3f9becaf679e7d8a0d739f4e3d2085beea8e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Thu Jan 30 23:56:20 2014 +0200

    More patch adaptation / removal for r4723
---
 debian/patches/no_libnsl.patch            | 65 -------------------------------
 debian/patches/reduce_pjlib_linkage.patch |  2 +-
 debian/patches/series                     |  2 -
 3 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/debian/patches/no_libnsl.patch b/debian/patches/no_libnsl.patch
deleted file mode 100644
index b732b01..0000000
--- a/debian/patches/no_libnsl.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Author: Jeremy Lainé <jeremy.laine at m4x.org>
-Description: Remove pointless linking with libnsl
-Upstream: no
-
-All libraries and applications were being linked against libnsl,
-but it was not being used anywhere.
-
-Upstream says: this cannot be merged as-is.
-
-diff --git a/aconfigure b/aconfigure
-index 57eb0bc..919ea75 100755
---- a/aconfigure
-+++ b/aconfigure
-@@ -4104,41 +4104,6 @@ LIBS="-lnsl  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char puts ();
--int
--main ()
--{
--return puts ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_nsl_puts=yes
--else
--  ac_cv_lib_nsl_puts=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_puts" >&5
--$as_echo "$ac_cv_lib_nsl_puts" >&6; }
--if test "x$ac_cv_lib_nsl_puts" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBNSL 1
--_ACEOF
--
--  LIBS="-lnsl $LIBS"
--
--fi
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
- $as_echo_n "checking for sin in -lm... " >&6; }
- if ${ac_cv_lib_m_sin+:} false; then :
---- a/aconfigure.ac
-+++ b/aconfigure.ac
-@@ -113,7 +113,6 @@ AC_CHECK_LIB(ole32,puts)
- AC_CHECK_LIB(winmm,puts)
- AC_CHECK_LIB(socket,puts)
- AC_CHECK_LIB(rt,puts)
--AC_CHECK_LIB(nsl,puts)
- AC_CHECK_LIB(m,sin)
- AC_CHECK_LIB(uuid,uuid_generate)
- AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
diff --git a/debian/patches/reduce_pjlib_linkage.patch b/debian/patches/reduce_pjlib_linkage.patch
index e2e0b47..8c96a09 100644
--- a/debian/patches/reduce_pjlib_linkage.patch
+++ b/debian/patches/reduce_pjlib_linkage.patch
@@ -73,8 +73,8 @@ libcrypto, libssl and libuuid, but only libpj needs them.
 +AC_SUBST(PJLIB_EXT)
 +AC_CHECK_LIB(uuid,uuid_generate,[PJLIB_EXT="-luuid $PJLIB_EXT"])
  AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ AC_SEARCH_LIBS(gethostbyname,nsl)
  
- AC_MSG_RESULT([Setting PJ_M_NAME to $target_cpu])
 @@ -1343,8 +1344,8 @@ AC_ARG_ENABLE(ssl,
  		AC_SUBST(libssl_present)
  		AC_SUBST(libcrypto_present)
diff --git a/debian/patches/series b/debian/patches/series
index 931cbd7..58ed87a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 no_libasound.patch
-no_libnsl.patch
-#srtp_deinit.patch
 reduce_pjlib_linkage.patch
 reduce_pjmedia_linkage.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git