Fix compilation errors (libz not found and wiringpi.o misspelling)

This commit is contained in:
Philipp Schmitt 2014-01-18 14:00:04 +01:00
parent bb472177c7
commit e9f19eb07e
3 changed files with 9 additions and 8 deletions

View file

@ -1,7 +1,7 @@
pkgbase = pilight-git
pkgdesc = Modular domotica with the Raspberry Pi
pkgver = v2.0.r0.g172149f
pkgrel = 7
pkgver = v2.1.r0.g560ec6c
pkgrel = 1
url = http://pilight.org/
arch = x86_64
arch = armv6h
@ -14,7 +14,7 @@ pkgbase = pilight-git
source = https://raw.github.com/pschmitt/aur-pilight-git/master/Makefile
source = https://raw.github.com/pschmitt/aur-pilight-git/master/pilight.service
sha256sums = SKIP
sha256sums = 8669f4366b60f9ff6e17cbab219654a3c81e4e5f0a0e8e79779e3a3297fae760
sha256sums = bd92a1812a038a460ad3a5b1081b06c720335646421b38fc944dbe15c12e210c
sha256sums = a6646c4ccb653d17b6b77a3659d96e5d37becd3a0c0daedce48773094ad81e40
pkgname = pilight-git

View file

@ -18,7 +18,7 @@ ifneq (, $(findstring amd64, $(SYS)))
OSFLAGS = -O3 -fPIC -march=native -mtune=native -mfpmath=sse -Wno-conversion
endif
GIT_HASH := $(shell git describe --always)
CFLAGS = -ffast-math $(OSFLAGS) -Wfloat-equal -Wshadow -Wpointer-arith -Wcast-align -Wstrict-overflow=5 -Wwrite-strings -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wformat=2 -g -Wall -I. -isystem.. -Ilibs/pilight/ -Ilibs/protocols/ -Ilibs/hardwares/ -pthread -lm -DHASH=\"$(GIT_HASH)\"
CFLAGS = -ffast-math $(OSFLAGS) -Wfloat-equal -Wshadow -Wpointer-arith -Wcast-align -Wstrict-overflow=5 -Wwrite-strings -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wformat=2 -g -Wall -I. -isystem.. -Ilibs/pilight/ -Ilibs/protocols/ -Ilibs/hardwares/ -pthread -lm -DHASH=\"$(GIT_HASH)\" -L/usr/lib -lz
SUBDIRS = libs/pilight libs/protocols libs/hardwares libs/websockets
SRC = $(wildcard *.c)
INCLUDES = $(wildcard protocols/*.h) $(wildcard protocols/*.c) $(wildcard hardwares/*.h) $(wildcard hardwares/*.c) $(wildcard libs/pilight/*.h) $(wildcard libs/websockets/*.c) $(wildcard libs/websockets/*.h) $(wildcard libs/websockets/*.c)

View file

@ -2,8 +2,8 @@
pkgname=pilight-git
_pkgname=pilight
pkgver=v2.0.r0.g172149f
pkgrel=7
pkgver=v2.1.r0.g560ec6c
pkgrel=1
pkgdesc='Modular domotica with the Raspberry Pi'
arch=('x86_64' 'armv6h')
url="http://pilight.org/"
@ -12,8 +12,8 @@ makedepends=('git' 'gcc' 'glibc')
source=('git+https://github.com/pilight/pilight.git'
'https://raw.github.com/pschmitt/aur-pilight-git/master/Makefile'
'https://raw.github.com/pschmitt/aur-pilight-git/master/pilight.service')
sha256sums=('SKIP'
'8669f4366b60f9ff6e17cbab219654a3c81e4e5f0a0e8e79779e3a3297fae760'
sha256sums=('SKIP'
'bd92a1812a038a460ad3a5b1081b06c720335646421b38fc944dbe15c12e210c'
'a6646c4ccb653d17b6b77a3659d96e5d37becd3a0c0daedce48773094ad81e40')
conflicts=('pilight')
@ -31,6 +31,7 @@ prepare() {
sed -i 's|\(#include .*pilight.h\)"|\1.in"|g' $f
done
sed -i 's/#cmakedefine/#define/g' pilight.h.in
sed -i 's/wiringpi.o/wiringPi.o/g' libs/pilight/Makefile
}
build() {