[gnome-continuous] Update ppp patch to honour DESTDIR

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-continuous] Update ppp patch to honour DESTDIR
Date: Sat, 23 Jun 2018 12:56:29 +0000 (UTC)
commit 1920f8b9917121bbd72148f4dc5872af6abf4e67
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat Jun 23 13:55:51 2018 +0100

    Update ppp patch to honour DESTDIR

 patches/ppp-destdir.patch | 81 +++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 38 deletions(-)
---
diff --git a/patches/ppp-destdir.patch b/patches/ppp-destdir.patch
index c388b7c..7025e0c 100644
--- a/patches/ppp-destdir.patch
+++ b/patches/ppp-destdir.patch
@@ -1,6 +1,6 @@
-From bab87875538aaf096804b598d8759c22f09d362f Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters verbum org>
-Date: Tue, 10 Jan 2012 10:33:16 -0500
+From 972246d992f00e89a3aa22b14535af4db069be7e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Sat, 23 Jun 2018 13:50:58 +0100
 Subject: [PATCH] build: Use DESTDIR= like automake, not like --prefix
 
 This patch makes the build system comply with the GNOME Build API:
@@ -9,23 +9,28 @@ http://people.gnome.org/~walters/docs/build-api.txt
 Previously ppp was using DESTDIR in to hold what was given as --prefix
 for ./configure, and INSTDIR as DESTDIR.  Now INSTDIR is replaced by
 DESTDIR, and ./configure --prefix replaces what was formerly DESTDIR.
+
+Original patch by: Colin Walters <walters verbum org>
+
+v2:
+ - Update after changes in pppd
 ---
- chat/Makefile.linux                  |   12 ++++++------
- configure                            |    6 +++---
- linux/Makefile.top                   |   22 +++++++++++-----------
- pppd/Makefile.linux                  |   20 ++++++++++----------
- pppd/pathnames.h                     |    2 +-
- pppd/plugins/Makefile.linux          |   12 ++++++------
- pppd/plugins/pppoatm/Makefile.linux  |    8 ++++----
- pppd/plugins/pppol2tp/Makefile.linux |    8 ++++----
- pppd/plugins/radius/Makefile.linux   |   18 +++++++++---------
- pppd/plugins/rp-pppoe/Makefile.linux |   14 +++++++-------
- pppdump/Makefile.linux               |   12 ++++++------
- pppstats/Makefile.linux              |   12 ++++++------
+ chat/Makefile.linux                  | 12 ++++++------
+ configure                            |  6 +++---
+ linux/Makefile.top                   | 22 +++++++++++-----------
+ pppd/Makefile.linux                  | 20 ++++++++++----------
+ pppd/pathnames.h                     |  2 +-
+ pppd/plugins/Makefile.linux          | 12 ++++++------
+ pppd/plugins/pppoatm/Makefile.linux  |  8 ++++----
+ pppd/plugins/pppol2tp/Makefile.linux |  8 ++++----
+ pppd/plugins/radius/Makefile.linux   | 18 +++++++++---------
+ pppd/plugins/rp-pppoe/Makefile.linux | 14 +++++++-------
+ pppdump/Makefile.linux               | 12 ++++++------
+ pppstats/Makefile.linux              | 12 ++++++------
  12 files changed, 73 insertions(+), 73 deletions(-)
 
 diff --git a/chat/Makefile.linux b/chat/Makefile.linux
-index 1065ac5..5104908 100644
+index 0732ec8..909c3db 100644
 --- a/chat/Makefile.linux
 +++ b/chat/Makefile.linux
 @@ -1,8 +1,8 @@
@@ -54,7 +59,7 @@ index 1065ac5..5104908 100644
  clean:
        rm -f chat.o chat *~
 diff --git a/configure b/configure
-index 37a6643..ef7b852 100755
+index f7b653d..585fbcc 100755
 --- a/configure
 +++ b/configure
 @@ -5,7 +5,7 @@
@@ -130,7 +135,7 @@ index f63d45e..d64426a 100644
  clean:
        rm -f `find . -name '*.[oas]' -print`
 diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 060db6a..661a343 100644
+index 8d5ce99..36d3c41 100644
 --- a/pppd/Makefile.linux
 +++ b/pppd/Makefile.linux
 @@ -4,10 +4,10 @@
@@ -148,7 +153,7 @@ index 060db6a..661a343 100644
  
  TARGETS = pppd
  
-@@ -79,7 +79,7 @@ INCLUDE_DIRS= -I../include
+@@ -87,7 +87,7 @@ INCLUDE_DIRS= -I../include
  
  COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
  
@@ -157,7 +162,7 @@ index 060db6a..661a343 100644
  
  ifdef CHAPMS
  CFLAGS   += -DCHAPMS=1
-@@ -198,12 +198,12 @@ INSTALL= install
+@@ -217,12 +217,12 @@ INSTALL= install
  all: $(TARGETS)
  
  install: pppd
@@ -172,8 +177,8 @@ index 060db6a..661a343 100644
 +      $(INSTALL) -c -m 444 pppd.8 $(DESTDIR)$(MANDIR)
  
  pppd: $(PPPDOBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
-@@ -212,8 +212,8 @@ srp-entry: srp-entry.c
+       $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
+@@ -231,8 +231,8 @@ srp-entry: srp-entry.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
  
  install-devel:
@@ -198,11 +203,11 @@ index a33f046..abb8d76 100644
  #define _PATH_PLUGIN  "/usr/lib/pppd"
  #endif /* __STDC__ */
 diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index 0a7ec7b..b806e2b 100644
+index af53843..cd797e4 100644
 --- a/pppd/plugins/Makefile.linux
 +++ b/pppd/plugins/Makefile.linux
 @@ -4,10 +4,10 @@ CFLAGS       = $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS       = -shared
+ LDFLAGS_SHARED        = -shared
  INSTALL       = install
  
 -DESTDIR = $(INSTROOT)@DESTDIR@
@@ -216,7 +221,7 @@ index 0a7ec7b..b806e2b 100644
  
  SUBDIRS := rp-pppoe pppoatm pppol2tp
  # Uncomment the next line to include the radius authentication plugin
-@@ -28,8 +28,8 @@ all: $(PLUGINS)
+@@ -35,8 +35,8 @@ all: $(PLUGINS)
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
  
  install: $(PLUGINS)
@@ -224,11 +229,11 @@ index 0a7ec7b..b806e2b 100644
 -      $(INSTALL) $? $(LIBDIR)
 +      $(INSTALL) -d $(DESTDIR)$(LIBDIR)
 +      $(INSTALL) $? $(DESTDIR)$(LIBDIR)
-       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install || exit $$?; done
  
  clean:
 diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 20f62e6..1cb91dd 100644
+index 59dde0e..a75999a 100644
 --- a/pppd/plugins/pppoatm/Makefile.linux
 +++ b/pppd/plugins/pppoatm/Makefile.linux
 @@ -6,8 +6,8 @@ INSTALL        = install
@@ -243,7 +248,7 @@ index 20f62e6..1cb91dd 100644
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 @@ -36,8 +36,8 @@ $(PLUGIN): $(PLUGIN_OBJS)
-       $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $^ $(LIBS)
  
  install: all
 -      $(INSTALL) -d -m 755 $(LIBDIR)
@@ -254,7 +259,7 @@ index 20f62e6..1cb91dd 100644
  clean:
        rm -f *.o *.so
 diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index ea3538e..664dcfa 100644
+index 7981a95..590a331 100644
 --- a/pppd/plugins/pppol2tp/Makefile.linux
 +++ b/pppd/plugins/pppol2tp/Makefile.linux
 @@ -6,8 +6,8 @@ INSTALL        = install
@@ -269,7 +274,7 @@ index ea3538e..664dcfa 100644
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 @@ -19,8 +19,8 @@ all: $(PLUGINS)
-       $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $^ $(LIBS)
  
  install: all
 -      $(INSTALL) -d -m 755 $(LIBDIR)
@@ -280,7 +285,7 @@ index ea3538e..664dcfa 100644
  clean:
        rm -f *.o *.so
 diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
-index 24ed3e5..a3dfd31 100644
+index e702263..7841d7e 100644
 --- a/pppd/plugins/radius/Makefile.linux
 +++ b/pppd/plugins/radius/Makefile.linux
 @@ -3,9 +3,9 @@
@@ -314,9 +319,9 @@ index 24ed3e5..a3dfd31 100644
 +      $(INSTALL) -c -m 444 pppd-radattr.8 $(DESTDIR)$(MANDIR)
  
  radius.so: radius.o libradiusclient.a
-       $(CC) -o radius.so -shared radius.o libradiusclient.a
+       $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a
 diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 5d7a271..f805d2d 100644
+index 9803aeb..2c6ab8d 100644
 --- a/pppd/plugins/rp-pppoe/Makefile.linux
 +++ b/pppd/plugins/rp-pppoe/Makefile.linux
 @@ -14,9 +14,9 @@
@@ -333,7 +338,7 @@ index 5d7a271..f805d2d 100644
  PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 @@ -42,10 +42,10 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
-       $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
+       $(CC) $(LDFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
  
  install: all
 -      $(INSTALL) -d -m 755 $(LIBDIR)
@@ -348,7 +353,7 @@ index 5d7a271..f805d2d 100644
  clean:
        rm -f *.o *.so pppoe-discovery
 diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
-index ac028f6..426653d 100644
+index cdf7ac4..35ecfc7 100644
 --- a/pppdump/Makefile.linux
 +++ b/pppdump/Makefile.linux
 @@ -1,6 +1,6 @@
@@ -372,7 +377,7 @@ index ac028f6..426653d 100644
 +      $(INSTALL) -s -c pppdump $(DESTDIR)$(BINDIR)
 +      $(INSTALL) -c -m 444 pppdump.8 $(DESTDIR)$(MANDIR)
 diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
-index cca6f0f..eca014d 100644
+index 71afbe6..cbf71fd 100644
 --- a/pppstats/Makefile.linux
 +++ b/pppstats/Makefile.linux
 @@ -2,9 +2,9 @@
@@ -400,7 +405,7 @@ index cca6f0f..eca014d 100644
 +      $(INSTALL) -c -m 444 pppstats.8 $(DESTDIR)$(MANDIR)
  
  pppstats: $(PPPSTATSRCS)
-       $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
 -- 
-1.7.6.4
+2.17.0
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]