From 815ec8e08b6ed5a20f67b7a3b1ac31a095669e01 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Mon, 14 Mar 2016 11:52:07 -0400 Subject: [PATCH] giflib: Update to 5.1.2, remove doc build docbook breaks build on some hosts, skip it (in a not very elegant way) Signed-off-by: Daniel Golle daniel@makrotopia.org Signed-off-by: Ted Hess --- libs/giflib/Makefile | 7 +++---- libs/giflib/patches/100-no-docs.patch | 10 ++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 libs/giflib/patches/100-no-docs.patch diff --git a/libs/giflib/Makefile b/libs/giflib/Makefile index efeabee68d..28fcd69eeb 100644 --- a/libs/giflib/Makefile +++ b/libs/giflib/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=giflib -PKG_VERSION:=5.1.1 +PKG_VERSION:=5.1.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/giflib -PKG_MD5SUM:=1c39333192712788c6568c78a949f13e +PKG_MD5SUM:=323a9f11ab56c8a2d1715376410ce376 PKG_MAINTAINER:=Ted Hess @@ -39,7 +39,6 @@ define Package/giflib/description endef TARGET_CFLAGS += $(FPIC) -CONFIGURE_ARGS += --enable-x11=no define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) diff --git a/libs/giflib/patches/100-no-docs.patch b/libs/giflib/patches/100-no-docs.patch new file mode 100644 index 0000000000..f006d6caeb --- /dev/null +++ b/libs/giflib/patches/100-no-docs.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -21,7 +21,6 @@ AC_PROG_MAKE_SET + AM_PROG_CC_C_O + + dnl Allow partial building on systems without xmlto +-AC_CHECK_PROG([have_xmlto], [xmlto], ["yes"],["no"]) + AM_CONDITIONAL([BUILD_DOC], [test "x${have_xmlto}" = "xyes"]) + + dnl Shared-library version