From 53c481971cb171f37ce0caf46f1d930884434a66 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Tue, 2 Mar 2010 17:41:24 +0100 Subject: [PATCH 1/3] cleanup Makefile, set BUILD-only flag, remove install-section --- sparsehash/Makefile | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/sparsehash/Makefile b/sparsehash/Makefile index 9b6e2a1..0d40f62 100644 --- a/sparsehash/Makefile +++ b/sparsehash/Makefile @@ -18,48 +18,28 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/sparsehash-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk +PKG_INSTALL:=1 + define Package/sparsehash SECTION:=libs CATEGORY:=Libraries TITLE:=Sparsehash + BUILDONLY:=1 URL:=http://code.google.com/p/google-sparsehash/ - DEPENDS:= endef define Package/sparsehash/description An extremely memory-efficient hash_map implementation. 2 bits/entry overhead! The SparseHash library contains several hash-map implementations, including implementations that optimize for space or speed. These hashtable implementations are similar in API to SGI's hash_map class and the tr1 unordered_map class, but with different performance characteristics. It's easy to replace hash_map or unordered_map by sparse_hash_map or dense_hash_map in C++ code. endef -# -# TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL -# -# CONFIGURE_ARGS += \ -# --with-sdl-exec-prefix=$(STAGING_DIR) -# -# CONFIGURE_VARS += \ -# LIBS="-lSDL -ldirect -ldirectfb -lfusion" - -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/google $(1)/usr/lib + $(INSTALL_DIR) \ + $(1)/usr/include/google + $(CP) \ $(PKG_INSTALL_DIR)/usr/include/google/* \ $(1)/usr/include/google/ -# $(CP) \ -# $(PKG_INSTALL_DIR)/usr/lib/libSDL_image*.{a,so*} \ -# $(1)/usr/lib/ -endef - -define Package/sparsehash/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include/google/ $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/sparsehash-$(PKG_VERSION)/ $(1)/usr/doc/ endef $(eval $(call BuildPackage,sparsehash)) From 72a8d995af95b2c42b3bfb32c5f01882e720ae00 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Tue, 2 Mar 2010 17:44:03 +0100 Subject: [PATCH 2/3] cleanup Makefile, change install-paths --- stardict/Makefile | 68 ++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/stardict/Makefile b/stardict/Makefile index 47b915c..40a5d8a 100644 --- a/stardict/Makefile +++ b/stardict/Makefile @@ -35,41 +35,47 @@ TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/libintl/lib TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -CONFIGURE_CMD=./autogen.sh +CONFIGURE_CMD =./autogen.sh -define Build/Configure - $(call Build/Configure/Default, \ - --disable-dependency-tracking \ - --disable-libtool-lock \ - --disable-spell \ - --disable-gucharmap \ - --disable-festival \ - --disable-espeak \ - --disable-dictdotcn \ - --disable-advertisement \ - --disable-man \ - --disable-qqwry \ - --disable-updateinfo \ - --disable-htmlparse \ - --disable-xdxfparse \ - --disable-wordnet \ - --disable-powerwordparse \ - --disable-wikiparse \ - --disable-schemas-install \ - --disable-deprecations \ - --disable-gnome-support \ - --enable-nanonote-support \ - ) -endef +CONFIGURE_ARGS += \ + --disable-dependency-tracking \ + --disable-libtool-lock \ + --disable-spell \ + --disable-gucharmap \ + --disable-festival \ + --disable-espeak \ + --disable-dictdotcn \ + --disable-advertisement \ + --disable-man \ + --disable-qqwry \ + --disable-updateinfo \ + --disable-htmlparse \ + --disable-xdxfparse \ + --disable-wordnet \ + --disable-powerwordparse \ + --disable-wikiparse \ + --disable-schemas-install \ + --disable-deprecations \ + --disable-gnome-support \ + --enable-nanonote-support define Package/stardict/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DIR) $(1)/usr/share/pixmaps + $(INSTALL_DIR) \ + $(1)/usr/bin \ + $(1)/usr/share \ + $(1)/usr/share/icons - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stardict $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/pixmaps/stardict.png $(1)/usr/share/pixmaps/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/stardict $(1)/usr/share/ + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/stardict \ + $(1)/usr/bin/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/pixmaps/stardict.png \ + $(1)/usr/share/icons/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/stardict \ + $(1)/usr/share/ endef $(eval $(call BuildPackage,stardict)) From 12150049ba365331b34bcad49d3a0d277eeb5c37 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Tue, 2 Mar 2010 17:45:05 +0100 Subject: [PATCH 3/3] add dependency to libgconf2 --- stardict/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stardict/Makefile b/stardict/Makefile index 40a5d8a..adfd6b5 100644 --- a/stardict/Makefile +++ b/stardict/Makefile @@ -22,9 +22,8 @@ include $(INCLUDE_DIR)/package.mk define Package/stardict SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libintl +libiconv + DEPENDS:=+libintl +libiconv +libgconf2 TITLE:=International Dictionary Software - URL:= endef define Package/stardict/description