Changeset 37119


Ignore:
Timestamp:
2013-07-01T17:36:12+02:00 (5 years ago)
Author:
nbd
Message:

libjson-c: rename the libjson binary package to libjson-c, add a new libjson package with the compatibility library (to deal with the rename)

Location:
trunk/package/libs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/libs/libjson-c/Makefile

    r36758 r37119  
    2828TARGET_CFLAGS += $(FPIC) 
    2929 
    30 define Package/libjson 
     30define Package/libjson-c 
    3131  SECTION:=libs 
    3232  CATEGORY:=Libraries 
     
    3535endef 
    3636 
    37 define Package/libjson/description 
     37define Package/libjson-c/description 
    3838 This package contains a library for javascript object notation backends. 
    3939endef 
     40 
     41define Package/libjson 
     42  SECTION:=libs 
     43  CATEGORY:=Libraries 
     44  DEPENDS:=+libjson-c 
     45  TITLE:=javascript object notation (compat library) 
     46  URL:=http://oss.metaparadigm.com/json-c/ 
     47endef 
     48 
     49define Package/libjson/description 
     50 This package contains a compatibility library for packages that have not 
     51 been adapted to the json-c library rename yet 
     52endef 
     53 
    4054 
    4155define Build/InstallDev 
     
    4458        $(CP) $(PKG_INSTALL_DIR)/usr/include/json-c $(1)/usr/include/ 
    4559        $(INSTALL_DIR) $(1)/usr/lib 
     60        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/ 
    4661        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.{a,so*} $(1)/usr/lib/ 
    4762        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
     
    4964endef 
    5065 
    51 define Package/libjson/install 
     66define Package/libjson-c/install 
    5267        $(INSTALL_DIR) $(1)/usr/lib 
    5368        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/ 
    5469endef 
    5570 
     71define Package/libjson/install 
     72        $(INSTALL_DIR) $(1)/usr/lib 
     73        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/ 
     74endef 
     75 
     76$(eval $(call BuildPackage,libjson-c)) 
    5677$(eval $(call BuildPackage,libjson)) 
  • trunk/package/libs/libubox/Makefile

    r37053 r37119  
    3434  CATEGORY:=Libraries 
    3535  TITLE:=blobmsg <-> json conversion library 
    36   DEPENDS:=+libjson +libubox 
     36  DEPENDS:=+libjson-c +libubox 
    3737endef 
    3838 
     
    4040  SECTION:=utils 
    4141  CATEGORY:=Utilities 
    42   DEPENDS:=+libjson 
     42  DEPENDS:=+libjson-c 
    4343  TITLE:=JSON SHell Notation 
    4444endef 
Note: See TracChangeset for help on using the changeset viewer.