From: Mike Westerhof <mwester@dls.net>
Date: Wed, 21 Nov 2007 18:04:47 +0000 (+0000)
Subject: portmap: SlugOS only - do not build with "-pie -fpie" due to binutils problems.
X-Git-Tag: Release-2010-05/1~8314
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ef059e8d595d4dfe11fe712aa20e7b3b54c7a46;p=openembedded.git

portmap: SlugOS only - do not build with "-pie -fpie" due to binutils problems.
(This change should be reverted when we get SlugOS working with binutils 1.18)
---

diff --git a/packages/portmap/portmap-6.0/no-pie.patch b/packages/portmap/portmap-6.0/no-pie.patch
new file mode 100644
index 0000000000..4d7e2daae4
--- /dev/null
+++ b/packages/portmap/portmap-6.0/no-pie.patch
@@ -0,0 +1,14 @@
+--- portmap_6.0/Makefile.orig	2007-11-21 00:35:52.000000000 -0600
++++ portmap_6.0/Makefile	2007-11-21 00:37:23.000000000 -0600
+@@ -125,9 +125,9 @@
+ all:	portmap pmap_dump pmap_set portmap.man
+ 
+ CPPFLAGS += $(HOSTS_ACCESS)
+-portmap: CFLAGS   += -fpie
++#portmap: CFLAGS   += -fpie
+ portmap: LDLIBS   += $(WRAP_LIB)
+-portmap: LDFLAGS  += -pie
++#portmap: LDFLAGS  += -pie
+ portmap: portmap.o pmap_check.o from_local.o
+ 
+ from_local: CPPFLAGS += -DTEST
diff --git a/packages/portmap/portmap_6.0.bb b/packages/portmap/portmap_6.0.bb
index 315cb4a473..335b5c6d09 100644
--- a/packages/portmap/portmap_6.0.bb
+++ b/packages/portmap/portmap_6.0.bb
@@ -1,11 +1,16 @@
 require portmap.inc
 
+PR = "r1"
+
 SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
            file://destdir-no-strip.patch;patch=1 \
 	   file://no-tcpd-support.patch;patch=1 \
            file://no-libwrap.patch;patch=1;pnum=0 \
            file://portmap.init "
 
+# Remove this patch when SlugOS upgrades to binutils 1.18
+SRC_URI_append_slugos = " file://no-pie.patch;patch=1 "
+
 S = "${WORKDIR}/${PN}_${PV}/"
 
 CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"