diff options
| author |   Dex Conner <cantcuckthis@danwin1210.de> | 2022-04-16 11:51:33 +0300 |
|---|---|---|
| committer | Dex Conner <cantcuckthis@danwin1210.de> | 2022-04-16 13:06:45 +0300 |
| commit | f91cfa5b70e65e2871c2ade3c47dcbbf5888e838 (patch) | |
| tree | 1abcdcbbb8fe26e7a26c1057153b324b6db5203a /app-office | |
| parent | app-metrics/scaphandre: use tarball (diff) | |
| download | guru-f91cfa5b70e65e2871c2ade3c47dcbbf5888e838.tar.gz guru-f91cfa5b70e65e2871c2ade3c47dcbbf5888e838.tar.bz2 guru-f91cfa5b70e65e2871c2ade3c47dcbbf5888e838.zip | |
app-office/sc-im: cleaner lua handling
Removed the unnecessary luajit check in Makefile and corresponding env
var in the ebuild.
Signed-off-by: Dex Conner <cantcuckthis@danwin1210.de>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/sc-im/files/sc-im-0.8.2-automagic.patch | 16 | ||||
| -rw-r--r-- | app-office/sc-im/sc-im-0.8.2.ebuild | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app-office/sc-im/files/sc-im-0.8.2-automagic.patch b/app-office/sc-im/files/sc-im-0.8.2-automagic.patch index 102c0b2ed..dbdc73ca1 100644 --- a/app-office/sc-im/files/sc-im-0.8.2-automagic.patch +++ b/app-office/sc-im/files/sc-im-0.8.2-automagic.patch @@ -9,7 +9,7 @@ CFLAGS += -DGNUPLOT endif -@@ -116,32 +116,33 @@ +@@ -116,38 +116,31 @@ endif # NOTE: libxlsreader (libxls) is required for xls file reading support @@ -43,8 +43,12 @@ LDLIBS += $(shell pkg-config --libs lua) -rdynamic endif - else ifneq ($(shell pkg-config --exists luajit || echo 'no'),no) # If not found, check for luajit -+ endif -+ ifeq ($(LUAJIT),yes) - CFLAGS += -DXLUA $(shell pkg-config --cflags luajit) - ifneq ($(shell uname -s),Darwin) - LDLIBS += $(shell pkg-config --libs luajit) -Wl,--export-dynamic +- CFLAGS += -DXLUA $(shell pkg-config --cflags luajit) +- ifneq ($(shell uname -s),Darwin) +- LDLIBS += $(shell pkg-config --libs luajit) -Wl,--export-dynamic +- else +- LDLIBS += $(shell pkg-config --libs luajit) -rdynamic +- endif + endif + else ifeq ($(shell uname -s),Darwin) + # macOS without pkg-config diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild index 39b1fabbd..852cd456c 100644 --- a/app-office/sc-im/sc-im-0.8.2.ebuild +++ b/app-office/sc-im/sc-im-0.8.2.ebuild @@ -58,12 +58,11 @@ pkg_setup() { export XLS=$(usex xls) export XLSX=$(usex xlsx) export LUA=$(usex lua) - export JUAJIT=$(usex lua_single_target_luajit) ( use xlsx || use ods ) && export XML_ZIP="yes" # Prefer wayland support over X, and tmux support over both wayland and X. use wayland && export X="no" - use tmux && X="no" && export WAYLAND="no" + use tmux && export X="no" && export WAYLAND="no" # Notifying the user about which clipboard support is enabled if conflicting flags are set CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "") |