summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:38 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-12 21:52:01 (GMT)
commit3ed3b69efe6e85bc599571c7af058c2d6ffffe53 (patch)
treea10896311d917434e7452328d013e0da7115a089
parentab0e905aaf440374b5059962ca8591197b2cbc54 (diff)
downloadbuildroot-3ed3b69efe6e85bc599571c7af058c2d6ffffe53.tar.gz
buildroot-3ed3b69efe6e85bc599571c7af058c2d6ffffe53.tar.bz2
xvkbd: turn into a generic-package
xvkbd was integrated has an autotools package, but it does not have a ./configure script. And to avoid executing the ./configure, the xvkbd-2.8-makefile.patch was creating a dummy .stamp_configured stamp file... Ugly. So, make xvkbd a normal generic package, with BUILD_CMDS and INSTALL_TARGET_CMDS, and get rid of the crappy part of the patch. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/xvkbd/xvkbd-2.8-makefile.patch5
-rw-r--r--package/xvkbd/xvkbd.mk14
2 files changed, 11 insertions, 8 deletions
diff --git a/package/xvkbd/xvkbd-2.8-makefile.patch b/package/xvkbd/xvkbd-2.8-makefile.patch
index e0ac21a..a8f6577 100644
--- a/package/xvkbd/xvkbd-2.8-makefile.patch
+++ b/package/xvkbd/xvkbd-2.8-makefile.patch
@@ -1,8 +1,3 @@
---- a/.stamp_configured 2008-03-04 06:14:55.425005441 -0500
-+++ b/.stamp_configured 2008-03-05 08:42:53.000000000 -0500
-@@ -0,0 +1 @@
-+dummy
-\ No newline at end of file
--- a/Makefile 2008-03-04 06:14:55.425005441 -0500
+++ b/Makefile 2008-03-05 08:40:50.000000000 -0500
@@ -0,0 +1,2397 @@
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index ae81f84..59085bf 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -7,8 +7,16 @@ XVKBD_VERSION = 3.2
XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz
XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
-XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
- CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib"
+# Passing USRLIBDIR ensures that the stupid Makefile doesn't add
+# /usr/lib to the library search path.
+define XVKBD_BUILD_CMDS
+ $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+ USRLIBDIR="$(STAGING_DIR)/usr/lib"
+endef
+
+define XVKBD_INSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
XVKBD_DEPENDENCIES = \
xlib_libICE \
@@ -21,5 +29,5 @@ XVKBD_DEPENDENCIES = \
xlib_libXt \
xlib_libXtst
-$(eval $(autotools-package))
+$(eval $(generic-package))