Browse Source

Merge pull request #2098 from gibsson/triggerhappy_v1

triggerhappy: bump PKG_REV to fix input header creation
lilik-openwrt-22.03
Ted Hess 9 years ago
parent
commit
f5eb8b4257
2 changed files with 2 additions and 13 deletions
  1. +2
    -2
      utils/triggerhappy/Makefile
  2. +0
    -11
      utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch

+ 2
- 2
utils/triggerhappy/Makefile View File

@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=triggerhappy PKG_NAME:=triggerhappy
PKG_VERSION:=0.3.4 PKG_VERSION:=0.3.4
PKG_REV:=649bf670a012558393d7c41f3660d0a017edd982
PKG_RELEASE:=2
PKG_REV:=7e5abc69f215678e93a6b999524981c8b40bdcd9
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=git://github.com/wertarbyte/triggerhappy PKG_SOURCE_URL:=git://github.com/wertarbyte/triggerhappy


+ 0
- 11
utils/triggerhappy/patches/100-fix-LINUX_INPUT_H.patch View File

@ -1,11 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ THCMD_COMPS := th-cmd cmdsocket
MAKEDEPEND = $(CC) -M -MG $(CPPFLAGS) -o $*.d $<
-LINUX_INPUT_H := $(shell echo '\#include <linux/input.h>' | $(CC) $(CPPFLAGS) -M -E - | awk 'NR==1 {print $$2}')
+LINUX_INPUT_H := $(shell for i in `echo | $(CC) $(CPPFLAGS) -M -E -include 'linux/input.h' -`; do test -f "$$i" && echo "$$i" && break; done)
all: thd th-cmd man

Loading…
Cancel
Save