- remove libprotoc.so* from package (AFAIK not needed for runtime on target)
- split libprotobuf-lite.so* into separate package


Signed-off-by: Michael Markstaller <m...@elabnet.de>

--- cut ---

--- feeds/packages/libs/protobuf/Makefile       (Revision 31678)
+++ feeds/packages/libs/protobuf/Makefile       (Arbeitskopie)
@@ -9,7 +9,7 @@

 PKG_NAME:=protobuf
 PKG_VERSION:=2.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://protobuf.googlecode.com/files
@@ -22,21 +22,31 @@
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk

-define Package/protobuf
+define Package/protobuf/Default
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=A structured data encoding library
   URL:=http://code.google.com/p/protobuf/
-  DEPENDS:=+zlib
   MAINTAINER:=Obinou <obcons...@gmail.com>
 endef

+define Package/protobuf
+  $(call Package/protobuf/Default)
+  TITLE:=A structured data encoding library (libprotobuf)
+  DEPENDS:=+zlib
+endef
+
 define Package/protobuf/description
  Protocol Buffers are a way of encoding structured data in an efficient
  yet extensible format. Google uses Protocol Buffers for almost all
  of its internal RPC protocols and file formats.
 endef

+define Package/protobuf-lite
+  $(call Package/protobuf/Default)
+  TITLE:=A structured data encoding library (libprotobuf-lite)
+  DEPENDS:=+zlib
+endef
+
 CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOST)/bin/protoc

 define Build/InstallDev
@@ -56,19 +66,19 @@
 define Package/protobuf/install
        $(INSTALL_DIR) \
                $(1)/usr/lib
-
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libprotoc.so*  \
+               $(PKG_INSTALL_DIR)/usr/lib/libprotobuf.so* \
                $(1)/usr/lib/
+endef

+define Package/protobuf-lite/install
+       $(INSTALL_DIR) \
+               $(1)/usr/lib
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-lite.so* \
                $(1)/usr/lib/
-       
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libprotobuf.so* \
-               $(1)/usr/lib/
 endef

 $(eval $(call BuildPackage,protobuf))
+$(eval $(call BuildPackage,protobuf-lite))
 $(eval $(call HostBuild))
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to