diff options
| -rw-r--r-- | package/luacrypto/luacrypto-01-autotools.patch | 30 | ||||
| -rw-r--r-- | package/luacrypto/luacrypto.mk | 12 |
2 files changed, 6 insertions, 36 deletions
diff --git a/package/luacrypto/luacrypto-01-autotools.patch b/package/luacrypto/luacrypto-01-autotools.patch deleted file mode 100644 index e8befb05f8..0000000000 --- a/package/luacrypto/luacrypto-01-autotools.patch +++ /dev/null @@ -1,30 +0,0 @@ -autotools: fix install directories - -Signed-off-by: Francois Perrad <francois.perrad@gadz.org> - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,7 +3,7 @@ - SUBDIRS = src \ - doc - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/lib/pkgconfig - pkgconfig_DATA = luacrypto.pc - - test: all -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -31,7 +31,7 @@ - PKG_CHECK_MODULES([LUA], [lua]) - - # lua libdir --LUALIBDIR="`$PKGCONFIG --variable=libdir lua`" -+LUALIBDIR="`$PKGCONFIG --variable=INSTALL_CMOD lua`" - - # dest of headers - CRYPTOINC="${includedir}/${PACKAGE_NAME}" diff --git a/package/luacrypto/luacrypto.mk b/package/luacrypto/luacrypto.mk index 54ab388770..42e20afdf3 100644 --- a/package/luacrypto/luacrypto.mk +++ b/package/luacrypto/luacrypto.mk @@ -4,11 +4,11 @@ # ################################################################################ -LUACRYPTO_VERSION = 0.3.2 -LUACRYPTO_SITE = $(call github,mkottman,luacrypto,$(LUACRYPTO_VERSION)) +LUACRYPTO_VERSION_UPSTREAM = 0.3.2 +LUACRYPTO_VERSION = $(LUACRYPTO_VERSION_UPSTREAM)-1 +LUACRYPTO_SUBDIR = luacrypto-$(LUACRYPTO_VERSION_UPSTREAM) LUACRYPTO_LICENSE = MIT -LUACRYPTO_LICENSE_FILES = COPYING -LUACRYPTO_DEPENDENCIES = lua openssl host-pkgconf -LUACRYPTO_AUTORECONF = YES +LUACRYPTO_LICENSE_FILES = $(LUACRYPTO_SUBDIR)/COPYING +LUACRYPTO_DEPENDENCIES = luainterpreter openssl -$(eval $(autotools-package)) +$(eval $(luarocks-package)) |
