diff options
| author | des <des@FreeBSD.org> | 2002-06-12 12:45:24 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-12 12:45:24 +0000 |
| commit | 1b240720511248ff607e12629adb7c2cd41c74a6 (patch) | |
| tree | 84862c3fb33281e349bdc0a886d4d71af5058964 /usr.sbin | |
| parent | e39b056b5de4e0d64c4f5c3b4bfb11064143ecf0 (diff) | |
| download | FreeBSD-src-1b240720511248ff607e12629adb7c2cd41c74a6.zip FreeBSD-src-1b240720511248ff607e12629adb7c2cd41c74a6.tar.gz | |
Reorder libraries to fix static linking (libssl depends on libcrypto, so
it must come before libcrypto in LDADD)
Reviewed by: bde
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_install/add/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/delete/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/info/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index 5903eaa..6788852 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -11,8 +11,8 @@ DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) -DPADD+= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -lcrypto -lssl +DPADD+= ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lssl -lcrypto .endif .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index 2a3dd6b..4128517 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -11,8 +11,8 @@ DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) -DPADD+= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -lcrypto -lssl +DPADD+= ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lssl -lcrypto .endif .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index 4ebf633..47642cc 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -11,8 +11,8 @@ DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) -DPADD+= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -lcrypto -lssl +DPADD+= ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lssl -lcrypto .endif .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index cd6230d..d3b16b8 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -11,8 +11,8 @@ DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) -DPADD+= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -lcrypto -lssl +DPADD+= ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lssl -lcrypto .endif .include <bsd.prog.mk> |
