View | Details | Raw Unified | Return to bug 164665
Collapse All | Expand All

(-)premake4/Makefile (-1 / +5 lines)
Lines 29-40 Link Here
29
29
30
post-patch:
30
post-patch:
31
	${REINPLACE_CMD} -e 's|-ldl||' ${BUILD_WRKSRC}/Premake4.make
31
	${REINPLACE_CMD} -e 's|-ldl||' ${BUILD_WRKSRC}/Premake4.make
32
	${REINPLACE_CMD} -e 's|debug|release|' ${WRKSRC}/tests/test
32
33
33
do-install:
34
do-install:
34
.if !defined(NOPORTDOCS)
35
.if !defined(NOPORTDOCS)
35
	@${MKDIR} ${DOCSDIR}
36
	@${MKDIR} ${DOCSDIR}
36
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
37
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
37
.endif
38
.endif
38
	@${INSTALL_PROGRAM} ${WRKSRC}/bin/release/premake4 ${PREFIX}/bin
39
	${INSTALL_PROGRAM} ${WRKSRC}/bin/release/premake4 ${PREFIX}/bin
40
41
regression-test: build
42
	cd ${WRKSRC}/tests && ./test
39
43
40
.include <bsd.port.post.mk>
44
.include <bsd.port.post.mk>
(-)premake4/files/patch-src-base-os.lua (+17 lines)
Line 0 Link Here
1
--- src/base/os.lua.orig	2012-01-31 15:40:25.000000000 +0200
2
+++ src/base/os.lua	2012-01-31 15:42:16.000000000 +0200
3
@@ -33,14 +33,6 @@
4
 			else
5
 				formats = { "lib%s.so", "%s.so" }
6
 				path = os.getenv("LD_LIBRARY_PATH") or ""
7
-	
8
-				io.input("/etc/ld.so.conf")
9
-				if io.input() then
10
-					for line in io.lines() do
11
-						path = path .. ":" .. line
12
-					end
13
-					io.input():close()
14
-				end
15
 			end
16
 			
17
 			table.insert(formats, "%s")	
(-)premake4/files/patch-src-host-scripts.c (+5 lines)
Line 0 Link Here
1
--- src/host/scripts.c.orig	2010-11-16 13:29:13.000000000 +0200
2
+++ src/host/scripts.c	2012-01-31 16:05:26.000000000 +0200
3
@@ -7 +7 @@
4
-	"function os.executef(cmd, ...)\ncmd = string.format(cmd, unpack(arg))\nreturn os.execute(cmd)\nend\nfunction os.findlib(libname)\nlocal path, formats\nif os.is(\"windows\") then\nformats = { \"%s.dll\", \"%s\" }\npath = os.getenv(\"PATH\")\nelse\nif os.is(\"macosx\") then\nformats = { \"lib%s.dylib\", \"%s.dylib\" }\npath = os.getenv(\"DYLD_LIBRARY_PATH\")\nelse\nformats = { \"lib%s.so\", \"%s.so\" }\npath = os.getenv(\"LD_LIBRARY_PATH\") or \"\"\nio.input(\"/etc/ld.so.conf\")\nif io.input() then\nfor line in io.lines() do\npath = path .. \":\" .. line\nend\nio.input():close()\nend\nend\ntable.insert(formats, \"%s\")\npath = (path or \"\") .. \":/lib:/usr/lib:/usr/local/lib\"\nend\nfor _, fmt in ipairs(formats) do\nlocal name = string.format(fmt, libname)\nlocal result = os.pathsearch(name, path)\nif result then return result end\nend\nend\nfunction os.get()\nreturn _OPTIONS.os or _OS\nend\nfunction os.is(id)\nreturn (os.get():lower() == id:lower())\nend\nlocal function d
0
omatch(result, mask, wantfiles)\nif mas"
5
omatch(result, mask, wantfiles)\nif mas"
6
+	"function os.executef(cmd, ...)\ncmd = string.format(cmd, unpack(arg))\nreturn os.execute(cmd)\nend\nfunction os.findlib(libname)\nlocal path, formats\nif os.is(\"windows\") then\nformats = { \"%s.dll\", \"%s\" }\npath = os.getenv(\"PATH\")\nelse\nif os.is(\"macosx\") then\nformats = { \"lib%s.dylib\", \"%s.dylib\" }\npath = os.getenv(\"DYLD_LIBRARY_PATH\")\nelse\nformats = { \"lib%s.so\", \"%s.so\" }\npath = os.getenv(\"LD_LIBRARY_PATH\") or \"\"\nend\ntable.insert(formats, \"%s\")\npath = (path or \"\") .. \":/lib:/usr/lib:/usr/local/lib\"\nend\nfor _, fmt in ipairs(formats) do\nlocal name = string.format(fmt, libname)\nlocal result = os.pathsearch(name, path)\nif result then return result end\nend\nend\nfunction os.get()\nreturn _OPTIONS.os or _OS\nend\nfunction os.is(id)\nreturn (os.get():lower() == id:lower())\nend\nlocal function domatch(result, mask, wantfiles)\nif mas"

Return to bug 164665