bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lcd4linux fixes:

Browse Source 
- lcd4linux needs at least 1 driver & 1 plugin enabled, assume all drivers & plugins are wanted when none are selected
 - since enabling all plugins prevents lcd4linux from building, enable only the NULL driver until we can figure something better
 - bump release number


git-svn-id: svn://svn.openwrt.org/openwrt/packages@12094 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2008-08-04 14:56:45 +00:00
parent af29ddfb14
commit 747b8a6b99
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
utils/lcd4linux/Config.in
View File

@ -67,6 +67,7 @@ config LCD4LINUX_DRV_Noritake
config LCD4LINUX_DRV_NULL config LCD4LINUX_DRV_NULL
bool bool
prompt "NULL" prompt "NULL"
default y
config LCD4LINUX_DRV_PNG config LCD4LINUX_DRV_PNG
bool bool

18
utils/lcd4linux/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007 OpenWrt.org # Copyright (C) 2007-2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lcd4linux PKG_NAME:=lcd4linux
PKG_REV:=877 PKG_REV:=877
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/ PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
@ -29,6 +29,7 @@ define Package/lcd4linux
DEPENDS:=+libusb DEPENDS:=+libusb
TITLE:=LCD display utility TITLE:=LCD display utility
URL:=http://lcd4linux.bulix.org/ URL:=http://lcd4linux.bulix.org/
MENU:=1
endef endef
define Package/lcd4linux/config define Package/lcd4linux/config
@ -178,6 +179,13 @@ ifneq ($(CONFIG_LCD4LINUX_PLUGIN_mysql),)
PKG_BUILD_DEPENDS += libmysqlclient PKG_BUILD_DEPENDS += libmysqlclient
endif endif
# XXX: lcd4linux needs at least one driver and one plugin, if none are selected, build'em all
ifeq ($(strip $(LCD4LINUX_CONFIGURE_DRIVERS)),)
LCD4LINUX_CONFIGURE_DRIVERS:=all
endif
ifeq ($(strip $(LCD4LINUX_CONFIGURE_PLUGINS)),)
LCD4LINUX_CONFIGURE_PLUGINS:=all
endif
## TODO PYTHON PLUGIN, DEPENDS on ver >= '2.1.0' ## TODO PYTHON PLUGIN, DEPENDS on ver >= '2.1.0'
@ -188,13 +196,13 @@ EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -
TARGET_CONFIGURE_OPTS+=\ TARGET_CONFIGURE_OPTS+=\
CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)" CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)"
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--without-x \ --without-x \
--without-python \ --without-python \
--with-drivers="$(LCD4LINUX_CONFIGURE_DRIVERS)" \
--with-plugins="$(LCD4LINUX_CONFIGURE_PLUGINS)" \
--disable-rpath \ --disable-rpath \
--with-drivers="$(strip $(LCD4LINUX_CONFIGURE_DRIVERS))" \
--with-plugins="$(strip $(LCD4LINUX_CONFIGURE_PLUGINS))" \
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install