From fd62435cd42ef6ef431109ca3f15b47a50df214a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 5 Mar 2015 13:52:38 +0100 Subject: [PATCH] udpxy: fix build on OS X and clean up Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- net/udpxy/Makefile | 10 +++--- .../patches/0001-fix-build-on-Mac-OS-X.patch | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 net/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch diff --git a/net/udpxy/Makefile b/net/udpxy/Makefile index 8fc927645..6eeca1950 100644 --- a/net/udpxy/Makefile +++ b/net/udpxy/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=udpxy -PKG_VERSION:=2014-10-27 -PKG_RELEASE:=$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=c045a1e855a8033c5d70ab3e42271ba5636eb520 +PKG_VERSION:=2014-10-27-$(PKG_SOURCE_VERSION) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://github.com/pcherenkov/udpxy.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=c045a1e855a8033c5d70ab3e42271ba5636eb520 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=GPL-3.0 diff --git a/net/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch b/net/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch new file mode 100644 index 000000000..594206ca1 --- /dev/null +++ b/net/udpxy/patches/0001-fix-build-on-Mac-OS-X.patch @@ -0,0 +1,35 @@ +From 26f8177f799f3cf781ed89cb28f771da7ef22421 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Thu, 5 Mar 2015 13:42:09 +0100 +Subject: [PATCH] fix build on Mac OS X +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Álvaro Fernández Rojas +--- + chipmunk/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/chipmunk/Makefile b/chipmunk/Makefile +index e402128..fd41dbe 100644 +--- a/chipmunk/Makefile ++++ b/chipmunk/Makefile +@@ -32,10 +32,13 @@ DEBUG_ON := -g + ALL_CFLAGS = -W -Wall -Werror --pedantic $(CFLAGS) + + SYSTEM=$(shell uname 2>/dev/null) +-ifneq (,$(filter $(SYSTEM),FreeBSD Darwin)) ++ifneq (,$(filter $(SYSTEM),FreeBSD)) + MAKE := gmake + GZIP := /usr/bin/gzip + endif ++ifneq (,$(filter $(SYSTEM),Darwin)) ++GZIP := /usr/bin/gzip ++endif + + BUILDFILE = BUILD + BUILDNO := `cat $(BUILDFILE)` +-- +2.3.1 +