Permalink
Browse files

mcabber:

 * fix patches (in particular snprintf related ones)
 * remove unnecessary override of CFLAGS


git-svn-id: file:///var/svn/freetz/trunk@11492 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent 35ea0b0 commit 3c859951a6625b4ad58c1732624c0c2e8bf6cee9 er13 committed Dec 29, 2013
View
1 make/mcabber/mcabber.mk
@@ -29,7 +29,6 @@ $(PKG_CONFIGURED_CONFIGURE)
$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
$(SUBMAKE) -C $(MCABBER_DIR) \
- CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(MCABBER_LDFLAGS)"
$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY)
View
11 make/mcabber/patches/010-no_opt_CFLAGS.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -7945,7 +7945,7 @@
+ fi # gcc
+ CFLAGS="$CFLAGS -g"
+ else
+- CFLAGS="-O2 $CFLAGS"
++ CFLAGS="$CFLAGS"
+ fi
+
+ # Check whether --enable-hgcset was given.
View
24 make/mcabber/patches/020-add_missing_check_for_snprintf.patch
@@ -0,0 +1,24 @@
+mcabber uses HAVE_SNPRINTF throughout the code but its configure script actually never checks for it
+
+--- configure
++++ configure
+@@ -5462,6 +5462,7 @@
+ for ac_func in alarm arc4random bzero gethostbyname gethostname inet_ntoa \
+ isascii memmove memset modf select setlocale socket strcasecmp \
+ strchr strdup strncasecmp strrchr strstr strcasestr vsnprintf \
++ snprintf \
+ iswblank
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+--- config.h.in
++++ config.h.in
+@@ -246,6 +246,9 @@
+ /* Define to 1 if you have the `vprintf' function. */
+ #undef HAVE_VPRINTF
+
++/* Define to 1 if you have the `snprintf' function. */
++#undef HAVE_SNPRINTF
++
+ /* Define to 1 if you have the `vsnprintf' function. */
+ #undef HAVE_VSNPRINTF
+
View
11 make/mcabber/patches/030-ldl.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -7474,7 +7474,7 @@
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+
+- LIBS="-lcrypto $LIBS"
++ LIBS="-lcrypto -ldl $LIBS"
+
+ fi
+
View
11 make/mcabber/patches/100-libm.patch
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig 2009-10-06 21:34:25.000000000 +0200
-+++ src/Makefile.in 2009-12-01 22:23:11.000000000 +0100
-@@ -126,7 +126,7 @@
- LIBOBJS = @LIBOBJS@
- LIBOTR_CFLAGS = @LIBOTR_CFLAGS@
- LIBOTR_LIBS = @LIBOTR_LIBS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lm
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
View
11 make/mcabber/patches/200-ldl.patch
@@ -1,11 +0,0 @@
---- configure.orig 2009-10-06 21:34:24.000000000 +0200
-+++ configure 2009-12-01 23:11:37.000000000 +0100
-@@ -7473,7 +7473,7 @@
- #define HAVE_LIBCRYPTO 1
- _ACEOF
-
-- LIBS="-lcrypto $LIBS"
-+ LIBS="-lcrypto -ldl $LIBS"
-
- fi
-

0 comments on commit 3c85995

Please sign in to comment.