summaryrefslogtreecommitdiff
path: root/eudev
diff options
context:
space:
mode:
authorJuergen Daubert <jue@jue.li>2015-06-22 13:57:04 +0200
committerJuergen Daubert <jue@jue.li>2015-06-22 13:57:04 +0200
commiteca3dfe6291679059ce8ed26aac7a2b9c81cbfa4 (patch)
treef0af7ff575f2250f6b5ae58dee2609c4e4794744 /eudev
parentc6317550bb4a79e57354dbbd1660200c4905f48c (diff)
downloadcore-eca3dfe6291679059ce8ed26aac7a2b9c81cbfa4.tar.gz
core-eca3dfe6291679059ce8ed26aac7a2b9c81cbfa4.tar.xz
eudev: build with system gperf
Diffstat (limited to 'eudev')
-rw-r--r--eudev/.md5sum2
-rw-r--r--eudev/Pkgfile14
-rw-r--r--eudev/eudev-remove_gperf_dep.patch36
-rw-r--r--eudev/keyboard-keys.tar.xzbin7056 -> 0 bytes
4 files changed, 2 insertions, 50 deletions
diff --git a/eudev/.md5sum b/eudev/.md5sum
index 75e1aad0..e97ab582 100644
--- a/eudev/.md5sum
+++ b/eudev/.md5sum
@@ -1,5 +1,3 @@
ee21e150df6c804eef03a6cb2fc1cceb 81-crux.rules
07ab33fe310d250f06fc28f010e3fde2 eudev-3.1.2.tar.gz
-ea3abf3fb868f69fa34efa8772ea4e86 eudev-remove_gperf_dep.patch
-1dcada037857d727e7d1efb5d8777055 keyboard-keys.tar.xz
eb80a77a7ea60e8322116791b65ddc5d start_udev
diff --git a/eudev/Pkgfile b/eudev/Pkgfile
index 9ef38561..7de6ae0b 100644
--- a/eudev/Pkgfile
+++ b/eudev/Pkgfile
@@ -5,26 +5,16 @@
name=eudev
version=3.1.2
-release=1
+release=2
source=(http://dev.gentoo.org/~blueness/$name/$name-$version.tar.gz
- 81-crux.rules start_udev
- $name-remove_gperf_dep.patch
- keyboard-keys.tar.xz)
+ 81-crux.rules start_udev)
build() {
cd $name-$version
-
- # See https://github.com/gentoo/eudev/issues/75
- # remove build-time dependency to gperf for now
- cp $SRC/keyboard-keys-{from,to}-name.h src/udev
- patch -p1 -i $SRC/eudev-remove_gperf_dep.patch
# needed for static linking, e.g. dmsetup.static
sed -i '/^Libs:/s/-ludev/-ludev -lrt/' src/libudev/libudev.pc.in
-
- autoreconf --force --install
-
./configure --prefix=/usr \
--sbindir=/sbin --bindir=/sbin \
--sysconfdir=/etc \
diff --git a/eudev/eudev-remove_gperf_dep.patch b/eudev/eudev-remove_gperf_dep.patch
deleted file mode 100644
index 56fca0e8..00000000
--- a/eudev/eudev-remove_gperf_dep.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru eudev-3.1.1.orig/configure.ac eudev-3.1.1/configure.ac
---- eudev-3.1.1.orig/configure.ac 2015-06-08 13:46:49.535952811 +0200
-+++ eudev-3.1.1/configure.ac 2015-06-08 13:47:03.698782701 +0200
-@@ -244,10 +244,6 @@
- AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
-
- # ------------------------------------------------------------------------------
--AC_PATH_TOOL(GPERF, gperf)
--if test -z "$GPERF" ; then
-- AC_MSG_ERROR([*** gperf not found])
--fi
-
- # ------------------------------------------------------------------------------
- GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
-diff -Nru eudev-3.1.1.orig/src/udev/Makefile.am eudev-3.1.1/src/udev/Makefile.am
---- eudev-3.1.1.orig/src/udev/Makefile.am 2015-06-08 13:46:49.532619596 +0200
-+++ eudev-3.1.1/src/udev/Makefile.am 2015-06-08 13:47:03.698782701 +0200
-@@ -112,18 +112,6 @@
- keyboard-keys-from-name.h \
- keyboard-keys-to-name.h
-
--keyboard-keys.txt: Makefile
-- $(AM_V_at)$(MKDIR_P) $(dir $@)
-- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
--
--keyboard-keys-from-name.gperf: keyboard-keys.txt Makefile
-- $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
--
--keyboard-keys-from-name.h: keyboard-keys-from-name.gperf Makefile
-- $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
--
--keyboard-keys-to-name.h: keyboard-keys.txt Makefile
-- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-
- BUILT_SOURCES = \
diff --git a/eudev/keyboard-keys.tar.xz b/eudev/keyboard-keys.tar.xz
deleted file mode 100644
index 32605d2a..00000000
--- a/eudev/keyboard-keys.tar.xz
+++ /dev/null
Binary files differ

Generated by cgit