Changeset 30059


Ignore:
Timestamp:
2012-02-04T19:44:03+01:00 (4 years ago)
Author:
jow
Message:

[packages_10.03.2] polarssl: merge r29331, r29336

Location:
branches/packages_10.03.2/libs/polarssl
Files:
2 deleted
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/libs/polarssl/Makefile

    r26897 r30059  
    1 # 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     1#  
     2# Copyright (C) 2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=polarssl 
    11 PKG_VERSION:=0.14.3 
     11PKG_VERSION:=1.0.0 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz 
    1515PKG_SOURCE_URL:=http://polarssl.org/code/releases 
    16 PKG_MD5SUM:=f1b2fe9087ab64d7ea40a276a3628583 
     16PKG_MD5SUM:=9e0ef5090070ae95363f201851ca62f2 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
     19include $(INCLUDE_DIR)/cmake.mk 
    1920 
    2021define Package/polarssl/Default 
     
    5657PKG_INSTALL:=1 
    5758 
    58 define Build/Configure 
    59 endef 
    60  
    61 TARGET_CFLAGS += $(FPIC) 
    62 MAKE_FLAGS += OFLAGS="$(TARGET_CFLAGS)" 
     59CMAKE_OPTIONS += \ 
     60        -DCMAKE_BUILD_TYPE:String="Release" \ 
     61        -DUSE_SHARED_POLARSSL_LIBRARY:Bool=ON \ 
    6362 
    6463define Build/InstallDev 
    6564        $(INSTALL_DIR) $(1)/usr/include 
    66         $(CP) $(PKG_INSTALL_DIR)/include/polarssl $(1)/usr/include/ 
     65        $(CP) $(PKG_INSTALL_DIR)/usr/include/polarssl $(1)/usr/include/ 
    6766        $(INSTALL_DIR) $(1)/usr/lib 
    68         $(CP) $(PKG_INSTALL_DIR)/lib/libpolarssl.{a,so} $(1)/usr/lib/ 
     67        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpolarssl.so* $(1)/usr/lib/ 
    6968endef 
    7069 
    7170define Package/libpolarssl/install 
    7271        $(INSTALL_DIR) $(1)/usr/lib 
    73         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/libpolarssl.so $(1)/usr/lib/ 
     72        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpolarssl.so* $(1)/usr/lib/ 
    7473endef 
    7574 
    7675define Package/polarssl-progs/install 
    7776        $(INSTALL_DIR) $(1)/usr/bin 
    78         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/polarssl_* $(1)/usr/bin/ 
     77        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ 
    7978endef 
    8079 
Note: See TracChangeset for help on using the changeset viewer.