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

[cosmetic] sqlite3 fixes:

Browse Source 
- add a common default description for subpackages
 - use CONFIGURE_ARGS & CONFIGURE_VARS instead of a call to Build/Configure/Default
 - use INSTALL_DIR instead of 'mkdir -p' for dev stuff


git-svn-id: svn://svn.openwrt.org/openwrt/packages@13973 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-01-11 03:09:05 +00:00
parent e88c8f2faa
commit 060ff3ac0e
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libs/sqlite3/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2009 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.
@ -21,9 +21,14 @@ PKG_BUILD_DEPENDS:=libncurses libreadline
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/sqlite3/Default define Package/sqlite3/Default
SUBMENU:=database
TITLE:=SQLite (v3.x) database engine TITLE:=SQLite (v3.x) database engine
URL:=http://www.sqlite.org/ URL:=http://www.sqlite.org/
SUBMENU:=database endef
define Package/sqlite3/Default/description
SQLite is a small C library that implements a self-contained, embeddable,
zero-configuration SQL database engine.
endef endef
define Package/libsqlite3 define Package/libsqlite3
@ -34,9 +39,9 @@ define Package/libsqlite3
endef endef
define Package/libsqlite3/description define Package/libsqlite3/description
SQLite is a small C library that implements a self-contained, embeddable, $(call Package/sqlite3/Default/description)
zero-configuration SQL database engine. This package contains the SQLite This package contains the SQLite (v3.x) shared library, used by other
(v3.x) shared library, used by other programs. programs.
endef endef
define Package/sqlite3-cli define Package/sqlite3-cli
@ -48,28 +53,26 @@ define Package/sqlite3-cli
endef endef
define Package/sqlite3-cli/description define Package/sqlite3-cli/description
SQLite is a small C library that implements a self-contained, embeddable, $(call Package/sqlite3/Default/description)
zero-configuration SQL database engine. This package contains a terminal-based front-end to the SQLite (v3.x) library
This package contains a terminal-based front-end to the SQLite (v3.x) library that can evaluate queries interactively and display the results in multiple
that can evaluate queries interactively and display the results in formats.
multiple formats.
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \ --enable-shared \
--enable-shared \ --enable-static \
--enable-static \ --disable-tcl \
--disable-tcl \
, \ CONFIGURE_VARS += \
config_BUILD_CC="$(HOSTCC)" \ config_BUILD_CC="$(HOSTCC)" \
config_BUILD_CFLAGS="-O2" \ config_BUILD_CFLAGS="-O2" \
config_TARGET_CC="$(TARGET_CC)" \ config_TARGET_CC="$(TARGET_CC)" \
config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \ config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \ config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \ config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
)
endef endef
define Build/Compile define Build/Compile
@ -79,11 +82,11 @@ define Build/Compile
endef endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(1)/usr/include/
mkdir -p $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(1)/usr/lib/pkgconfig/
endef endef