[oe-commits] org.oe.dev portmap: SlugOS only - do not build with "-pie -fpie" due to binutils problems.

[mwester commit]

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)

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 96fb7b2574341a63bdfc4f962c3b402d854b66ae
ViewMTN: http://monotone.openembedded.org/revision/info/96fb7b2574341a63bdfc4f962c3b402d854b66ae
Files:
1
packages/portmap/portmap-6.0/no-pie.patch
packages/portmap/portmap_6.0.bb
Diffs:

#
# mt diff -r67dfddbb6c3e4112388a5a988ae65cdb20dc5a34 -r96fb7b2574341a63bdfc4f962c3b402d854b66ae
#
# 
# 
# add_file "packages/portmap/portmap-6.0/no-pie.patch"
#  content [39990f66702db50dd93420291a2edf4e018b16f0]
# 
# patch "packages/portmap/portmap_6.0.bb"
#  from [03ff99fa49ea46ef110fd480411ca9033f51e14e]
#    to [241baf929c36235b1a707377a729d0d306119226]
# 
============================================================
--- packages/portmap/portmap-6.0/no-pie.patch	39990f66702db50dd93420291a2edf4e018b16f0
+++ packages/portmap/portmap-6.0/no-pie.patch	39990f66702db50dd93420291a2edf4e018b16f0
@@ -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
============================================================
--- packages/portmap/portmap_6.0.bb	03ff99fa49ea46ef110fd480411ca9033f51e14e
+++ packages/portmap/portmap_6.0.bb	241baf929c36235b1a707377a729d0d306119226
@@ -1,11 +1,16 @@ require portmap.inc
 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"