Module Name: src
Committed By: agc
Date: Mon Oct 19 01:07:08 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/bindings/lua: Makefile netpgp.lua
Log Message:
Use LD_LIBRARY_PATH to manage the library path, and don't try to second
guess from the lua driver program
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.2 src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.3
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile:1.2 Sun Oct 18 07:15:43 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/Makefile Mon Oct 19 01:07:08 2009
@@ -11,6 +11,9 @@
WARNS=4
.include <bsd.lib.mk>
+.include <bsd.own.mk>
+
+LUANETPGPOBJDIR != cd ${.CURDIR} && ${PRINTOBJDIR}
OPSYS!= uname -s
@@ -28,6 +31,6 @@
.else
t:
cp Makefile a
- ./netpgp.lua --sign --detached a
- ./netpgp.lua --verify a.sig
+ env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib ./netpgp.lua --sign --detached a
+ env LD_LIBRARY_PATH=${LUANETPGPOBJDIR}:/lib:/usr/lib:${PREFIX}/lib ./netpgp.lua --verify a.sig
.endif
Index: src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua
diff -u src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.3 src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.4
--- src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua:1.3 Sun Oct 18 07:23:37 2009
+++ src/crypto/external/bsd/netpgp/dist/bindings/lua/netpgp.lua Mon Oct 19 01:07:08 2009
@@ -50,8 +50,7 @@
extension = ".dylib"
io.close(f)
end
-glupkg = package.loadlib("./" .. "libluanetpgp" .. extension,
- "luaopen_netpgp")
+glupkg = package.loadlib("libluanetpgp" .. extension, "luaopen_netpgp")
netpgp = glupkg()
-- initialise
