diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
| commit | 908d987dd1dcd4899f8f7f0878514c22ca8048b7 (patch) | |
| tree | 29bf5986774207c3453044e1f370fb98d2431265 /pcr/uci/uci-0.8.0-lua5.1.patch | |
| parent | 308bfb446305a96dffce945b6c4fb82b10d1b91b (diff) | |
| parent | 8351d69e64a40d68fa32cfeea227b6fcf7afe974 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'pcr/uci/uci-0.8.0-lua5.1.patch')
| -rw-r--r-- | pcr/uci/uci-0.8.0-lua5.1.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/pcr/uci/uci-0.8.0-lua5.1.patch b/pcr/uci/uci-0.8.0-lua5.1.patch new file mode 100644 index 000000000..d3e486f87 --- /dev/null +++ b/pcr/uci/uci-0.8.0-lua5.1.patch @@ -0,0 +1,31 @@ +--- uci-0.8.0.orig/lua/CMakeLists.txt 2011-07-19 15:39:56.000000000 -0500 ++++ uci-0.8.0/lua/CMakeLists.txt 2013-02-12 21:16:02.583984374 -0500 +@@ -4,7 +4,18 @@ + + SET(CMAKE_INSTALL_PREFIX /) + +-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I..) ++IF(NOT LUA_CFLAGS) ++ FIND_PROGRAM(PKG_CONFIG pkg-config) ++ IF(PKG_CONFIG) ++ EXECUTE_PROCESS( ++ COMMAND pkg-config --silence-errors --cflags lua5.1 ++ OUTPUT_VARIABLE LUA_CFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ) ++ ENDIF() ++ENDIF() ++ ++ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS}) + LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) + + IF(APPLE) +@@ -13,7 +24,7 @@ + + IF(NOT LUAPATH) + EXECUTE_PROCESS( +- COMMAND lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" ++ COMMAND lua5.1 -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" + OUTPUT_VARIABLE LUAPATH + RESULT_VARIABLE LUA_CHECK_RES + OUTPUT_STRIP_TRAILING_WHITESPACE |