Changeset 36917


Ignore:
Timestamp:
2013-06-11T14:56:04+02:00 (5 years ago)
Author:
nbd
Message:

AA: backport libjson-c, libubox and uci from trunk

Signed-off-by: Felix Fietkau <nbd@…>

Location:
branches/attitude_adjustment/package
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/attitude_adjustment/package/libjson-c/Makefile

    r25904 r36917  
    99 
    1010PKG_NAME:=json-c 
    11 PKG_VERSION:=0.9 
     11PKG_VERSION:=0.11 
    1212PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=http://oss.metaparadigm.com/json-c/ 
    16 PKG_MD5SUM:=3a13d264528dcbaf3931b0cede24abae 
     15PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ 
     16PKG_MD5SUM:=aa02367d2f7a830bf1e3376f77881e98 
     17 
     18PKG_LICENSE:=MIT 
     19PKG_LICENSE_FILES:=COPYING 
    1720 
    1821PKG_FIXUP:=autoreconf 
    1922PKG_INSTALL:=1 
     23 
     24PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
    2025 
    2126include $(INCLUDE_DIR)/package.mk 
     
    3742        $(INSTALL_DIR) $(1)/usr/include 
    3843        $(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/ 
     44        $(CP) $(PKG_INSTALL_DIR)/usr/include/json-c $(1)/usr/include/ 
    3945        $(INSTALL_DIR) $(1)/usr/lib 
    40         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/ 
     46        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.{a,so*} $(1)/usr/lib/ 
    4147        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
    42         $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/ 
     48        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json-c.pc $(1)/usr/lib/pkgconfig/ 
    4349endef 
    4450 
    4551define Package/libjson/install 
    4652        $(INSTALL_DIR) $(1)/usr/lib 
    47         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/ 
     53        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson-c.so.* $(1)/usr/lib/ 
    4854endef 
    4955 
  • branches/attitude_adjustment/package/libubox/Makefile

    r36704 r36917  
    22 
    33PKG_NAME:=libubox 
    4 PKG_VERSION:=2013-04-15 
     4PKG_VERSION:=2013-06-11 
    55PKG_RELEASE=$(PKG_SOURCE_VERSION) 
    66 
     
    88PKG_SOURCE_URL:=git://nbd.name/luci2/libubox.git 
    99PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    10 PKG_SOURCE_VERSION:=dcf93f332270bdaddb5d24fdba6e3eb5b1f7d80a 
     10PKG_SOURCE_VERSION:=ae40b6613019f02e856b4b1ccc2712984506152e 
    1111PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz 
    1212PKG_MIRROR_MD5SUM:= 
  • branches/attitude_adjustment/package/uci/Makefile

    r36731 r36917  
    88include $(TOPDIR)/rules.mk 
    99 
    10 UCI_VERSION=2013-05-26 
     10UCI_VERSION=2013-06-11 
    1111UCI_RELEASE=1 
    1212 
     
    1414PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) 
    1515PKG_RELEASE:=1 
    16 PKG_REV:=9ef6964362f917ba035020d439d05b36abfe5bb9 
     16PKG_REV:=c9c9d5cb085acc58b6579ace83fb79c085a9db27 
    1717 
    1818PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    2121PKG_SOURCE_VERSION:=$(PKG_REV) 
    2222PKG_SOURCE_PROTO:=git 
    23 PKG_MIRROR_MD5SUM:=05585c577ae39173920d0a44bda9537a 
    2423 
    2524PKG_LICENSE:=LGPLv2.1 GPLv2 
     
    4039  CATEGORY:=Libraries 
    4140  TITLE:=C library for the Unified Configuration Interface (UCI) 
     41  DEPENDS:=+libubox 
    4242endef 
    4343 
     
    8282define Build/InstallDev 
    8383        $(INSTALL_DIR) $(1)/usr/include 
    84         $(CP) $(PKG_BUILD_DIR)/uci{,_config,map}.h $(1)/usr/include 
     84        $(CP) $(PKG_BUILD_DIR)/uci{,_config,_blob,map}.h $(1)/usr/include 
    8585        $(INSTALL_DIR) $(1)/usr/lib 
    8686        $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib 
Note: See TracChangeset for help on using the changeset viewer.