mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-22 13:33:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

app-office/sc-im: cleaner lua handling

Browse Source 
Removed the unnecessary luajit check in Makefile and corresponding env
var in the ebuild.

Signed-off-by: Dex Conner <cantcuckthis@danwin1210.de>
This commit is contained in:
Dex Conner
2022-04-16 11:51:33 +03:00
parent e83417ea3d
commit f91cfa5b70
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app-office/sc-im/files/sc-im-0.8.2-automagic.patch
View File

@@ -9,7 +9,7 @@
CFLAGS += -DGNUPLOT CFLAGS += -DGNUPLOT
endif endif
@@ -116,32 +116,33 @@ @@ -116,38 +116,31 @@
endif endif
# NOTE: libxlsreader (libxls) is required for xls file reading support # NOTE: libxlsreader (libxls) is required for xls file reading support
@@ -43,8 +43,12 @@
LDLIBS += $(shell pkg-config --libs lua) -rdynamic LDLIBS += $(shell pkg-config --libs lua) -rdynamic
endif endif
- else ifneq ($(shell pkg-config --exists luajit || echo 'no'),no) # If not found, check for luajit - else ifneq ($(shell pkg-config --exists luajit || echo 'no'),no) # If not found, check for luajit
+ endif - CFLAGS += -DXLUA $(shell pkg-config --cflags luajit)
+ ifeq ($(LUAJIT),yes) - ifneq ($(shell uname -s),Darwin)
CFLAGS += -DXLUA $(shell pkg-config --cflags luajit) - LDLIBS += $(shell pkg-config --libs luajit) -Wl,--export-dynamic
ifneq ($(shell uname -s),Darwin) - else
LDLIBS += $(shell pkg-config --libs luajit) -Wl,--export-dynamic - LDLIBS += $(shell pkg-config --libs luajit) -rdynamic
- endif
endif
else ifeq ($(shell uname -s),Darwin)
# macOS without pkg-config

3
app-office/sc-im/sc-im-0.8.2.ebuild
View File

@@ -58,12 +58,11 @@ pkg_setup() {
export XLS=$(usex xls) export XLS=$(usex xls)
export XLSX=$(usex xlsx) export XLSX=$(usex xlsx)
export LUA=$(usex lua) export LUA=$(usex lua)
export JUAJIT=$(usex lua_single_target_luajit)
( use xlsx || use ods ) && export XML_ZIP="yes" ( use xlsx || use ods ) && export XML_ZIP="yes"
# Prefer wayland support over X, and tmux support over both wayland and X. # Prefer wayland support over X, and tmux support over both wayland and X.
use wayland && export X="no" 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 # Notifying the user about which clipboard support is enabled if conflicting flags are set
CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "") CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "")