wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fbreader: fix cross

Browse source
This commit is contained in:
Michael Gehring 2018-03-17 07:18:06 +00:00
parent f5ed2b6de6
commit 0a90b8f3dc
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
srcpkgs/fbreader/patches/cross.patch Normal file
View file

@ -0,0 +1,19 @@
--- makefiles/arch/desktop.mk.orig 2012-11-30 12:41:25.000000000 +0000
+++ makefiles/arch/desktop.mk 2018-03-17 06:44:28.961588128 +0000
@@ -7,13 +7,10 @@
APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME%
-CCACHE = $(shell if which ccache > /dev/null; then echo "ccache"; fi) #if ccache is not installed, do not use it
-CC = $(CCACHE) gcc
-AR = ar rsu
-LD = g++
+AR := ${AR} rsu
+LD := ${CXX}
-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
-LDFLAGS =
+CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
ifeq "$(UI_TYPE)" "qt"

8
srcpkgs/fbreader/template
View file

@ -3,7 +3,7 @@ pkgname=fbreader
version=0.99.4 version=0.99.4
revision=3 revision=3
build_style=gnu-makefile build_style=gnu-makefile
hostmakedepends="pkg-config" hostmakedepends="pkg-config qt-host-tools"
makedepends="fribidi-devel bzip2-devel expat-devel libcurl-devel libunibreak-devel sqlite-devel qt-devel zlib-devel" makedepends="fribidi-devel bzip2-devel expat-devel libcurl-devel libunibreak-devel sqlite-devel qt-devel zlib-devel"
short_desc="An e-book reader" short_desc="An e-book reader"
maintainer="Diogo Leal <diogo@diogoleal.com>" maintainer="Diogo Leal <diogo@diogoleal.com>"
@ -17,12 +17,6 @@ if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
CXXFLAGS="-Wno-error=narrowing" CXXFLAGS="-Wno-error=narrowing"
fi fi
post_configure() {
sed -i makefiles/arch/desktop.mk \
-e"s;^\(CFLAGS.*=.*\);& $CFLAGS;" \
-e"s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;" \
-e"s;^\(LDFLAGS.*=.*\);& $LDFLAGS;"
}
do_build() { do_build() {
sed -e "s:-llinebreak:-lunibreak:" -i makefiles/config.mk zlibrary/text/Makefile sed -e "s:-llinebreak:-lunibreak:" -i makefiles/config.mk zlibrary/text/Makefile
make -j1 -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy make -j1 -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy