jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vpnc: simplify patch 0001

Browse Source 
Patch 0001 that adjusts the Makefile to solve cross-compilation issues
does a lot of whitespace changes that are unnecessary. We remove all
those noisy changes to keep only the really interesting ones.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2016-02-11 00:03:10 +01:00
parent 37451a9dc5
commit d2b6a496c6
1 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
package/vpnc/0001-Misc.-Makefile-cleanup-and-fix-the-VERSION-definitio.patch
View File

@ -1,4 +1,4 @@
From fd7e584bd28bd541464f8cb6cc72e76de2347640 Mon Sep 17 00:00:00 2001 From 40b35a82ea581f5dfb1b0b20c4ba3e9f01f35107 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com> From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 8 Feb 2016 23:02:45 +0100 Date: Mon, 8 Feb 2016 23:02:45 +0100
Subject: [PATCH] Misc. Makefile cleanup and fix the VERSION definition. Subject: [PATCH] Misc. Makefile cleanup and fix the VERSION definition.
@ -6,39 +6,24 @@ Subject: [PATCH] Misc. Makefile cleanup and fix the VERSION definition.
Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--- ---
Makefile | 40 +++++++++++++++++++--------------------- Makefile | 10 ++++------
1 file changed, 19 insertions(+), 21 deletions(-) 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 9b96d83..1ca6459 100644 index 9b96d83..62742d0 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -19,21 +19,19 @@ @@ -20,7 +20,7 @@
#
# $Id$ # $Id$
-DESTDIR= DESTDIR=
-PREFIX=/usr/local -PREFIX=/usr/local
-ETCDIR=/etc/vpnc
-BINDIR=$(PREFIX)/bin
-SBINDIR=$(PREFIX)/sbin
-MANDIR=$(PREFIX)/share/man
-DOCDIR=$(PREFIX)/share/doc/vpnc
-
-SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
-BINS = vpnc cisco-decrypt
-OBJS = $(addsuffix .o,$(basename $(SRCS)))
+DESTDIR =
+PREFIX?=/usr/local +PREFIX?=/usr/local
+ETCDIR = /etc/vpnc ETCDIR=/etc/vpnc
+BINDIR = $(PREFIX)/bin BINDIR=$(PREFIX)/bin
+SBINDIR = $(PREFIX)/sbin SBINDIR=$(PREFIX)/sbin
+MANDIR = $(PREFIX)/share/man @@ -32,8 +32,6 @@ BINS = vpnc cisco-decrypt
+DOCDIR = $(PREFIX)/share/doc/vpnc OBJS = $(addsuffix .o,$(basename $(SRCS)))
+
+SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c
+BINS = vpnc cisco-decrypt
+OBJS = $(addsuffix .o,$(basename $(SRCS)))
BINOBJS = $(addsuffix .o,$(BINS)) BINOBJS = $(addsuffix .o,$(BINS))
BINSRCS = $(addsuffix .c,$(BINS)) BINSRCS = $(addsuffix .c,$(BINS))
-VERSION := $(shell sh mk-version) -VERSION := $(shell sh mk-version)
@ -46,27 +31,20 @@ index 9b96d83..1ca6459 100644
# The license of vpnc (Gpl >= 2) is quite likely incompatible with the # The license of vpnc (Gpl >= 2) is quite likely incompatible with the
# openssl license. Openssl is currently used to provide certificate # openssl license. Openssl is currently used to provide certificate
@@ -50,13 +48,13 @@ RELEASE_VERSION := $(shell cat VERSION) @@ -50,11 +48,11 @@ RELEASE_VERSION := $(shell cat VERSION)
#OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION #OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION
#OPENSSLLIBS = -lcrypto #OPENSSLLIBS = -lcrypto
-CC=gcc -CC=gcc
-CFLAGS ?= -O3 -g
-CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
-CFLAGS += $(shell libgcrypt-config --cflags)
-CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
-LDFLAGS ?= -g
-LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
+CC ?= gcc +CC ?= gcc
+CFLAGS ?= -O3 -g CFLAGS ?= -O3 -g
+CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
+CFLAGS += $(shell libgcrypt-config --cflags) CFLAGS += $(shell libgcrypt-config --cflags)
-CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
+CPPFLAGS += $(OPENSSL_GPL_VIOLATION) +CPPFLAGS += $(OPENSSL_GPL_VIOLATION)
+LDFLAGS ?= -g LDFLAGS ?= -g
+LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS) LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
ifeq ($(shell uname -s), SunOS)
LDFLAGS += -lnsl -lresolv -lsocket
@@ -81,7 +79,7 @@ cisco-decrypt : cisco-decrypt.o decrypt-utils.o @@ -81,7 +79,7 @@ cisco-decrypt : cisco-decrypt.o decrypt-utils.o
$(CC) -o $@ $^ $(LDFLAGS) $(CC) -o $@ $^ $(LDFLAGS)