Commit Graph

27 Commits

Author SHA1 Message Date
lukem
93305911e9 Move libcrypto.so* from /usr/lib to /lib, as /sbin/cgdconfig needs it.
Requested by elric@.
2002-10-07 00:53:31 +00:00
thorpej
09a0767aa9 Only use the MKDYNAMICROOT semantics (i.e. -rpath=/lib,/usr/lib and
-dynamic-linker=/libexec/ld.elf_so) if the BINDIR of the program being
built is /bin or /sbin.

The reason we do this is because now all programs *except* those in
/bin and /sbin (i.e. the "special cases") match the default the compiler
uses, which is what is used for things in e.g. xsrc, pkgsrc, and other
random 3rd party programs.

This is done by decoupling where a shlib is installed from how it
is located.  Two new variables, SHLIBINSTALLDIR and SHLINKINSTALLDIR,
contain the former information, and key off MKDYNAMICROOT only.  SHLIBDIR
and SHLINKDIR contain the latter, and key off MKDYNAMICROOT and BINDIR.

The SHLIBINSTALLDIR, SHLIBDIR, _LIBSODIR, SHLINKINSTALLDIR, and
SHLINKDIR parameters are moved to a new <bsd.shlib.mk>; see bsd.README
for usage details.
2002-09-27 21:37:50 +00:00
itojun
50d422c24f e_os.h is not part of exported openssl interface, so don't install it into
/usr/include/openssl (e_os.h has an explicit comment about it).  it obviously
is a bug in openssl 0.9.6 Makefile.
based on openssl 0.9.7 snapshot.
2002-08-31 10:46:36 +00:00
lukem
91d06a031b More use of ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path 2002-08-19 13:35:05 +00:00
lukem
ebb6fc9eb8 Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path (etc).
(Reduces make output by ~ 20%)
2002-08-19 09:41:27 +00:00
thorpej
c029cf4e92 Remove -nostdinc from CPPFLAGS. That should only be used when
bsd.lib.mk wants it to be used.
2002-06-26 16:58:09 +00:00
thorpej
8893ba2f3c Back out rev 1.20. 2002-06-26 16:30:46 +00:00
veego
d7a9005d0f Back out rev 1.18:
Remove -I${DESTDIR}/usr/include since it's redundant.

It may be redundant in some environments, but not in all.
2002-06-26 15:21:50 +00:00
thorpej
d8a2597f4b * Don't put the pathname to the host-tool compiler into the library.
Instead, inject the compiler version info from ${CC} -v.
* Don't put the date into the library.  Instead, inject the OS version
  info.
2002-06-16 17:57:29 +00:00
matt
1ece0e0c9a Remove -I${DESTDIR}/usr/include since it's redundant. 2002-06-15 02:01:23 +00:00
bjh21
0de3f91b56 Don't try to put the host's /usr/include on the target compiler's include path.
This causes Bad Things to happen.  Instead, use the target's /usr/include.
2002-06-11 22:55:34 +00:00
itojun
7c75b5ec2f sync with 0.9.6d. shlib minor for libssl and libcrypto
is cranked for additional functions.
2002-06-09 16:12:52 +00:00
wiz
56b4d2cb0c Move code that tries to determine shlib major into MKPIC != "no" case. 2002-05-02 16:24:24 +00:00
lukem
b7ca7acccf Don't hard link to symlinks, as it's not portable.
Based on [toolchain/14119] from Chris G. Demetriou.
2002-02-26 00:57:12 +00:00
lukem
efcc9a4c9d * Add user-controlled mk.conf variables
- SHLIBDIR	Location to install shared libraries if ${USE_SHLIBDIR}
			is "yes".  Defaults to "/usr/lib".

	- USE_SHLIBDIR	If "yes", install shared libraries in ${SHLIBDIR}
			instead of ${LIBDIR}.  Defaults to "no".
			Sets ${_LIBSODIR} to the appropriate value.
			This may be set by individual Makefiles as well.

	- SHLINKDIR	Location of shared linker.  Defaults to "/usr/libexec".
			If != "/usr/libexec", change the dynamic-linker
			encoded in shared programs

