Skip to contentSkip to conversation

luacrypto: refactor with autotools

PATCH New Francois Perrad 2 participants 2 messages Sep 15, 2013 – Sep 17, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 luacrypto: refactor with autotools

some CMake stuff comes from LuaDist, but CMake is not the primary build infrastructure of LuaCrypto.

---
 package/luacrypto/Config.in                    |    1 -
 package/luacrypto/luacrypto-01-autotools.patch |   30 ++++++++++++++++++++++++
 package/luacrypto/luacrypto.mk                 |    6 ++---
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 package/luacrypto/luacrypto-01-autotools.patch
package/luacrypto/Config.in +0 -1
index f4587c3..8d13eec 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUACRYPTO
 	bool "luacrypto"
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_LUASOCKET
 	help
 	  LuaCrypto provides a Lua frontend to the OpenSSL cryptographic
 	  library.
package/luacrypto/luacrypto-01-autotools.patch new file +30 -0
new file mode 100644
index 0000000..e8befb0
@@ -0,0 +1,30 @@
+autotools: fix install directories
+
+Signed-off-by: Francois Perrad <[email protected]>
+
+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}"
package/luacrypto/luacrypto.mk +3 -3
index ca57c65..f6fcc78 100644
@@ -8,7 +8,7 @@ LUACRYPTO_VERSION = 0.3.2
 LUACRYPTO_SITE = http://github.com/mkottman/luacrypto/tarball/$(LUACRYPTO_VERSION)
 LUACRYPTO_LICENSE = MIT
 LUACRYPTO_LICENSE_FILES = COPYING
-LUACRYPTO_DEPENDENCIES = lua openssl
-LUACRYPTO_CONF_OPT = "-DLUA_LIBRARIES=\"$(STAGING_DIR)/usr/lib/liblua.so\""
+LUACRYPTO_DEPENDENCIES = lua openssl host-pkgconf
+LUACRYPTO_AUTORECONF = YES
 
-$(eval $(cmake-package))
+$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 luacrypto: refactor with autotools

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Francois" == Francois Perrad <[email protected]> writes:

Francois> some CMake stuff comes from LuaDist, but CMake is not the primary build infrastructure of LuaCrypto. Francois> Signed-off-by: Francois Perrad <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard