Mailing List Archive

Author: Antonio Borneo
Date: Sun Dec 1 10:44:31 2013
New Revision: 531

Log:
Fix compile on Gentoo distro

Patch from Justin Lecher <jlec@gentoo.org>
"vpnc-0.5.3_p514-as-needed.patch"
Already applyed in Gentoo at build time.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>

Modified:
branches/vpnc-nortel/Makefile
trunk/Makefile

Modified: branches/vpnc-nortel/Makefile
==============================================================================
--- branches/vpnc-nortel/Makefile (original)
+++ branches/vpnc-nortel/Makefile Sun Dec 1 10:44:31 2013
@@ -60,16 +60,16 @@
VERSION := $(shell sh mk-version)
RELEASE_VERSION := $(shell cat VERSION)

-CC=gcc
+CC ?= gcc
CFLAGS ?= -O3 -g
CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
CPPFLAGS += -DVERSION=\"$(VERSION)\"
LDFLAGS ?= -g
-LDFLAGS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
+LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)

ifeq ($(shell uname -s), SunOS)
-LDFLAGS += -lnsl -lresolv -lsocket
+LIBS += -lnsl -lresolv -lsocket
endif
ifneq (,$(findstring Apple,$(shell $(CC) --version)))
# enabled in FSF GCC, disabled by default in Apple GCC
@@ -79,16 +79,16 @@
all : $(BINS) vpnc.8

vpnc : $(OBJS) vpnc.o
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

vpnc.8 : vpnc.8.template makeman.pl vpnc
./makeman.pl

cisco-decrypt : cisco-decrypt.o decrypt-utils.o
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

test-crypto : sysdep.o test-crypto.o crypto.o $(CRYPTO_OBJS)
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

.depend: $(SRCS) $(BINSRCS)
$(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Dec 1 10:44:31 2013
@@ -60,16 +60,16 @@
VERSION := $(shell sh mk-version)
RELEASE_VERSION := $(shell cat VERSION)

-CC=gcc
+CC ?= gcc
CFLAGS ?= -O3 -g
CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
CPPFLAGS += -DVERSION=\"$(VERSION)\"
LDFLAGS ?= -g
-LDFLAGS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
+LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)

ifeq ($(shell uname -s), SunOS)
-LDFLAGS += -lnsl -lresolv -lsocket
+LIBS += -lnsl -lresolv -lsocket
endif
ifneq (,$(findstring Apple,$(shell $(CC) --version)))
# enabled in FSF GCC, disabled by default in Apple GCC
@@ -79,16 +79,16 @@
all : $(BINS) vpnc.8

vpnc : $(OBJS) vpnc.o
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

vpnc.8 : vpnc.8.template makeman.pl vpnc
./makeman.pl

cisco-decrypt : cisco-decrypt.o decrypt-utils.o
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

test-crypto : sysdep.o test-crypto.o crypto.o $(CRYPTO_OBJS)
- $(CC) -o $@ $^ $(LDFLAGS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

.depend: $(SRCS) $(BINSRCS)
$(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/