* Set USE_SHLIBDIR for libraries used by /bin and /sbin:
	libc libcrypt libcrypto libedit libipsec libkvm libm libmi387
	libtermcap libutil libz

* If ${_LIBSODIR} != ${LIBDIR}, add symlinks from ${LIBDIR}/${LIB}.so*
  to ${_LIBSODIR}/${LIB}.so* for compatibility.

* Always install /sbin/init statically (for now)


The net effect of these changes depends on how the variables are set:

  1.)	If nothing is set or changed, there is no change from the
	current behaviour:
		- Static /bin, /sbin, and bits of /usr/*
		- Dynamic rest
		- Shared linker is /usr/libexec/ld*so

  2.)	If the following make variables are set:
		LDSTATIC=
		SHLINKDIR=/lib
		SHLIBDIR=/lib
	Then the behaviour becomes:
		- Dynamic tools
		- .so libraries used by /bin and /sbin are installed to /lib,
		  with symlinks from /usr/lib/lib*so to -> /lib/lib*so
		  where appropriate
		- Shared linker is /lib/ld*so

  3.)	As per 2.), but add the following variable:
		USE_SHLIBDIR=yes
	This forces all .so's to be instaleld in /lib (with compat
	symlinks), not just those tagged by their Makefiles to be.
	Again, compat symlinks are installed
2001-12-28 01:32:37 +00:00
sommerfeld
99c2c3dfe8 Fix (work around?) bin/12804.
(idea.h, rc5.h, and rsa.h appeared twice in INCS, confusing make -j)
2001-05-02 13:06:14 +00:00
itojun
35a07da1df use openssl 0.9.6a. shlib major # is bumped for libcrypto, libssl and
all kerberos libraries.
2001-04-12 07:48:03 +00:00
enami
b812acc76c Pass -B to the make command used to make print-shlib-{major,minor} so
that make install with -j option works.
2001-02-11 01:21:24 +00:00
itojun
8d26d03189 repair openssl (libcrypto) for non-32bit architecture.
don't use unsigned long where 32bit unsigned variable is asked for.
use u_int32_t.  (not sure if uint32_t is better or not, but anyway,
u_int32_t <-> uint32_t should not raise binary compatibility issue)
PR10921.

TODO: have arch-dependent Makefiles where we supply -DFOO for optimization.
(do not change size of variable though)

XXX: we should actually nuke all other #ifdef in /usr/include/openssl/*.h,
however, that needs a lot of work and will make future openssl upgrade harder.

remove RC5 and IDEA by default.  build them separately as
libcrypto_{rc5,idea}.a.  put dummy function, which is "warning to stderr
and exit(1)".  NOCRYPTO_{RC5,IDEA} are obsoleted.
PR10883.
2000-09-30 00:23:28 +00:00
jhawk
a022cf9d37 Use
${MAKE}
instead of
  make
2000-08-30 23:51:46 +00:00
mrg
f23f12cbc5 update for openssl 0.9.5a 2000-07-16 07:16:20 +00:00
veego
94a5610765 Add CPPFLAGS+= -DNO_{RSA,IDEA,RC5}. 2000-07-05 14:00:38 +00:00
thorpej
df83a2a3cd Add MK... variables to enable/disable various aspects of building
crypto support into the system.  See share/mk/bsd.README for more
a full description.
2000-06-23 06:01:10 +00:00
thorpej
e352d2ca43 Fix installing <kerberosIV/des.h> 2000-06-20 21:49:02 +00:00
thorpej
e7d6b96938 Merge a bunch of things from crypto-us and crypto-intl into basesrc,
adding support for Heimdal/KTH Kerberos where easy to do so.  Eliminate
bsd.crypto.mk.

There is still a bunch more work to do, but crypto is now more-or-less
fully merged into the base NetBSD distribution.
2000-06-20 06:00:24 +00:00
thorpej
b50999826e Fixup the OpenSSL library builds. 2000-06-16 06:16:37 +00:00
thorpej
285b0ffbdd Import libcrypto build framework from cryptosrc-intl. 2000-06-16 04:21:31 +00:00