summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-10-21 09:08:56 +0000
committerjoerg <joerg@pkgsrc.org>2012-10-21 09:08:56 +0000
commit583235ceb8ffd70bff4b256ceb1a556ce921959a (patch)
tree0591c7a5468a94b0709b94cb8edf2407147a8f88 /pkgtools
parent6a18885ed11e0f1b9a02dc7852651bed31b66e2d (diff)
downloadpkgsrc-583235ceb8ffd70bff4b256ceb1a556ce921959a.tar.gz
Deal with messed up linkage on Linux by always linking against libcrypto
and libssl when linking against libfetch, if the latter is built with SSL support.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/add/Makefile.in4
-rw-r--r--pkgtools/pkg_install/files/admin/Makefile.in4
-rw-r--r--pkgtools/pkg_install/files/create/Makefile.in7
-rw-r--r--pkgtools/pkg_install/files/delete/Makefile.in9
-rw-r--r--pkgtools/pkg_install/files/info/Makefile.in4
5 files changed, 20 insertions, 8 deletions
diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in
index 9185cd769b3..647e71454e5 100644
--- a/pkgtools/pkg_install/files/add/Makefile.in
+++ b/pkgtools/pkg_install/files/add/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.26 2012/05/15 16:43:53 christos Exp $
+# $NetBSD: Makefile.in,v 1.27 2012/10/21 09:08:56 joerg Exp $
srcdir= @srcdir@
@@ -22,7 +22,7 @@ SSL_SUPPORT= @ssl_support@
LIBS= -linstall -lfetch
.if !empty(SSL_SUPPORT)
-LIBS+= -lcrypto
+LIBS+= -lssl -lcrypto
.endif
LIBS+= @LIBS@
diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in
index 92e4f0f6c26..26b3a13e12d 100644
--- a/pkgtools/pkg_install/files/admin/Makefile.in
+++ b/pkgtools/pkg_install/files/admin/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.24 2012/05/15 16:43:53 christos Exp $
+# $NetBSD: Makefile.in,v 1.25 2012/10/21 09:08:56 joerg Exp $
srcdir= @srcdir@
@@ -30,7 +30,7 @@ SCRIPTS= audit-packages download-vulnerability-list
.if empty(BOOTSTRAP)
LIBS= -linstall -lfetch
.if !empty(SSL_SUPPORT)
-LIBS+= -lcrypto
+LIBS+= -lssl -lcrypto
CFLAGS+= -DHAVE_SSL
.endif
LIBS+= @LIBS@
diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in
index 70ae45751b1..75b024a845d 100644
--- a/pkgtools/pkg_install/files/create/Makefile.in
+++ b/pkgtools/pkg_install/files/create/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.22 2012/05/15 16:43:53 christos Exp $
+# $NetBSD: Makefile.in,v 1.23 2012/10/21 09:08:56 joerg Exp $
srcdir= @srcdir@
@@ -23,8 +23,13 @@ INSTALL= @INSTALL@
PROG= pkg_create
+SSL_SUPPORT= @ssl_support@
+
.if empty(BOOTSTRAP)
LIBS= -linstall -lfetch @LIBS@
+.if !empty(SSL_SUPPORT)
+LIBS+= -lssl -lcrypto
+.endif
CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib
OBJS= main.o perform.o pl.o util.o build.o
.else
diff --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in
index e1b24832330..e60ddaf8998 100644
--- a/pkgtools/pkg_install/files/delete/Makefile.in
+++ b/pkgtools/pkg_install/files/delete/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.19 2012/05/15 16:43:53 christos Exp $
+# $NetBSD: Makefile.in,v 1.20 2012/10/21 09:08:56 joerg Exp $
srcdir= @srcdir@
@@ -11,9 +11,16 @@ datarootdir= @datarootdir@
man1dir= $(mandir)/man1
cat1dir= $(mandir)/cat1
+SSL_SUPPORT= @ssl_support@
+
CC= @CC@
CCLD= $(CC)
LIBS= -linstall -lfetch @LIBS@
+
+.if !empty(SSL_SUPPORT)
+LIBS+= -lssl -lcrypto
+.endif
+
CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib -DBINDIR=\"$(sbindir)\"
DEFS= @DEFS@
CFLAGS= @CFLAGS@
diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in
index ddf67598bb6..5f874a3ab0d 100644
--- a/pkgtools/pkg_install/files/info/Makefile.in
+++ b/pkgtools/pkg_install/files/info/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.25 2012/05/15 16:43:53 christos Exp $
+# $NetBSD: Makefile.in,v 1.26 2012/10/21 09:08:57 joerg Exp $
srcdir= @srcdir@
@@ -19,7 +19,7 @@ CCLD= $(CC)
.if empty(BOOTSTRAP)
LIBS= -linstall -lfetch @LIBS@
.if !empty(SSL_SUPPORT)
-LIBS+= -lcrypto
+LIBS+= -lssl -lcrypto
.endif
CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir) -I../lib
.else