ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch

   1 From b9fb631a493c5f1b490c8e9645eb6ebab4b25cc8 Mon Sep 17 00:00:00 2001
   2 From: Michal Sekletar <msekleta@redhat.com>
   3 Date: Fri, 4 Apr 2014 18:37:00 +0200
   4 Subject: [PATCH 07/25] build-sys: don't strip binaries during installation
   5
   6 We don't want that when building rpms. rpmbuild does final stripping of binaries
   7 for us and generetes debuginfo rpm.
   8 ---
   9  chat/Makefile.linux                  | 2 +-
  10  pppd/Makefile.linux                  | 4 ++--
  11  pppd/plugins/radius/Makefile.linux   | 6 +++---
  12  pppd/plugins/rp-pppoe/Makefile.linux | 4 ++--
  13  pppdump/Makefile.linux               | 2 +-
  14  pppstats/Makefile.linux              | 2 +-
  15  6 files changed, 10 insertions(+), 10 deletions(-)
  16
  17 diff --git a/chat/Makefile.linux b/chat/Makefile.linux
  18 index 848cd8d..2445637 100644
  19 --- a/chat/Makefile.linux
  20 +++ b/chat/Makefile.linux
  21 @@ -25,7 +25,7 @@ chat.o:       chat.c
  22
  23  install: chat
  24         mkdir -p $(BINDIR) $(MANDIR)
  25 -       $(INSTALL) -s -c chat $(BINDIR)
  26 +       $(INSTALL) -c chat $(BINDIR)
  27         $(INSTALL) -c -m 644 chat.8 $(MANDIR)
  28
  29  clean:
  30 diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
  31 index 8ed56c1..4f27100 100644
  32 --- a/pppd/Makefile.linux
  33 +++ b/pppd/Makefile.linux
  34 @@ -102,7 +102,7 @@ ifdef USE_SRP
  35  CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
  36  LIBS   += -lsrp -L/usr/local/ssl/lib -lcrypto
  37  TARGETS        += srp-entry
  38 -EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
  39 +EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
  40  MANPAGES += srp-entry.8
  41  EXTRACLEAN += srp-entry.o
  42  NEEDDES=y
  43 @@ -208,7 +208,7 @@ all: $(TARGETS)
  44  install: pppd
  45         mkdir -p $(BINDIR) $(MANDIR)
  46         $(EXTRAINSTALL)
  47 -       $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
  48 +       $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
  49         if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  50           chmod o-rx,u+s $(BINDIR)/pppd; fi
  51         $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
  52 diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
  53 index 179d0b7..707326b 100644
  54 --- a/pppd/plugins/radius/Makefile.linux
  55 +++ b/pppd/plugins/radius/Makefile.linux
  56 @@ -36,9 +36,9 @@ all: $(PLUGIN)
  57
  58  install: all
  59         $(INSTALL) -d -m 755 $(LIBDIR)
  60 -       $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
  61 -       $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
  62 -       $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
  63 +       $(INSTALL) -c -m 755 radius.so $(LIBDIR)
  64 +       $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
  65 +       $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
  66         $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
  67         $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  68
  69 diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
  70 index 1305ed8..3cd9101 100644
  71 --- a/pppd/plugins/rp-pppoe/Makefile.linux
  72 +++ b/pppd/plugins/rp-pppoe/Makefile.linux
  73 @@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
  74
  75  install: all
  76         $(INSTALL) -d -m 755 $(LIBDIR)
  77 -       $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
  78 +       $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
  79         $(INSTALL) -d -m 755 $(BINDIR)
  80 -       $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
  81 +       $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
  82
  83  clean:
  84         rm -f *.o *.so pppoe-discovery
  85 diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
  86 index d0a5032..95c6805 100644
  87 --- a/pppdump/Makefile.linux
  88 +++ b/pppdump/Makefile.linux
  89 @@ -17,5 +17,5 @@ clean:
  90
  91  install:
  92         mkdir -p $(BINDIR) $(MANDIR)
  93 -       $(INSTALL) -s -c pppdump $(BINDIR)
  94 +       $(INSTALL) -c pppdump $(BINDIR)
  95         $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
  96 diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
  97 index 42aba73..c5ba3b1 100644
  98 --- a/pppstats/Makefile.linux
  99 +++ b/pppstats/Makefile.linux
 100 @@ -22,7 +22,7 @@ all: pppstats
 101
 102  install: pppstats
 103         -mkdir -p $(MANDIR)
 104 -       $(INSTALL) -s -c pppstats $(BINDIR)
 105 +       $(INSTALL) -c pppstats $(BINDIR)
 106         $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
 107
 108  pppstats: $(PPPSTATSRCS)
 109 --
 110 1.8.3.1
 111