summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-08-28 15:09:08 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-08-28 15:09:08 +0000
commitb5a57ff5d8e88023b695215d6a21807cdd3300df (patch)
treedcc6a1020f83c89bd850bd0cd907ded823c00f3a /dev-embedded
parentudev rules moved from hackrf-tools to libhackrf (diff)
downloadgentoo-2-b5a57ff5d8e88023b695215d6a21807cdd3300df.tar.gz
gentoo-2-b5a57ff5d8e88023b695215d6a21807cdd3300df.tar.bz2
gentoo-2-b5a57ff5d8e88023b695215d6a21807cdd3300df.zip
Refresh -build.patch wrt #521364 by Agostino Sarubbo
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/ponyprog/ChangeLog6
-rw-r--r--dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch17
2 files changed, 12 insertions, 11 deletions
diff --git a/dev-embedded/ponyprog/ChangeLog b/dev-embedded/ponyprog/ChangeLog
index 7411cc29d0f8..ee7ee42edece 100644
--- a/dev-embedded/ponyprog/ChangeLog
+++ b/dev-embedded/ponyprog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-embedded/ponyprog
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.28 2014/05/20 12:10:10 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.29 2014/08/28 15:09:08 ssuominen Exp $
+
+ 28 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+ files/ponyprog-2.07c-build.patch:
+ Refresh -build.patch wrt #521364 by Agostino Sarubbo
*ponyprog-2.07c-r1 (20 May 2014)
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
index 8081e46c7436..cc29d2f1060e 100644
--- a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
+++ b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
@@ -1,26 +1,24 @@
-Respect LDFLAGS, CC, CXX
+Fix parallel make and respect CC, CXX and LDFLAGS
+http://bugs.gentoo.org/282244
http://bugs.gentoo.org/317767
-Fix parallel make
-
-https://bugs.gentoo.org/show_bug.cgi?id=282244
-
--- Makefile
+++ Makefile
-@@ -331,7 +331,7 @@
+@@ -331,8 +331,8 @@
+
prps: $(PRPS)
-$(PROG): $(OBJS)
-+$(PROG): $(OBJS) vlib
- $(CXX) -o $@ $(OBJS) $(LDFLAGS)
++$(PROG): $(OBJS) vlib
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
%.o: %.cpp
$(CXX) $(CFLAGS) -c $< -o $@
--- v/Config.mk
+++ v/Config.mk
-@@ -35,8 +35,6 @@
+@@ -40,8 +40,6 @@
#---------------------------------------------------------------------
#CC = gcc
#CXX = g++
@@ -29,7 +27,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=282244
#---------------------------------------------------------------------
# VPATH for dependencies on header files
-@@ -297,5 +295,3 @@
+@@ -302,5 +300,3 @@
#---------------------------------------------------------------------
# LINK/LOAD options
#---------------------------------------------------------------------
@@ -45,4 +43,3 @@ https://bugs.gentoo.org/show_bug.cgi?id=282244
#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-