diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/portmap | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/portmap')
| -rw-r--r-- | package/portmap/patches/patch-Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/package/portmap/patches/patch-Makefile b/package/portmap/patches/patch-Makefile new file mode 100644 index 000000000..63d559ac7 --- /dev/null +++ b/package/portmap/patches/patch-Makefile @@ -0,0 +1,12 @@ +--- portmap_6.0.orig/Makefile 2007-05-11 05:02:10.000000000 +0200 ++++ portmap_6.0/Makefile 2010-12-19 22:23:02.000000000 +0100 +@@ -125,9 +125,7 @@ CFLAGS += -Wall -Wstrict-prototypes + all: portmap pmap_dump pmap_set portmap.man + + CPPFLAGS += $(HOSTS_ACCESS) +-portmap: CFLAGS += -fpie + portmap: LDLIBS += $(WRAP_LIB) +-portmap: LDFLAGS += -pie + portmap: portmap.o pmap_check.o from_local.o + + from_local: CPPFLAGS += -DTEST |