From: Steven Barth Date: Thu, 31 Jul 2014 14:08:47 +0000 (+0000) Subject: iksemel: moved to telephony feed X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=57e44c8a6a8b35016f0b016a2f1ba566c6b00e21;p=openwrt%2Fsvn-archive%2Farchive.git iksemel: moved to telephony feed SVN-Revision: 41907 --- diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile deleted file mode 100644 index a5861a6dec..0000000000 --- a/libs/iksemel/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=iksemel -PKG_VERSION:=1.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://iksemel.googlecode.com/files/ -PKG_MD5SUM:=532e77181694f87ad5eb59435d11c1ca - -PKG_FIXUP:=autoreconf - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libiksemel - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Iksemel Jabber Library - URL:=http://code.google.com/p/iksemel/ - DEPENDS:= +libgnutls +libtasn1 +libgcrypt +libgpg-error -endef - -define Package/libiksemel/description - Iksemel is an XML parser library mainly designed for Jabber applications. - It provides SAX, DOM, and special Jabber stream APIs. Library is coded - in ANSI C except the network code (which is POSIX compatible), thus - highly portable. -endef - -TARGET_CFLAGS += $(FPIC) -TARGET_LDFLAGS += \ - -Wl,-rpath-link,$(STAGING_DIR)/usr/lib \ - -lgnutls -lgcrypt -lgpg-error - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - --with-libgnutls-prefix="$(STAGING_DIR)/usr" \ - , \ - LIBS="$(TARGET_LDFLAGS)" \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/iksemel.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/iksemel.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libiksemel/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libiksemel)) diff --git a/libs/iksemel/patches/001-missing-macros.patch b/libs/iksemel/patches/001-missing-macros.patch deleted file mode 100644 index 4563ac52bc..0000000000 --- a/libs/iksemel/patches/001-missing-macros.patch +++ /dev/null @@ -1,163 +0,0 @@ ---- /dev/null -+++ b/gnutls.m4 -@@ -0,0 +1,160 @@ -+dnl Autoconf macros for libgnutls -+dnl $id$ -+ -+# Modified for LIBGNUTLS -- nmav -+# Configure paths for LIBGCRYPT -+# Shamelessly stolen from the one of XDELTA by Owen Taylor -+# Werner Koch 99-12-09 -+ -+dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS -+dnl -+AC_DEFUN([AM_PATH_LIBGNUTLS], -+[dnl -+dnl Get the cflags and libraries from the libgnutls-config script -+dnl -+AC_ARG_WITH(libgnutls-prefix, -+ [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], -+ libgnutls_config_prefix="$withval", libgnutls_config_prefix="") -+ -+ if test x$libgnutls_config_prefix != x ; then -+ if test x${LIBGNUTLS_CONFIG+set} != xset ; then -+ LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config -+ fi -+ fi -+ -+ AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) -+ min_libgnutls_version=ifelse([$1], ,0.1.0,$1) -+ AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) -+ no_libgnutls="" -+ if test "$LIBGNUTLS_CONFIG" = "no" ; then -+ no_libgnutls=yes -+ else -+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` -+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` -+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` -+ -+ -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" -+ LIBS="$LIBS $LIBGNUTLS_LIBS" -+dnl -+dnl Now check if the installed libgnutls is sufficiently new. Also sanity -+dnl checks the results of libgnutls-config to some extent -+dnl -+ rm -f conf.libgnutlstest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ system ("touch conf.libgnutlstest"); -+ -+ if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) -+ { -+ printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", -+ "$libgnutls_config_version", gnutls_check_version(NULL) ); -+ printf("*** was found! If libgnutls-config was correct, then it is best\n"); -+ printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); -+ printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+ else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) -+ { -+ printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); -+ printf("*** library (version %s)\n", gnutls_check_version(NULL) ); -+ } -+ else -+ { -+ if ( gnutls_check_version( "$min_libgnutls_version" ) ) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", -+ gnutls_check_version(NULL) ); -+ printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", -+ "$min_libgnutls_version" ); -+ printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); -+ printf("*** \n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); -+ printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ -+ if test "x$no_libgnutls" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ if test -f conf.libgnutlstest ; then -+ : -+ else -+ AC_MSG_RESULT(no) -+ fi -+ if test "$LIBGNUTLS_CONFIG" = "no" ; then -+ echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" -+ echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" -+ echo "*** full path to libgnutls-config." -+ else -+ if test -f conf.libgnutlstest ; then -+ : -+ else -+ echo "*** Could not run libgnutls test program, checking why..." -+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" -+ LIBS="$LIBS $LIBGNUTLS_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+#include -+#include -+], [ return !!gnutls_check_version(NULL); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" -+ echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" -+ echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" -+ echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ LIBGNUTLS_CFLAGS="" -+ LIBGNUTLS_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ rm -f conf.libgnutlstest -+ AC_SUBST(LIBGNUTLS_CFLAGS) -+ AC_SUBST(LIBGNUTLS_LIBS) -+]) -+ -+dnl *-*wedit:notab*-* Please keep this as the last line.