From patchwork Wed Feb 10 23:03:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 581732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id E8F9014031D for ; Thu, 11 Feb 2016 10:03:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C627A5CE0; Wed, 10 Feb 2016 23:03:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7mRtJysgmnNg; Wed, 10 Feb 2016 23:03:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F421DA59BA; Wed, 10 Feb 2016 23:03:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E708D1C086E for ; Wed, 10 Feb 2016 23:03:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3950A5CC3 for ; Wed, 10 Feb 2016 23:03:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q1eSEqGED0LZ for ; Wed, 10 Feb 2016 23:03:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1F05AA59BA for ; Wed, 10 Feb 2016 23:03:37 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 9F11F4F9; Thu, 11 Feb 2016 00:03:35 +0100 (CET) Received: from localhost (AToulouse-657-1-1054-128.w83-193.abo.wanadoo.fr [83.193.44.128]) by mail.free-electrons.com (Postfix) with ESMTPSA id 3A959140; Thu, 11 Feb 2016 00:03:16 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 11 Feb 2016 00:03:10 +0100 Message-Id: <1455145392-2355-3-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1455145392-2355-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1455145392-2355-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 2/4] vpnc: simplify patch 0001 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reviewed-by: "Yann E. MORIN" --- ...ile-cleanup-and-fix-the-VERSION-definitio.patch | 60 +++++++--------------- 1 file changed, 19 insertions(+), 41 deletions(-) diff --git a/package/vpnc/0001-Misc.-Makefile-cleanup-and-fix-the-VERSION-definitio.patch b/package/vpnc/0001-Misc.-Makefile-cleanup-and-fix-the-VERSION-definitio.patch index d091dde..cad3e1a 100644 --- a/package/vpnc/0001-Misc.-Makefile-cleanup-and-fix-the-VERSION-definitio.patch +++ b/package/vpnc/0001-Misc.-Makefile-cleanup-and-fix-the-VERSION-definitio.patch @@ -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 Date: Mon, 8 Feb 2016 23:02:45 +0100 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 Signed-off-by: Thomas Petazzoni --- - Makefile | 40 +++++++++++++++++++--------------------- - 1 file changed, 19 insertions(+), 21 deletions(-) + Makefile | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 9b96d83..1ca6459 100644 +index 9b96d83..62742d0 100644 --- a/Makefile +++ b/Makefile -@@ -19,21 +19,19 @@ - # +@@ -20,7 +20,7 @@ # $Id$ --DESTDIR= + DESTDIR= -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 -+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))) ++PREFIX?=/usr/local + ETCDIR=/etc/vpnc + BINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/sbin +@@ -32,8 +32,6 @@ BINS = vpnc cisco-decrypt + OBJS = $(addsuffix .o,$(basename $(SRCS))) BINOBJS = $(addsuffix .o,$(BINS)) BINSRCS = $(addsuffix .c,$(BINS)) -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 # 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 #OPENSSLLIBS = -lcrypto -CC=gcc --CFLAGS ?= -O3 -g --CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings --CFLAGS += $(shell libgcrypt-config --cflags) ++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 -+CFLAGS ?= -O3 -g -+CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings -+CFLAGS += $(shell libgcrypt-config --cflags) +CPPFLAGS += $(OPENSSL_GPL_VIOLATION) -+LDFLAGS ?= -g -+LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS) + LDFLAGS ?= -g + 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 $(CC) -o $@ $^ $(LDFLAGS)