From cf054011ee6422ccc964af4ceed454d5d449c899 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Sat, 10 Jan 2015 15:26:56 +0100 Subject: [PATCH] ibrdtn: Updated to 1.0.0 Signed-off-by: Johannes Morgenroth --- libs/ibrdtn/Makefile | 8 ++--- .../patches/100-add_configure_options.patch | 33 ------------------- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 libs/ibrdtn/patches/100-add_configure_options.patch diff --git a/libs/ibrdtn/Makefile b/libs/ibrdtn/Makefile index bd5448527..e69b3eeb2 100644 --- a/libs/ibrdtn/Makefile +++ b/libs/ibrdtn/Makefile @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrdtn -PKG_VERSION:=0.12.1 +PKG_VERSION:=1.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases -PKG_MD5SUM:=96428dd4af541ea0c52db80776976a65 -PKG_MAINTAINER:=Johannes Morgenroth +PKG_MD5SUM:=c30f6164b717132b2c302d965d03c968 +PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 -PKG_FIXUP:=libtool autoreconf +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk diff --git a/libs/ibrdtn/patches/100-add_configure_options.patch b/libs/ibrdtn/patches/100-add_configure_options.patch deleted file mode 100644 index 9a8df8d33..000000000 --- a/libs/ibrdtn/patches/100-add_configure_options.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -159,12 +159,21 @@ AS_IF([test "x$enable_android" = "xyes"], [ - dnl ----------------------------------------------- - dnl check for glib support - dnl ----------------------------------------------- -- PKG_CHECK_MODULES([GLIB], [glib-2.0], [ -- AC_SUBST(GLIB_CFLAGS) -- AC_SUBST(GLIB_LIBS) -- AC_DEFINE(HAVE_GLIB, [1], ["glib library is available"]) -- REQUIRES_LIBS="$REQUIRES_LIBS glib-2.0" -- ], [ -+ AC_ARG_WITH([glib], [AS_HELP_STRING([--without-glib], [Disable linking to glib-2.0 library])], [with_glib=no], [with_glib=yes]) -+ AS_IF([test "x$with_glib" != xno], -+ [ -+ PKG_CHECK_MODULES([GLIB], [glib-2.0], [ -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_DEFINE(HAVE_GLIB, [1], ["glib library is available"]) -+ REQUIRES_LIBS="$REQUIRES_LIBS glib-2.0" -+ ], [ -+ with_glib=no -+ ]) -+ ], []) -+ -+ AS_IF([test "x$with_glib" = xno], -+ [ - AS_IF([test "x$has_endian_h" = "xyes"],[ - AC_MSG_NOTICE([use endian.h for endianess conversion]) - ],[ --- -1.9.1 -