diff options
| -rw-r--r-- | recipes/portmap/portmap-6.0/no-pie.patch | 14 | ||||
| -rw-r--r-- | recipes/portmap/portmap_6.0.bb | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/recipes/portmap/portmap-6.0/no-pie.patch b/recipes/portmap/portmap-6.0/no-pie.patch deleted file mode 100644 index 4d7e2daae4..0000000000 --- a/recipes/portmap/portmap-6.0/no-pie.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/recipes/portmap/portmap_6.0.bb b/recipes/portmap/portmap_6.0.bb index cb94a48fb7..501aa5d848 100644 --- a/recipes/portmap/portmap_6.0.bb +++ b/recipes/portmap/portmap_6.0.bb @@ -1,6 +1,6 @@ require portmap.inc -PR = "r3" +PR = "r4" SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \ file://destdir-no-strip.patch;patch=1 \ @@ -8,12 +8,10 @@ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6. 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" +CFLAGS += "-O2 -Wall -Wstrict-prototypes -fpie" fakeroot do_install() { install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d |