Browse Source

libidn: bump to v1.35 (2018-05-11)

Bump to v1.35
Refresh patches.
Update Makefile to use new '--disable-doc' configure flag.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
lilik-openwrt-22.03
Kevin Darbyshire-Bryant 7 years ago
parent
commit
f83ac49d06
2 changed files with 6 additions and 34 deletions
  1. +6
    -12
      libs/libidn/Makefile
  2. +0
    -22
      libs/libidn/patches/002-disable-po-docs-examples.patch

+ 6
- 12
libs/libidn/Makefile View File

@ -8,18 +8,16 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libidn PKG_NAME:=libidn
PKG_VERSION:=1.33
PKG_RELEASE:=2
PKG_VERSION:=1.35
PKG_RELEASE:=1
PKG_MAINTAINER:=Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/libidn PKG_SOURCE_URL:=@GNU/libidn
PKG_HASH:=44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19
PKG_HASH:=f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e
PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0 PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0
PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=GNUmakefile aclocal.m4
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -28,7 +26,6 @@ define Package/idn/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
URL:=http://www.gnu.org/software/libidn/ URL:=http://www.gnu.org/software/libidn/
MAINTAINER:=Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
endef endef
define Package/idn/Default/description define Package/idn/Default/description
@ -68,11 +65,8 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
MAKE_FLAGS += \
CC="$(TARGET_CC)" \
--disable-rpath \
--disable-doc
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include


+ 0
- 22
libs/libidn/patches/002-disable-po-docs-examples.patch View File

@ -1,22 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-SUBDIRS = gl lib/gl lib po src doc gltests lib/gltests tests examples \
+SUBDIRS = gl lib/gl lib src \
java csharp
EXTRA_DIST = cfg.mk maint.mk .clcopying
--- a/configure.ac
+++ b/configure.ac
@@ -47,8 +47,6 @@ LT_INIT([win32-dll])
# Checks for programs.
AM_MISSING_PROG(PERL, perl, $missing_dir)
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
-AM_GNU_GETTEXT(external)
-AM_GNU_GETTEXT_VERSION(0.19.3)
AM_ICONV
AM_PATH_LISPDIR

Loading…
Cancel
Save