From 3b7e950a2a226d1344e78da8fb10e3cdb92f37a0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 28 Feb 2015 10:11:11 +0100 Subject: cleanup phil's submissions - use () instead of {} in make variables for now - use PKG_HASH instead of PKG_MD5SUM - update to latest upstream versions - use a newline between PKG_* variables and DISTFILES - use -install instead of post-install - use lowercase description texts only - fix some missing PKG_BUILDDEP - elfutils needs argp, which is not available in uClibc-ng, yet - PKG_HASH is not required for git sources --- package/supl/Makefile | 21 +++++++++++---------- package/supl/patches/patch-configure | 11 +++++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 package/supl/patches/patch-configure (limited to 'package/supl') diff --git a/package/supl/Makefile b/package/supl/Makefile index 948ebb339..13e58560f 100644 --- a/package/supl/Makefile +++ b/package/supl/Makefile @@ -7,27 +7,28 @@ PKG_NAME:= supl PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 PKG_HASH:= 068dc47ce818ce5634f09a88159df85a6ce3456e2467b11b8c5f8543a99bb347 -PKG_DESCR:= tools for accessing SUP/RRLP server +PKG_DESCR:= tools for accessing sup/rrlp server PKG_SECTION:= net/misc PKG_BUILDDEP:= openssl PKG_DEPENDS:= libopenssl PKG_URL:= http://www.tajuma.com/supl/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=supl/} -DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/trunk +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=supl/) + +DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/trunk include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,SUPL,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SUPL,supl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIG_STYLE:= minimal -CONFIGURE_ARGS+= --precompiled-asn1=yes --prefix="${WRKINST}/usr" +CONFIGURE_ARGS+= --precompiled-asn1=yes --prefix="$(WRKINST)/usr" -post-install: +supl-install: $(INSTALL_DIR) $(IDIR_SUPL)/usr/{bin,lib} $(INSTALL_BIN) $(WRKINST)/usr/bin/supl-{cert,client,proxy} \ $(IDIR_SUPL)/usr/bin - ${CP} ${WRKINST}/usr/lib/lib{asnrrlp,asnsupl,supl}.so* \ - ${IDIR_SUPL}/usr/lib + $(CP) $(WRKINST)/usr/lib/lib{asnrrlp,asnsupl,supl}.so* \ + $(IDIR_SUPL)/usr/lib -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/supl/patches/patch-configure b/package/supl/patches/patch-configure new file mode 100644 index 000000000..1c8f24d49 --- /dev/null +++ b/package/supl/patches/patch-configure @@ -0,0 +1,11 @@ +--- trunk.orig/configure 2011-10-25 21:41:03.000000000 +0200 ++++ trunk/configure 2015-02-27 19:33:11.000000000 +0100 +@@ -91,7 +91,7 @@ cat < config.mk + # Modifications to this file are lost if ./configure is ran again. + + CONF_VERSION = 1.0.5 +-CONF_CFLAGS = -Wall -O2 $var_debug ++CONF_CFLAGS = -Wall $var_debug + CONF_ASN_CFLAGS = $var_asn1_debug + CONF_PREFIX = $var_prefix + CONF_PRECOMPILED_ASN = $var_precompiled_asn -- cgit v1.2.3