diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-23 09:34:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-23 09:55:44 +0000 |
| commit | d65402e5bd42daecdcd0c666195dc9c57eb0615d (patch) | |
| tree | 20db7cb22c44f0b4b88c7e85bfba6c987e932a80 /main/highlight/lua-pkg-config.patch | |
| parent | 18639a94e1d9d1b6cb43fa11ff3df47517e0e64f (diff) | |
| download | aports-d65402e5bd42daecdcd0c666195dc9c57eb0615d.tar.bz2 aports-d65402e5bd42daecdcd0c666195dc9c57eb0615d.tar.xz | |
main/highlight: upgrade to 3.22
Diffstat (limited to 'main/highlight/lua-pkg-config.patch')
| -rw-r--r-- | main/highlight/lua-pkg-config.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/main/highlight/lua-pkg-config.patch b/main/highlight/lua-pkg-config.patch index c8cb831699..c1416a062b 100644 --- a/main/highlight/lua-pkg-config.patch +++ b/main/highlight/lua-pkg-config.patch @@ -1,25 +1,25 @@ --- ./src/makefile.orig +++ ./src/makefile @@ -12,7 +12,7 @@ - - # See src/gui-qt/highlight.pro for the Qt GUI compilation options - --CXX=c++ -+CXX?=c++ - - # Added -qt4 because of Arch Linux Qt5 migration - QMAKE=qmake-qt4 +
+ # See src/gui-qt/highlight.pro for the Qt GUI compilation options
+
+-CXX=c++
++CXX ?= c++
+
+ # Added -qt4 because of Arch Linux Qt5 migration
+ QMAKE=qmake-qt4
@@ -37,10 +37,11 @@ - # If Lua 5.2 is not default on your system yet you have to - # use lua5.1 in the pkg-config calls - --LUA_CFLAGS=$(shell pkg-config --cflags lua) -+LUAPC?=lua -+LUA_CFLAGS=$(shell pkg-config --cflags $(LUAPC)) - - # default lua lib --LUA_LIBS=$(shell pkg-config --libs lua) -+LUA_LIBS=$(shell pkg-config --libs $(LUAPC)) - - # luajit lib - # LUA_LIBS=$(shell pkg-config --libs luajit) + # If Lua 5.2 is not default on your system yet you have to
+ # use lua5.1 in the pkg-config calls
+
+-LUA_CFLAGS=$(shell pkg-config --cflags lua)
++LUAPC ?= lua
++LUA_CFLAGS=$(shell pkg-config --cflags $(LUAPC))
+
+ # default lua lib
+-LUA_LIBS=$(shell pkg-config --libs lua)
++LUA_LIBS=$(shell pkg-config --libs $(LUAPC))
+
+ # luajit lib
+ # LUA_LIBS=$(shell pkg-config --libs luajit)
|