Changeset 30053


Ignore:
Timestamp:
2012-02-04T19:37:05+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] libnatpmp: merge r27692, r29757

Location:
branches/packages_10.03.2/libs/libnatpmp
Files:
2 edited

Legend:

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

    r27260 r30053  
    11# 
    2 # Copyright (C) 2011 OpenWrt.org 
     2# Copyright (C) 2011-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=libnatpmp 
    11 PKG_VERSION:=20110618 
     11PKG_VERSION:=20110808 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://miniupnp.free.fr/files 
    16 PKG_MD5SUM:=6a5fdc8aa6c8602ea96567dabe51d6d3 
     16PKG_MD5SUM:=22a1225b890471a7750a9bf26eb863f7 
    1717 
    1818PKG_INSTALL:=1 
     
    6060MAKE_FLAGS += \ 
    6161        COPTS="$(TARGET_CFLAGS)" \ 
    62         PREFIX="$(PKG_INSTALL_DIR)" 
     62        PREFIX="$(PKG_INSTALL_DIR)" \ 
     63        OS="Linux" 
    6364 
    6465define Build/InstallDev 
  • branches/packages_10.03.2/libs/libnatpmp/patches/001-cross_compile.patch

    r27260 r30053  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -4,14 +4,15 @@ 
    4  # (c) 2007-2011 Thomas Bernard 
    5  # http://miniupnp.free.fr/libnatpmp.html 
    6   
    7 -OS = $(shell uname -s) 
    8 +OS = Linux 
    9  CC = gcc 
    10  INSTALL = install 
    11   
     3@@ -11,7 +11,8 @@ INSTALL = install 
    124 # APIVERSION is used in soname 
    135 APIVERSION = 1 
    14  LDFLAGS = -Wl,--no-undefined 
     6 #LDFLAGS = -Wl,--no-undefined 
    157-CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR 
    168+COPTS = -O 
Note: See TracChangeset for help on using the changeset viewer.